Skip to content

Commit 9358765

Browse files
author
Kristan Kenney
committed
Merge branch 'ui-refresh'
2 parents 63931b6 + 44f37ab commit 9358765

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+653
-423
lines changed

‎install/deb/themes/dark.css‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ a {
9090
color: #dadada;
9191
background: linear-gradient(to bottom, rgba(15,15,15,0.6) 0%,rgba(45,45,45,0.75) 30%,rgba(60,60,60,1) 95%);
9292
text-shadow: 0px 1px rgba(0,0,0,0.5);
93+
border-left-color: #353535;
94+
border-right-color: #353535;
9395
}
9496

9597
.l-menu {
@@ -111,11 +113,15 @@ a {
111113
box-shadow: none !important;
112114
}
113115
.l-menu__item a:active {
114-
background: linear-gradient(to bottom, rgba(15,15,15,0.6) 0%,rgba(45,45,45,0.75) 30%,rgba(60,60,60,1) 95%) !important;
116+
background: linear-gradient(to bottom, rgba(15,15,15,0.7) 0%,rgba(45,45,45,0.85) 30%,rgba(50,50,50,1) 95%) !important;
115117
color: #fff !important;
116118
text-shadow: 0px -1px 1px rgba(0,0,0,0.5) !important;
117119
}
118120

121+
.l-menu__item.l-menu__item--active:hover {
122+
background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0.15) 30%,rgba(255,255,255,0.15) 95%) !important;
123+
}
124+
119125
.l-menu.active .l-menu__item.focus a {
120126

121127
}
@@ -250,7 +256,7 @@ a {
250256

251257
.notification-container .unseen .title a,
252258
.notification-container .unseen .title {
253-
259+
color: #fff !important;
254260
}
255261
.notification-container .unseen .title a:hover {
256262

@@ -1268,12 +1274,12 @@ body.mobile .l-icon-shortcuts {
12681274

12691275

12701276
.vst-error {
1271-
color: #f864fa;
1277+
color: #ff3333;
12721278

12731279
}
12741280

12751281
.vst-ok {
1276-
1282+
color: #53ba55;
12771283
}
12781284

12791285
.l-unit-toolbar__buttonstrip .vst-ok, .l-unit-toolbar__buttonstrip .vst-error {
@@ -1351,7 +1357,9 @@ label:hover {
13511357
}
13521358
.vst-input:hover {
13531359
border-color: #0090ff;
1360+
background-color: #494949;
13541361
}
1362+
13551363
.vst-input:focus {
13561364
background-color: #222222;
13571365
border-color: #0080df;
@@ -1385,7 +1393,7 @@ label:hover {
13851393

13861394
}
13871395
.vst-input.vst-list-editor:focus {
1388-
background-color: #505050;
1396+
background-color: #222222;
13891397
box-shadow: none !important;
13901398
}
13911399

@@ -1409,6 +1417,7 @@ select.vst-list:-moz-focusring {
14091417
}
14101418
.vst-list:hover {
14111419
border-color: #0090ff;
1420+
background-color: #494949;
14121421
}
14131422
.vst-list:focus {
14141423
background-color: #222222;
@@ -1445,7 +1454,8 @@ a.vst-text:active b{
14451454
background: #454545 !important;
14461455
border: 1px solid #505050 !important;
14471456
text-shadow: 0px 1px rgba(0,0,0,0.4);
1448-
box-shadow: 0px 2px 6px rgba(0,0,0,0.4) !important;
1457+
box-shadow: inset 0px 0px 2px rgba(0,0,0,0.5),
1458+
0px 2px 6px rgba(0,0,0,0.4) !important;
14491459
color: #fff !important;
14501460
padding: 4px 0px 0px 18px;
14511461
overflow: hidden;
@@ -1468,6 +1478,7 @@ a.vst-text:active b{
14681478
}
14691479
.vst-textinput:hover {
14701480
border: 1px solid #0090ff;
1481+
background-color: #494949;
14711482
}
14721483
.vst-textinput:focus {
14731484
background-color: #222222;
@@ -1810,10 +1821,11 @@ a.button.cancel {
18101821

18111822
.login {
18121823
background-color: #282828;
1824+
box-shadow: 0px 8px 25px rgba(0,0,0, 0.3), inset 0px 0px 2px rgba(0,0,0,0.25) !important;
18131825
}
18141826

18151827
.login-welcome {
1816-
1828+
color: #fff !important;
18171829
}
18181830

18191831
.page-title {
@@ -2032,7 +2044,7 @@ form#vstobjects.suspended {
20322044
color: #33cccc;
20332045
}
20342046
.status-icon.purple, .status-icon.purple:hover {
2035-
color: #8e2fca;
2047+
color: #c364ff;
20362048
}
20372049

20382050
.status-icon.maroon, .status-icon.maroon:hover {
@@ -2121,12 +2133,14 @@ form#vstobjects.suspended {
21212133

21222134
.ui-dialog .ui-dialog-buttonpane {
21232135
border-color: #404040 !important;
2136+
background-color: #252525 !important;
21242137
}
21252138

21262139
.shortcuts {
21272140
background: rgba(30,30,30,0.95);
21282141
border: 1px solid rgba(255,255,255,0.25);
21292142
box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
2143+
border-bottom: none !important;
21302144
}
21312145

21322146
.shortcuts .header {
@@ -2222,6 +2236,8 @@ form#vstobjects.suspended {
22222236
.ui-dialog {
22232237
background-color: rgba(45,45,45,0.95) !important;
22242238
border: 1px solid rgba(80,80,80,0.97) !important;
2239+
box-shadow: inset 0px 1px 3px rgba(0,0,0,0.25),
2240+
0px 8px 25px rgba(0,0,0,0.9) !important;
22252241
}
22262242

22272243
.ui-dialog .ui-dialog-content {

‎install/deb/themes/flat.css‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ b, strong {
3131
.l-header {
3232
box-shadow: none;
3333
background: #5070a6;
34+
text-shadow: none !important;
3435
}
3536

3637
.l-menu__item--active {
@@ -39,6 +40,7 @@ b, strong {
3940

4041
.l-menu__item.l-menu__item--active a {
4142
background: none;
43+
box-shadow: none !important;
4244
}
4345

4446
.l-menu__item a:hover {
@@ -48,7 +50,7 @@ b, strong {
4850

4951
.l-menu__item a:active {
5052
background: none;
51-
box-shadow: none;
53+
box-shadow: none !important;
5254
}
5355

5456
.l-profile__notifications:hover,
@@ -90,24 +92,31 @@ b, strong {
9092
box-shadow: none;
9193
}
9294

93-
.ui-button, .button {
95+
.ui-button, .button, .ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit, .vst-advanced {
9496
box-shadow: none !important;
9597
background: linear-gradient(to bottom, rgba(235,243,249,1) 0%,rgba(223,235,245,1) 100%) !important;
9698
}
9799

98-
.ui-button.cancel, .button.cancel {
100+
.ui-button.cancel,
101+
.button.cancel,
102+
.to-top, .to-shortcuts {
99103
box-shadow: none !important;
100104
background: linear-gradient(to bottom, rgba(250,250,250,1) 0%,rgba(241,241,241,1) 100%) !important;
101105
}
102106

103-
.ui-button:hover, .button:hover, .ui-button.cancel:hover, .button.cancel:hover {
107+
.ui-button:hover, .button:hover, .ui-button.cancel:hover, .button.cancel:hover,
108+
.ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:hover,
109+
.vst-advanced:hover, .to-top:hover, .to-shortcuts:hover {
110+
color: #6986b7 !important;
104111
box-shadow: none !important;
105112
background: linear-gradient(to bottom, rgba(241,248,253,1) 0%,rgba(227,240,251,1) 100%) !important;
106113
}
107114

108115
.ui-button:focus,.ui-button:active,
109116
.button:active,.button:focus,.ui-button.cancel:focus,.ui-button.cancel:active,
110-
.button.cancel:active,.button.cancel:focus {
117+
.button.cancel:active,.button.cancel:focus,
118+
.ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:active,
119+
.vst-advanced:active,.to-top:focus, .to-shortcuts:focus {
111120
box-shadow: none !important;
112121
background: linear-gradient(to bottom, rgba(210,232,250,1) 0%,rgba(194,224,248,1) 100%) !important;
113122
}
@@ -124,6 +133,14 @@ b, strong {
124133
border: 1px solid #F4301A !important;
125134
}
126135

136+
.ui-dialog .ui-dialog-buttonpane button:nth-of-type(2) {
137+
box-shadow: none !important;
138+
}
139+
140+
.ui-dialog {
141+
box-shadow: 0 2px 11px 0 rgba(0, 0, 0, 0.5) !important;
142+
}
143+
127144
.alert {
128145
text-shadow: none !important;
129146
box-shadow: none !important;
@@ -139,10 +156,18 @@ b, strong {
139156

140157
.notification-container {
141158
box-shadow: none;
142-
border: 1px solid #dadada;
159+
border: 1px solid #ccc;
160+
background: #fff;
143161
}
144162

145163
.context-menu.sort-order {
146164
box-shadow: none;
147-
border: 1px solid #dadada;
165+
border: 1px solid #ccc;
166+
background: #fff !important;
167+
}
168+
169+
.login {
170+
background-color: rgba(255,255,255,0.8) !important;
171+
box-shadow: 0px 2px 10px rgba(0,0,0, 0.3),
172+
inset 0px 0px 2px rgba(255,255,255,1) !important;
148173
}

0 commit comments

Comments
 (0)