Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 95a95ea9

Přidáno uživatelem Přemysl Kouba před téměř 6 roky(ů)

big update - solves specified bugs (refs #7561) – positioning bugs on UI

Zobrazit rozdíly:

sources/imiger-core/src/main/webapp/css/common.css
3 3
	font-size: 1.3em;
4 4
	margin: 0;
5 5
	background-color: #e8f4ff;
6
	height: 100vh;
6 7
}
7 8

  
8 9
ul {
sources/imiger-core/src/main/webapp/css/components/modal-window.css
1 1
.modal {
2 2
	position: absolute;
3
	z-index: 2;
3
	z-index: 999999;
4 4
	top: 0;
5 5
	bottom: 0;
6 6
	left: 0;
sources/imiger-core/src/main/webapp/css/customStyles.css
67 67

  
68 68
.sidebar {
69 69
    width: 100%;
70
    overflow: auto;
70 71
}
71 72

  
72 73
.viewport, .graph-content {
......
101 102

  
102 103
#sidebar-container {
103 104
    border: 1px solid #7db9e8;
105
    overflow: auto;
104 106
}
105 107

  
106 108
.navbar  > ul {
......
113 115
    color: black;
114 116
}
115 117

  
118
#id {
119
    width: 100%;
120
    height: 100%;
121
    padding: 0;
122
    margin: 0;
123
}
124

  
125
.graph-content {
126
    width: 100%;
127
    height: 100%;
128
}
129

  
130
.full-height {
131
    height: 100%;
132
}
133

  
134
.sidebar-bottom {
135
    bottom: 115px;
136
    width: 100%;
137
    position: absolute;
138
    background-color: #f5f5f5;
139
}
sources/imiger-core/src/main/webapp/js/components/nodeProxy.js
87 87
	updatePosition() {
88 88
		let bbox = this._rootElement.getBoundingClientRect();
89 89
		let viewportPosition = app.viewportComponent.position;
90

  
90
		var timelineElement = document.getElementsByClassName("timeline-pane");
91
		var timelineHeight = timelineElement.length > 0 ? timelineElement[0].clientHeight : 0;
91 92
		this._position.x = (bbox.left - viewportPosition.x);
92
		this._position.y = (bbox.top - viewportPosition.y - app.headerComponent.height - app.navbarComponent.height);
93
		this._position.y = (bbox.top - viewportPosition.y - app.headerComponent.height - app.navbarComponent.height - timelineHeight);
93 94

  
94 95
		let edgeOffsetY;
95 96
		if (this._node instanceof Vertex) {
sources/imiger-core/src/main/webapp/js/components/sidebar.js
21 21
			this.unconnectedNodeListComponent.render(),
22 22
			this.excludedNodeListComponent.render(),
23 23
			DOM.h('div', {
24
				class: 'sidebar-bottom',
24
				class: 'sidebar-bottom affix-bottom',
25 25
			}, [
26 26
				this.minimapComponent.render(),
27 27
				this.statusBarComponent.render(),
sources/imiger-core/src/main/webapp/js/components/vertex.js
340 340
		if (nodeList.length === 0) return;
341 341

  
342 342
		app.viewportComponent.contextMenuComponent.vertex = this;
343
		app.viewportComponent.contextMenuComponent.position = new Coordinates(e.clientX, e.clientY);
343
		app.viewportComponent.contextMenuComponent.position = new Coordinates(e.clientX, e.layerY);
344 344

  
345 345
		// fill list with items
346 346
		nodeList.forEach(node => {
sources/imiger-core/src/main/webapp/showGraph.jsp
124 124
	</head>
125 125

  
126 126
	<body class="${isLoggedIn ? 'loggedIn' : 'loggedOut'}">
127
		<div class="container-fluid full-width no-margin">
127
		<div class="container-fluid full-width no-margin full-height">
128 128
			<div id="header" class="header"></div>
129 129
			<div id="navbar" class="navbar p-0"></div>
130
            <div class="container-fluid full-width no-margin">
131
                <div class="row">
132
                    <div class="col-10 p-0 no-margin" style="margin-righ:30px">
130
            <div class="container-fluid full-width no-margin full-height">
131
                <div class="row full-height">
132
                    <div class="col-xs-10 p-0 no-margin" style="margin-righ:30px">
133 133
                        <c:if test = "${sessionScope.showTimeline eq true}">
134 134
                            <div class="row container-fluid timeline-container" style="">
135 135
                                <div class="timeline-pane">
......
137 137
                                </div>
138 138
                            </div>
139 139
                        </c:if>
140
                        <div id="app" class="row"></div>
140
                        <div id="app" class="row full-height no-margin"></div>
141 141
                    </div>
142 142

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

  
145 145

  
146 146
                    </div>

Také k dispozici: Unified diff