summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJared Dillard <jdillard@netgate.com>2015-12-16 15:33:29 -0600
committerJared Dillard <jdillard@netgate.com>2015-12-16 15:33:35 -0600
commitf0e52fb35f998cb842b1175d08dffdaa855389b7 (patch)
treedc86c1ff6b51fbae8440221e5fb0981e784a81c8
parentb51d272c8c652f8ed7c98e3d461dcfe4a06657ac (diff)
downloadpfsense-f0e52fb35f998cb842b1175d08dffdaa855389b7.zip
pfsense-f0e52fb35f998cb842b1175d08dffdaa855389b7.tar.gz
clean up common colors
-rw-r--r--src/usr/local/www/bootstrap/css/pfSense-dark.css48
-rw-r--r--src/usr/local/www/bootstrap/css/pfSense.css85
2 files changed, 67 insertions, 66 deletions
diff --git a/src/usr/local/www/bootstrap/css/pfSense-dark.css b/src/usr/local/www/bootstrap/css/pfSense-dark.css
index e1ec492..62cfa9c 100644
--- a/src/usr/local/www/bootstrap/css/pfSense-dark.css
+++ b/src/usr/local/www/bootstrap/css/pfSense-dark.css
@@ -128,7 +128,29 @@ ul.context-links li a {
}
/* end navigation */
-/* common button colors */
+/* start common colors */
+.alert-warning {
+ border-top: 1px solid #FFECB3;
+}
+
+.alert-success {
+ border-top: 1px solid #DCEDC8;
+}
+
+.alert-info {
+ border-top: 1px solid #B2EBF2;
+}
+
+.bg-primary {
+ color: #000;
+ background-color: #009688;
+}
+
+.bg-success {
+ color: #000;
+ background-color: #80CBC4;
+}
+
.btn-default {
color: #ffffff;
background-color: #757575;
@@ -167,18 +189,7 @@ ul.context-links li a {
background-color: #455A64;
border-color: #37474F;
}
-
-.alert-warning {
- border-top: 1px solid #FFECB3;
-}
-
-.alert-success {
- border-top: 1px solid #DCEDC8;
-}
-
-.alert-info {
- border-top: 1px solid #B2EBF2;
-}
+/* end common colors */
caption {
color: #E0E0E0;
@@ -305,17 +316,6 @@ a.list-group-item .list-group-item-heading, .list-group-item .list-group-item-he
background-color: #009688;
}
-/** create icon colors */
-.bg-primary {
- color: #000;
- background-color: #009688;
-}
-
-.bg-success {
- color: #000;
- background-color: #80CBC4;
-}
-
.icon-embed-btn
{
color: white;
diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css
index 546718c..e210bdf 100644
--- a/src/usr/local/www/bootstrap/css/pfSense.css
+++ b/src/usr/local/www/bootstrap/css/pfSense.css
@@ -172,27 +172,6 @@ ul.context-links li a {
box-shadow: 0px 1px 10px rgba(0,0,0,0.1);
}
-.alert-warning {
- color: #FF6F00;
- background-color: #FFFDE7;
- border-color: #FFECB3;
- border-top: 5px solid #FFD600;
-}
-
-.alert-success {
- color: #1B5E20;
- background-color: #E8F5E9;
- border-color: #DCEDC8;
- border-top: 5px solid #1B5E20;
-}
-
-.alert-info {
- color: #01579B;
- background-color: #E1F5FE;
- border-color: #B2EBF2;
- border-top: 5px solid #01579B;
-}
-
.panel {
margin-bottom: 10px;
border-radius: 0;
@@ -471,29 +450,26 @@ footer a {
overflow-x: auto;
}
-/** create text colors */
-.text-warning {
- color: #F57F17;
-}
-
-.text-success {
- color: #4CAF50;
-}
-
-.text-danger {
- color: #B71C1C;
-}
-
-.btn-success {
- background-color: #43A047;
+/** start common colors */
+.alert-warning {
+ color: #FF6F00;
+ background-color: #FFFDE7;
+ border-color: #FFECB3;
+ border-top: 5px solid #FFD600;
}
-.btn-danger {
- background-color: #B71C1C;
+.alert-success {
+ color: #1B5E20;
+ background-color: #E8F5E9;
+ border-color: #DCEDC8;
+ border-top: 5px solid #1B5E20;
}
-.btn-primary {
- background-color: #1976D2;
+.alert-info {
+ color: #01579B;
+ background-color: #E1F5FE;
+ border-color: #B2EBF2;
+ border-top: 5px solid #01579B;
}
.bg-primary {
@@ -517,9 +493,34 @@ footer a {
}
.bg-success {
- color: #000;
- background-color: #A5D6A7;
+ color: #1B5E20;
+ background-color: #E8F5E9;
+}
+
+.btn-success {
+ background-color: #43A047;
+}
+
+.btn-danger {
+ background-color: #B71C1C;
+}
+
+.btn-primary {
+ background-color: #1976D2;
+}
+
+.text-warning {
+ color: #F57F17;
+}
+
+.text-success {
+ color: #4CAF50;
+}
+
+.text-danger {
+ color: #B71C1C;
}
+/** end common colors */
.table-hover>tbody>tr.hover-success:hover {
color: #000;
OpenPOWER on IntegriCloud