Skip to content

Commit 2be8148

Browse files
CookiezaursCookiezaurs
committed
[SERVER-981] Events Overview - drawer button alignment bug
1 parent df56cb5 commit 2be8148

File tree

2 files changed

+38
-25
lines changed

2 files changed

+38
-25
lines changed

‎frontend/express/public/stylesheets/main.css

+6-2
Original file line numberDiff line numberDiff line change
@@ -1165,10 +1165,14 @@ margin: 50px 0;}
11651165
#eventOverviewWidgets .cly-widget>table {width:100%;}
11661166
#eventOverviewWidgets .cly-widget>table td table td {padding: 0px;}
11671167

1168-
#event-overview-drawer .cly-select,#event-overview-drawer .cly-select .select-items {width:149px;}
1168+
#event-overview-drawer .cly-select,#event-overview-drawer .cly-select .select-items {width:100%;}
1169+
#event-overview-drawer .adding-to-overview{ margin: 0;}
1170+
#event-overview-drawer .adding-to-overview>div {float:left; width:38%; margin:0; padding:0;}
1171+
#event-overview-drawer .adding-to-overview>div:last-child {width: 24%;}
1172+
#event-overview-drawer .wrap-overview-item {padding: 0 4px 0 0 ;}
11691173
#add_to_overview{display:inline-block; text-align:center; float:none; margin-left: 0px; width: 75px;}
11701174
#event-overview-drawer .buttons{background-color:#ffffff;}
1171-
1175+
#events-overview-table table.events-table td:nth-child(2) { word-break: break-word; }
11721176
#events-overview-show-configure{float:right; margin-top:5px;}
11731177
.show-event-description:hover + .event-overview-description-wrapper .event-overview-description {border: 1px solid black; display:block}
11741178
#event-blueprint-nav-title {padding-top:4px;}

‎frontend/express/views/dashboard.html

+32-23
Original file line numberDiff line numberDiff line change
@@ -1358,34 +1358,43 @@ <h3 data-index="{{value.index}}">{{value.title}}</h3>
13581358
<div class="details">
13591359
<div class="settings section">
13601360
<div class="label" data-localize="events.overview.add-item"></div>
1361-
<div class="cly-select" id="events-overview-event" >
1362-
<div class="select-inner">
1363-
<div class="text-container">
1364-
<div class="text" data-localize="events.overview.choose-event"></div>
1361+
<div class="adding-to-overview">
1362+
<div><div class="wrap-overview-item">
1363+
<div class="cly-select" id="events-overview-event" >
1364+
<div class="select-inner">
1365+
<div class="text-container">
1366+
<div class="text" data-localize="events.overview.choose-event"></div>
1367+
</div>
1368+
<div class="right combo"></div>
1369+
</div>
1370+
<div class="select-items square">
1371+
{{#eachOfObjectValue event-map}}
1372+
<div data-value="{{this.key}}" class="event-option item" >{{this.name}}</div>
1373+
{{/eachOfObjectValue}}
1374+
</div>
1375+
</div>
13651376
</div>
1366-
<div class="right combo"></div>
13671377
</div>
1368-
<div class="select-items square">
1369-
{{#eachOfObjectValue event-map}}
1370-
<div data-value="{{this.key}}" class="event-option item" >{{this.name}}</div>
1371-
{{/eachOfObjectValue}}
1372-
</div>
1373-
</div>
1374-
1375-
<div class="cly-select" id="events-overview-attr" >
1376-
<div class="select-inner">
1377-
<div class="text-container">
1378-
<div class="text" data-localize="events.overview.choose-property"></div>
1378+
<div><div class="wrap-overview-item">
1379+
<div class="cly-select" id="events-overview-attr" >
1380+
<div class="select-inner">
1381+
<div class="text-container">
1382+
<div class="text" data-localize="events.overview.choose-property"></div>
1383+
</div>
1384+
<div class="right combo"></div>
1385+
</div>
1386+
<div class="select-items square">
1387+
<div data-value="sum" class="event-option item" data-localize="events.table.sum"></div>
1388+
<div data-value="dur" class="event-option item" data-localize="events.table.dur"></div>
1389+
<div data-value="count" class="event-option item" data-localize="events.table.count"></div>
1390+
</div>
13791391
</div>
1380-
<div class="right combo"></div>
1392+
</div>
1393+
</div>
1394+
<div>
1395+
<div id="add_to_overview" class="icon-button green disabled" data-localize="events.overview.add-item" ></div>
13811396
</div>
1382-
<div class="select-items square">
1383-
<div data-value="sum" class="event-option item" data-localize="events.table.sum"></div>
1384-
<div data-value="dur" class="event-option item" data-localize="events.table.dur"></div>
1385-
<div data-value="count" class="event-option item" data-localize="events.table.count"></div>
1386-
</div>
13871397
</div>
1388-
<div id="add_to_overview" class="icon-button green disabled" data-localize="events.overview.add-item" ></div>
13891398
</div>
13901399
<div class="settings section" id="events-overview-table-wrapper">
13911400
<div class="label" data-localize="events.overview.added-items" {{#ifCond overview-table-length "==" "0"}} style="display:none" {{/ifCond}} ></div>

0 commit comments

Comments
 (0)