Skip to content

Commit 7bea6e6

Browse files
vertigo17vertigo17
committed
Improvements on dark theme.
1 parent cafdcc6 commit 7bea6e6

File tree

3 files changed

+33
-14
lines changed

3 files changed

+33
-14
lines changed

‎source/src/main/webapp/css/global/crb_style2.css‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,13 @@ ul.nav li.dropdown:hover > ul.dropdown-menu {
11181118
font-size: 10px;
11191119
}
11201120

1121+
ul.multiselect-container {
1122+
color: var(--crb-black-color);
1123+
background-color: var(--crb-white-color);
1124+
border-color: var(--crb-grey-color);
1125+
}
1126+
1127+
11211128
.navbar-inverse .navbar-nav > li > a {
11221129
color: #AAAAAA;
11231130
}
@@ -1516,7 +1523,14 @@ table.dataTable thead th input {
15161523
}
15171524

15181525
.menuSeparator{
1519-
background: lightgrey;
1526+
color: var(--crb-black-color);
1527+
background-color: var(--crb-grey-color);
1528+
border-color: var(--crb-grey-color);
1529+
}
1530+
.histo {
1531+
color: var(--crb-black-color);
1532+
background-color: var(--crb-white-color);
1533+
border-color: var(--crb-grey-color);
15201534
}
15211535

15221536

‎source/src/main/webapp/include/global/header.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
<li class="userConnected" id="formSystem">
162162
<span class="glyphicon glyphicon-folder-open marginRight3px"></span>
163163
<form id="SysFilter" class="form-group marginRight3px">
164-
<select class="multiselectelement form-control" multiple="multiple" id="MySystem">
164+
<select class="multiselectelement form-control btn-default" multiple="multiple" id="MySystem">
165165
</select>
166166
</form>
167167
<button type="button" class="btn btn-primary btn-xs" id="applySystem" onclick="ChangeSystem()">Apply</button>
@@ -179,12 +179,12 @@
179179
<span id="headerUserName">user</span>
180180
<i class="fa fa-caret-down"></i>
181181
</a>
182-
<ul class="dropdown-menu" id="userMenu">
182+
<ul class="dropdown-menu btn-default" id="userMenu">
183183
<li>
184-
<a name="menuitem" id="menuAccount" href="#"><i class="fa fa-user fa-fw"></i><span id="headerUserAccount"> User Account</span></a>
184+
<a name="menuitem" class="btn-default" id="menuAccount" href="#"><i class="fa fa-user fa-fw"></i><span id="headerUserAccount"> User Account</span></a>
185185
</li>
186186
<li>
187-
<a name="menuitem" id="menuLogout" href="#"><i class="fa fa-sign-out fa-fw "></i><span id="headerLogout"> Logout</span></a>
187+
<a name="menuitem" class="btn-default" id="menuLogout" href="#"><i class="fa fa-sign-out fa-fw "></i><span id="headerLogout"> Logout</span></a>
188188
</li>
189189
</ul>
190190
</li>

‎source/src/main/webapp/js/global/header.js‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,11 @@ function displayHeaderLabel(doc) {
279279
if (user.menu.accountLink === "") {
280280
$("#menuAccount").attr("href", user.menu.accountLink);
281281
$("#menuAccount").attr("target", "_blank");
282-
$("#menuAccount").attr("style", "display: none;");
282+
$("#menuAccount").attr("style", "display: none;color: var(--crb-black-color)");
283283
} else {
284284
$("#menuAccount").attr("href", user.menu.accountLink);
285285
$("#menuAccount").attr("target", "_blank");
286-
$("#menuAccount").attr("style", "display: block;");
286+
$("#menuAccount").attr("style", "display: block;color: var(--crb-black-color)");
287287
}
288288

289289
if (user.menu.logoutLink === "") {
@@ -305,7 +305,7 @@ function displayHeaderLabel(doc) {
305305
}
306306
aL = aL + "Logout.jsp";
307307
$("#menuLogout").attr("href", user.menu.logoutLink.replace('%LOGOUTURL%', encodeURIComponent(aL)));
308-
$("#menuLogout").attr("style", "display: block;");
308+
$("#menuLogout").attr("style", "display: block;color: var(--crb-black-color)");
309309
}
310310

311311
// Refresh History Menu
@@ -367,42 +367,43 @@ function loadUserSystemCombo() {
367367

368368
function refreshHistoryMenu() {
369369
$(".histo").remove();
370+
$(".menuSeparator").remove();
370371

371372
let entryList = localStorage.getItem("historyTestcases");
372373
entryList = JSON.parse(entryList);
373374
if (entryList !== null && entryList.length > 0) {
374-
$("#userMenu").append("<li class='menuSeparator histo'><span>Last Seen Testcases</span></li>");
375+
$("#userMenu").append("<li class='menuSeparator'><span>Last Seen Testcases</span></li>");
375376
for (var item in entryList) {
376377
let newitem = entryList.length - item - 1;
377378
let desc = "<div></div>";
378379
if ((entryList[newitem].description !== undefined) && (entryList[newitem].description !== "")) {
379380
desc = "<div style='font-size: 10px;min-width: 350px'> " + entryList[newitem].description + "</div>";
380381
}
381-
$("#userMenu").append("<li class='histo'><a name='menuitem' href='TestCaseScript.jsp?test=" + encodeURIComponent(entryList[newitem].test) + "&testcase=" + encodeURIComponent(entryList[newitem].testcase) + "'><i class='fa fa-bars'></i>" +
382+
$("#userMenu").append("<li class='histo'><a style='color: var(--crb-black-color)' name='menuitem' href='TestCaseScript.jsp?test=" + encodeURIComponent(entryList[newitem].test) + "&testcase=" + encodeURIComponent(entryList[newitem].testcase) + "'><i class='fa fa-bars'></i>" +
382383
"<span> " + entryList[newitem].test + " " + entryList[newitem].testcase + "</span>" + desc + "</a></li>");
383384
}
384385
}
385386
entryList = localStorage.getItem("historyExecutions");
386387
entryList = JSON.parse(entryList);
387388
if (entryList !== null && entryList.length > 0) {
388-
$("#userMenu").append("<li class='menuSeparator histo'><span>Last Seen Executions</span></li>");
389+
$("#userMenu").append("<li class='menuSeparator'><span>Last Seen Executions</span></li>");
389390
for (var item in entryList) {
390391
let newitem = entryList.length - item - 1;
391392
let desc = "<div style='font-size: 10px;min-width: 350px'> " + entryList[newitem].test + " " + entryList[newitem].testcase + " | " + entryList[newitem].country + " " + entryList[newitem].environment + " " + entryList[newitem].robot + "</div>";
392393
if ((entryList[newitem].description !== undefined) && (entryList[newitem].description !== "")) {
393394
desc += "<div style='font-size: 10px;min-width: 350px'> " + entryList[newitem].description + "</div>";
394395
}
395-
$("#userMenu").append("<li class='histo'><a name='menuitem' href='TestCaseExecution.jsp?executionId=" + entryList[newitem].id + "'><i class='fa fa-gear status" + entryList[newitem].controlStatus + "'></i>" +
396+
$("#userMenu").append("<li class='histo'><a style='color: var(--crb-black-color)' name='menuitem' href='TestCaseExecution.jsp?executionId=" + entryList[newitem].id + "'><i class='fa fa-gear status" + entryList[newitem].controlStatus + "'></i>" +
396397
"<span class='status" + entryList[newitem].controlStatus + "'> " + entryList[newitem].id + "</span>" + desc + "</a></li>");
397398
}
398399
}
399400
entryList = localStorage.getItem("historyCampaigns");
400401
entryList = JSON.parse(entryList);
401402
if (entryList !== null && entryList.length > 0) {
402-
$("#userMenu").append("<li class='menuSeparator histo'><span>Last Seen Campaigns</span></li>");
403+
$("#userMenu").append("<li class='menuSeparator'><span>Last Seen Campaigns</span></li>");
403404
for (var item in entryList) {
404405
let newitem = entryList.length - item - 1;
405-
$("#userMenu").append("<li class='histo'><a name='menuitem' href='ReportingExecutionByTag.jsp?Tag=" + encodeURIComponent(entryList[newitem].tag) + "'><i class='fa fa-gears'></i><span> " + entryList[newitem].tag + "</span></a></li>");
406+
$("#userMenu").append("<li class='histo'><a style='color: var(--crb-black-color)' name='menuitem' href='ReportingExecutionByTag.jsp?Tag=" + encodeURIComponent(entryList[newitem].tag) + "'><i class='fa fa-gears'></i><span> " + entryList[newitem].tag + "</span></a></li>");
406407
}
407408
}
408409
}
@@ -415,6 +416,10 @@ function multiSelectConfSystem(name) {
415416
this.enableCaseInsensitiveFiltering = true;
416417
this.includeSelectAllOption = true;
417418
this.includeSelectAllIfMoreThan = 2;
419+
// this.optionClass = "btn-default";
420+
// this.inheritClass = "btn-default";
421+
// this.buttonClass = "btn-default";
422+
this.selectedClass = "btn-default";
418423
}
419424

420425
function ChangeLanguage() {

0 commit comments

Comments
 (0)