Skip to content

Commit dbee675

Browse files
committed
Merge branch 'hf-selectsel2' into development
2 parents 4c7a36d + 76ff5e1 commit dbee675

File tree

3 files changed

+35
-6
lines changed

3 files changed

+35
-6
lines changed

www/app/DashboardController.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ define(['app'], function (app) {
481481
}
482482
xhtm += '<button type="button" class="btn btn-small ';
483483
if ((index * 10) == item.LevelInt) {
484-
xhtm += 'btn-danger"';
484+
xhtm += 'btn-selected"';
485485
}
486486
else {
487487
xhtm += 'btn-default"';
@@ -937,7 +937,7 @@ define(['app'], function (app) {
937937
}
938938
xhtm += '<button type="button" class="btn btn-small ';
939939
if ((index * 10) == item.LevelInt) {
940-
xhtm += 'btn-danger"';
940+
xhtm += 'btn-selected"';
941941
}
942942
else {
943943
xhtm += 'btn-default"';
@@ -2364,7 +2364,7 @@ define(['app'], function (app) {
23642364
}
23652365
xhtm += '<button type="button" class="btn btn-small ';
23662366
if ((index * 10) == item.LevelInt) {
2367-
xhtm += 'btn-danger"';
2367+
xhtm += 'btn-selected"';
23682368
}
23692369
else {
23702370
xhtm += 'btn-default"';
@@ -2752,7 +2752,7 @@ define(['app'], function (app) {
27522752
}
27532753
xhtm += '<button type="button" class="btn btn-small ';
27542754
if ((index * 10) == item.LevelInt) {
2755-
xhtm += 'btn-danger"';
2755+
xhtm += 'btn-selected"';
27562756
}
27572757
else {
27582758
xhtm += 'btn-default"';

www/app/LightsController.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ define(['app'], function (app) {
740740
}
741741
xhtm += '<button type="button" class="btn btn-small ';
742742
if ((index * 10) == item.LevelInt) {
743-
xhtm += 'btn-danger"';
743+
xhtm += 'btn-selected"';
744744
}
745745
else {
746746
xhtm += 'btn-default"';
@@ -1317,7 +1317,7 @@ define(['app'], function (app) {
13171317
}
13181318
xhtm += '<button type="button" class="btn btn-small ';
13191319
if ((index * 10) == item.LevelInt) {
1320-
xhtm += 'btn-danger"';
1320+
xhtm += 'btn-selected"';
13211321
}
13221322
else {
13231323
xhtm += 'btn-default"';

www/css/style.css

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2037,3 +2037,32 @@ table.display thead th.sorting_disabled div.DataTables_sort_wrapper {
20372037
.jQWCP-wWidget {
20382038
touch-action: none;
20392039
}
2040+
2041+
.btn-selected {
2042+
color: #ffffff;
2043+
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2044+
background-color: #826db1;
2045+
*background-color: #695499;
2046+
background-image: -moz-linear-gradient(top, #826db1, #695499);
2047+
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#826db1), to(#695499));
2048+
background-image: -webkit-linear-gradient(top, #826db1, #695499);
2049+
background-image: -o-linear-gradient(top, #826db1, #695499);
2050+
background-image: linear-gradient(to bottom, #826db1, #695499);
2051+
background-repeat: repeat-x;
2052+
border-color: #695499 #695499 #ad6704;
2053+
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2054+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff826db1', endColorstr='#ff695499', GradientType=0);
2055+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
2056+
}
2057+
2058+
.btn-selected:hover,
2059+
.btn-selected:focus,
2060+
.btn-selected:active,
2061+
.btn-selected.active,
2062+
.btn-selected.disabled,
2063+
.btn-selected[disabled] {
2064+
color: #ffffff;
2065+
background-color: #826db1;
2066+
*background-color: #695499;
2067+
}
2068+

0 commit comments

Comments
 (0)