Skip to content

Commit 09b9bfd

Browse files
authored
Merge pull request #16 from gilemon/rebrand
merge modifications
2 parents 4c2537c + 344e3d8 commit 09b9bfd

File tree

3 files changed

+74
-87
lines changed

3 files changed

+74
-87
lines changed

public/css/main.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/src/css/common.css

Lines changed: 73 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ margin-left: 0;
103103
}
104104

105105
.table-hover>tbody>tr:hover>td, .table-hover>tbody>tr:hover>th {
106-
background-color: #cfe3f4;
106+
background-color: #e6e8ec;
107107
/*cfe3f4*/
108108
}
109109
.navbar { min-height: 64px; }
@@ -116,7 +116,7 @@ margin-left: 0;
116116
.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {background-color: #373D42;}
117117

118118
.navbar-default {
119-
background-color: #1d71b8;
119+
background-color: #012060;
120120
margin: 0;
121121
border: 0;
122122
}
@@ -167,7 +167,7 @@ margin-left: 0;
167167
}
168168

169169
.navbar-form .form-control {
170-
background-color: #1d71b8;
170+
background-color: #012060;
171171
border-radius: 3px;
172172
-webkit-border-radius: 3px;
173173
-moz-border-radius: 3px;
@@ -217,7 +217,7 @@ margin-left: 0;
217217
.status {
218218
-moz-border-radius: 3px;
219219
-webkit-border-radius: 3px;
220-
background-color: #345672;
220+
background-color: #ffffff12;
221221
border-radius: 3px;
222222
margin: 15px 0;
223223
padding: 8px 10px;
@@ -270,17 +270,21 @@ margin-left: 0;
270270
}
271271

272272
.block-id {
273-
background-color: #373D42;
273+
background-color: #012060;
274274
border: 3px solid #FFFFFF;
275+
-moz-border-radius: 10px;
276+
-webkit-border-radius: 10px;
277+
border-radius: 10px;
275278
margin: 0 auto;
276279
width: 165px;
277280
color: #fff;
278281
text-align: center;
279282
}
280283

281284
.block-id span {
282-
font-size: 40px;
283-
margin: 30px 0;
285+
color: #FFFFFF;
286+
font-size: 18px;
287+
margin: 10px 0;
284288
}
285289

286290
.block-id h2 {
@@ -296,6 +300,7 @@ margin-left: 0;
296300
color: #FFFFFF;
297301
font-size: 35px;
298302
margin-top: 10px;
303+
margin-bottom: 10px;
299304
}
300305

301306
.icon-block h3 {
@@ -317,8 +322,8 @@ margin-left: 0;
317322
border-radius: 2px;
318323
}
319324
.btn-primary {
320-
background-color: #1d71b8;
321-
border: 2px solid #1d71b8;
325+
background-color: #008de4;
326+
border: 2px solid #ffffff;
322327
}
323328

324329
.btn-primary:hover, .btn-primary:focus, .btn-primary:active,
@@ -364,7 +369,7 @@ margin-left: 0;
364369
}
365370

366371
.txvalues-primary {
367-
background-color: #1d71b8;
372+
background-color: #8a8a8a;
368373
}
369374

370375
.txvalues-default {
@@ -373,7 +378,7 @@ margin-left: 0;
373378
}
374379

375380
.txvalues-success {
376-
background-color: #2FA4D7;
381+
background-color: #01215f;
377382
}
378383

379384
.txvalues-danger {
@@ -387,11 +392,11 @@ margin-left: 0;
387392
font-size: 14px;
388393
font-weight: normal;
389394
}
390-
.progress-bar-info { background-color: #1d71b8; }
395+
.progress-bar-info { background-color: #008de4; }
391396

392397
/* Set the fixed height of the footer here */
393398
#footer {
394-
background-color: #373D42;
399+
background-color: #111921;
395400
color: #fff;
396401
height: 51px;
397402
overflow: hidden;
@@ -407,7 +412,11 @@ margin-left: 0;
407412
color: #fffffe;
408413
}
409414

410-
#footer a.insight small { font-size: 11px; }
415+
#footer a.insight small {
416+
font-size: 11px;
417+
margin-right: 2px;
418+
}
419+
411420
.line-footer { border-top: 2px dashed #ccc; }
412421

413422
#footer .links {
@@ -739,7 +748,7 @@ a.v_highlight_more {
739748
margin: 15px 0;
740749
}
741750
.block-id span {
742-
font-size: 24px;
751+
font-size: 18px;
743752
margin: 10px 0;
744753
}
745754
.icon-block {
@@ -762,8 +771,8 @@ a.v_highlight_more {
762771
font-size: 40px;
763772
}
764773
.navbar-default .navbar-nav>li>a {
765-
padding-left: 15px;
766-
padding-right: 15px;
774+
padding-left: 13px;
775+
padding-right: 13px;
767776
}
768777
}
769778

@@ -856,3 +865,50 @@ a.v_highlight_more {
856865
.uib-day button, .uib-month button, .uib-year button {
857866
min-width: 100%;
858867
}
868+
869+
/* Dash rebrand, 2018-05-28 */
870+
a {
871+
color: #008de4;
872+
}
873+
874+
.btn-info {
875+
background-color: #008de4;
876+
border-color: #ffffff
877+
}
878+
879+
.btn-info:hover {
880+
background-color: #0478c3;
881+
border-color: #ffffff
882+
}
883+
884+
.btn-info.disabled.focus,
885+
.btn-info.disabled:focus,
886+
.btn-info.disabled:hover,
887+
.btn-info[disabled].focus,
888+
.btn-info[disabled]:focus,
889+
.btn-info[disabled]:hover,
890+
fieldset[disabled] .btn-info.focus,
891+
fieldset[disabled] .btn-info:focus,
892+
fieldset[disabled] .btn-info:hover {
893+
background-color: #008de4;
894+
border-color: #46b8da;
895+
}
896+
897+
.btn-info .badge {
898+
color: #008de4;
899+
background-color: #ffffff;
900+
}
901+
902+
.label-info {
903+
background-color: #008de4;
904+
}
905+
906+
.navbar-default .navbar-nav > li > a:focus, .navbar-default .navbar-nav > li > a:hover {
907+
color: #333;
908+
background-color: #fff;
909+
}
910+
911+
.navbar-default .navbar-nav > li > a:focus, .navbar-default .navbar-nav > li > a:active {
912+
color: #cfe3f4;
913+
background-color: transparent;
914+
}

public/src/css/dash.css

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)