Skip to content

Commit 41373f1

Browse files
author
Kristan Kenney
committed
Merge branch 'bugfix-css'
2 parents 01c1580 + 92b4b05 commit 41373f1

File tree

2 files changed

+36
-26
lines changed

2 files changed

+36
-26
lines changed

web/css/styles.min.css

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -690,18 +690,19 @@ body {
690690
overflow-x: hidden;
691691
font-size: 0.9rem;
692692
height: 100%;
693-
color: #929292;
693+
color: #7c7c7c;
694694
}
695695

696696
.body-login, .body-reset {
697697
height: auto;
698698
padding-top: 10%;
699-
background: #5f7eb3 !important;
699+
background: rgb(102,158,231) !important;
700+
background: radial-gradient(circle, rgba(102,158,231,1) 0%, rgba(43,86,177,1) 100%) !important;
700701
}
701702

702703
a {
703704
text-decoration: none;
704-
color: #929292;
705+
color: #7c7c7c;
705706
}
706707

707708
.disabled {
@@ -1026,13 +1027,14 @@ a {
10261027
}
10271028

10281029
.notification-container a {
1029-
color: #5ABDB5;/* #eee;*/
1030+
font-weight: 600;
1031+
color: #1a4492;/* #eee;*/
10301032
}
10311033
.notification-container a:hover {
1032-
color: #2CA99B;
1034+
color: #4a87fb;
10331035
}
10341036
.notification-container a:active {
1035-
color: #00C0C0;
1037+
color: #1a4492;
10361038
}
10371039

10381040
.notification-container .icon {
@@ -1127,15 +1129,17 @@ form#vstobjects .alert {
11271129
float:left;
11281130
overflow: hidden;
11291131
background-color: #f5f5f5;
1130-
border:1px solid #e6e6e6;
1132+
border:1px solid #d3d3d3;
11311133
box-sizing: border-box;
11321134
width:200px;
11331135
min-height:260px;
11341136
margin-top:3em;
1135-
margin-right:3em;
1136-
box-shadow: 0px 0px 3px rgba(0,0,0,0.1);
1137+
margin-right:4em;
1138+
padding-bottom: 0.5em;
1139+
box-shadow: 0px 1px 4px rgba(0,0,0,0.2);
11371140
color: #353535;
1138-
1141+
border-radius: 4px;
1142+
text-align: center;
11391143
}
11401144

11411145
.card.disable {
@@ -1164,12 +1168,11 @@ form#vstobjects .alert {
11641168
.card .card-details p {
11651169
margin: 0 0 0.3em 0;
11661170
font-size: 1em;
1167-
text-align: left;
11681171
}
11691172

11701173
.card p.card-title {
1171-
font-size: 1.2em;
1172-
font-weight: 500;
1174+
font-size: 1.1em;
1175+
font-weight: 600;
11731176
}
11741177

11751178
.card .card-thumb {
@@ -1184,10 +1187,10 @@ form#vstobjects .alert {
11841187
max-width: 200px;
11851188
height: auto;
11861189
width: auto;
1187-
11881190
}
11891191

11901192
.card button {
1193+
margin-top: 0.5em;
11911194
margin:0.3em;
11921195
}
11931196

@@ -1723,7 +1726,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
17231726
}
17241727

17251728
.l-unit-ft {
1726-
color: #929292;
1729+
color: #7c7c7c;
17271730
padding: 0 0 0 15px;
17281731
}
17291732

@@ -2850,7 +2853,8 @@ td.hint {
28502853
inset 0px 0px 3px rgba(255,255,255,0.5) !important;
28512854
text-shadow: 0px 1px 1px rgba(255,255,255,0.6) !important;
28522855
}
2853-
.ui-button:hover, .button:hover, .ui-button.cancel:hover, .button.cancel:hover {
2856+
.ui-button:hover, .button:hover, .ui-button.cancel:hover, .button.cancel:hover,
2857+
.ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:hover {
28542858
color: #3b9de8 !important;
28552859
text-shadow: 1px 1px rgba(255,255,255,0.5) !important;
28562860
border: 1px solid #54a6e5 !important;
@@ -2862,7 +2866,8 @@ td.hint {
28622866
}
28632867
.ui-button:focus,.ui-button:active,
28642868
.button:active,.button:focus,.ui-button.cancel:focus,.ui-button.cancel:active,
2865-
.button.cancel:active,.button.cancel:focus {
2869+
.button.cancel:active,.button.cancel:focus, .ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit,
2870+
.ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit:active {
28662871
border: 1px solid #378ccd !important;
28672872
background: linear-gradient(to bottom, rgba(210,232,250,1) 0%,rgba(187,220,247,1) 50%,rgba(162,207,244,1) 51%,rgba(194,224,248,1) 100%) !important;
28682873
color: #046c98 !important;
@@ -2879,6 +2884,10 @@ td.hint {
28792884
text-shadow: 0px 1px rgba(255,255,255,0.5);
28802885
}
28812886

2887+
.ui-dialog .ui-dialog-buttonpane button span.ui-button-text {
2888+
padding: 2px !important;
2889+
}
2890+
28822891
.ui-button-text-only .selected {
28832892
font-weight: 600 !important;
28842893
}
@@ -3237,7 +3246,7 @@ form#vstobjects.suspended {
32373246
}
32383247

32393248
.pill {
3240-
border-radius: 18px;
3249+
border-radius: 12px;
32413250
display: inline-block;
32423251
text-shadow: 0px 1px 2px rgba(0,0,0,0.4);
32433252
}
@@ -3267,7 +3276,7 @@ form#vstobjects.suspended {
32673276
line-height: 24px;
32683277
border-radius: 50%;
32693278
font-weight: 600;
3270-
box-shadow: 0px 1px 3px rgba(120,120,120,0.6);
3279+
box-shadow: 0px 0px 3px rgba(120,120,120,0.6);
32713280
text-shadow: 0px 1px 2px rgba(0,0,0,0.5);
32723281
}
32733282

@@ -3289,7 +3298,7 @@ form#vstobjects.suspended {
32893298
}
32903299

32913300
.pill.gray, .badge.gray {
3292-
border: 1px solid #ddd;
3301+
border: 1px solid #fff;
32933302
background-color: #eaeaea;
32943303
color: #6c6c6c;
32953304
text-shadow: 0px 1px #fafafa !important;
@@ -3633,10 +3642,10 @@ form#vstobjects.suspended {
36333642
.ui-dialog {
36343643
font-family: 'Exo', Arial, Helvetica, sans-serif !important;
36353644
font-weight: 500 !important;
3636-
background-color: rgba(245,245,245,0.87) !important;
3637-
box-shadow: 0 8px 50px 0 rgba(0, 0, 0, 0.55) !important;
3645+
background-color: rgba(255,255,255,0.9) !important;
3646+
box-shadow: 0 8px 40px 0 rgba(0, 0, 0, 0.35) !important;
36383647
border-radius: 6px !important;
3639-
border: 1px solid rgba(255,255,255,0.9) !important;
3648+
border: 2px solid rgba(255,255,255,0.95) !important;
36403649
text-align: center !important;
36413650
}
36423651

@@ -3646,8 +3655,9 @@ form#vstobjects.suspended {
36463655
}
36473656

36483657
.ui-dialog .ui-dialog-title {
3649-
color: #046c98 !important;
3650-
font-size: 1.1em !important;
3658+
margin: 0px !important;
3659+
color: #305ba9 !important;
3660+
font-size: 1.2em !important;
36513661
text-transform: none !important;
36523662
letter-spacing: -0.01em !important;
36533663
text-align: center !important;

web/templates/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<center>
2-
<table class="login animated fadeInLeft">
2+
<table class="login animated zoomIn">
33
<tr>
44
<td>
55
<table>

0 commit comments

Comments
 (0)