Projekt

Obecné

Profil

« Předchozí | Další » 

Revize db86add3

Přidáno uživatelem Přemysl Kouba před více než 5 roky(ů)

Rework on sidebar - now scrollable with minimap on top not moving (refs #7602)

Zobrazit rozdíly:

sources/imiger-core/src/main/webapp/css/customStyles.css
67 67

  
68 68
.sidebar {
69 69
    width: 100%;
70
    overflow: auto;
70
    display:block;
71
    height:100%;
72
    background-color: #e8f4ff !important;
71 73
}
72 74

  
73 75
.viewport, .graph-content {
......
80 82
}
81 83

  
82 84
.timeline-container {
83
    height: 300px;
85
    height: 30%;
86
}
87

  
88
#app {
89
    height: 70%;
84 90
}
85 91

  
86 92
.full-width {
......
132 138
}
133 139

  
134 140
.sidebar-bottom {
135
    bottom: 115px;
136
    width: 100%;
137
    position: absolute;
138 141
    background-color: #f5f5f5;
142
}
143

  
144
.unconnected-nodes {
145
    height: auto;
146
    max-height: 40%;
147
    overflow-y: auto;
148
}
149

  
150
.excluded-nodes {
151
    height: auto;
152
    max-height: 40%;
153
    overflow-y: auto;
154
}
155

  
156
div.content {
157
    height: calc(100vh - 104px);
139 158
}
sources/imiger-core/src/main/webapp/js/components/sidebar.js
18 18
			class: 'sidebar',
19 19
			id: 'sidebar',
20 20
		}, [
21
			this.unconnectedNodeListComponent.render(),
22
			this.excludedNodeListComponent.render(),
21

  
23 22
			DOM.h('div', {
24
				class: 'sidebar-bottom affix-bottom',
23
				class: 'sidebar-bottom',
25 24
			}, [
26 25
				this.minimapComponent.render(),
27 26
				this.statusBarComponent.render(),
28 27
			]),
28
			this.unconnectedNodeListComponent.render(),
29
			this.excludedNodeListComponent.render(),
29 30
		]);
30 31

  
31 32
		return this._rootElement;
sources/imiger-core/src/main/webapp/showGraph.jsp
122 122
		<div class="container-fluid full-width no-margin full-height">
123 123
			<div id="header" class="header"></div>
124 124
			<div id="navbar" class="navbar p-0"></div>
125
            <div class="container-fluid full-width no-margin full-height">
125
            <div class="container-fluid full-width no-margin content">
126 126
                <div class="row full-height">
127
                    <div class="col-xs-10 p-0 no-margin" style="margin-righ:30px">
127
                    <div class="col-xs-10 p-0 no-margin full-height" style="margin-righ:30px">
128 128
                        <c:if test = "${sessionScope.showTimeline eq true}">
129 129
                            <div class="row container-fluid timeline-container" style="">
130 130
                                <div class="timeline-pane">
......
132 132
                                </div>
133 133
                            </div>
134 134
                        </c:if>
135
                        <div id="app" class="row full-height no-margin"></div>
135
                        <div id="app" class="row no-margin"></div>
136 136
                    </div>
137 137

  
138 138
                    <div class="col-xs-2 p-0 no-margin d-flex" id="sidebar-container">

Také k dispozici: Unified diff