From: Sven <sven.hoehn@posteo.de>
Date: Thu, 15 Jun 2017 17:09:23 +0000 (+0200)
Subject: Bug 11338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf75d6d5eb92337a71221a35e12795483b509925;p=ipfire.org.git

Bug 11338
---

diff --git a/static/css/style.css b/static/css/style.css
index 808a36de..70657336 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1450,24 +1450,24 @@ fieldset[disabled] a.btn {
     border-color: #821414; }
 
 .btn-secondary {
-  color: #546e7a;
+  color: rgba(38, 50, 56, 0.6);
   background-color: #fff;
-  border-color: #546e7a; }
+  border-color: rgba(38, 50, 56, 0.6); }
   .btn-secondary:hover {
-    color: #546e7a;
+    color: rgba(38, 50, 56, 0.6);
     background-color: #e6e5e5;
-    border-color: #3b4d56; }
+    border-color: rgba(13, 17, 20, 0.6); }
   .btn-secondary:focus, .btn-secondary.focus {
-    box-shadow: 0 0 0 2px rgba(84, 110, 122, 0.5); }
+    box-shadow: 0 0 0 2px rgba(38, 50, 56, 0.5); }
   .btn-secondary.disabled, .btn-secondary:disabled {
     background-color: #fff;
-    border-color: #546e7a; }
+    border-color: rgba(38, 50, 56, 0.6); }
   .btn-secondary:active, .btn-secondary.active,
   .show > .btn-secondary.dropdown-toggle {
-    color: #546e7a;
+    color: rgba(38, 50, 56, 0.6);
     background-color: #e6e5e5;
     background-image: none;
-    border-color: #3b4d56; }
+    border-color: rgba(13, 17, 20, 0.6); }
 
 .btn-info {
   color: #fff;
@@ -1570,24 +1570,24 @@ fieldset[disabled] a.btn {
     border-color: #b71c1c; }
 
 .btn-outline-secondary {
-  color: #546e7a;
+  color: rgba(38, 50, 56, 0.6);
   background-image: none;
   background-color: transparent;
-  border-color: #546e7a; }
+  border-color: rgba(38, 50, 56, 0.6); }
   .btn-outline-secondary:hover {
     color: #fff;
-    background-color: #546e7a;
-    border-color: #546e7a; }
+    background-color: rgba(38, 50, 56, 0.6);
+    border-color: rgba(38, 50, 56, 0.6); }
   .btn-outline-secondary:focus, .btn-outline-secondary.focus {
-    box-shadow: 0 0 0 2px rgba(84, 110, 122, 0.5); }
+    box-shadow: 0 0 0 2px rgba(38, 50, 56, 0.5); }
   .btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
-    color: #546e7a;
+    color: rgba(38, 50, 56, 0.6);
     background-color: transparent; }
   .btn-outline-secondary:active, .btn-outline-secondary.active,
   .show > .btn-outline-secondary.dropdown-toggle {
     color: #fff;
-    background-color: #546e7a;
-    border-color: #546e7a; }
+    background-color: rgba(38, 50, 56, 0.6);
+    border-color: rgba(38, 50, 56, 0.6); }
 
 .btn-outline-info {
   color: #5bc0de;
@@ -5075,9 +5075,12 @@ small,
   line-height: 20px; }
 
 h5.fireinfo {
-  font-size: 20px;
+  font-size: 16px;
   line-height: 28px;
   font-weight: 500; }
+  @media (min-width: 768px) {
+    h5.fireinfo {
+      font-size: 20px; } }
 
 .fireinfo_per {
   font-size: 20px;
@@ -5473,7 +5476,7 @@ section.intro {
     padding-top: 6rem;
     margin-bottom: 64px;
     text-align: center;
-    color: #546e7a; }
+    color: rgba(38, 50, 56, 0.6); }
     @media (min-width: 576px) {
       section.intro .branding {
         padding-top: 192px; } }
@@ -5563,9 +5566,9 @@ section#fireinfo {
 .circle {
   position: relative; }
   .circle p.fireinfo_per {
-    color: #546e7a;
+    color: rgba(38, 50, 56, 0.6);
     position: absolute;
-    top: calc(50% - 20px);
+    top: calc(50% - 18px);
     width: 100%; }
 
 section#appliances {
diff --git a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css
index a19ccd76..08354770 100644
--- a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css
+++ b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css
@@ -1790,24 +1790,24 @@ fieldset[disabled] a.btn {
     border-color: #821414; }
 
 .btn-secondary {
-  color: #546e7a;
+  color: rgba(38, 50, 56, 0.6);
   background-color: #fff;
-  border-color: #546e7a; }
+  border-color: rgba(38, 50, 56, 0.6); }
   .btn-secondary:hover {
-    color: #546e7a;
+    color: rgba(38, 50, 56, 0.6);
     background-color: #e6e5e5;
-    border-color: #3b4d56; }
+    border-color: rgba(13, 17, 20, 0.6); }
   .btn-secondary:focus, .btn-secondary.focus {
-    box-shadow: 0 0 0 2px rgba(84, 110, 122, 0.5); }
+    box-shadow: 0 0 0 2px rgba(38, 50, 56, 0.5); }
   .btn-secondary.disabled, .btn-secondary:disabled {
     background-color: #fff;
-    border-color: #546e7a; }
+    border-color: rgba(38, 50, 56, 0.6); }
   .btn-secondary:active, .btn-secondary.active,
   .show > .btn-secondary.dropdown-toggle {
-    color: #546e7a;
+    color: rgba(38, 50, 56, 0.6);
     background-color: #e6e5e5;
     background-image: none;
-    border-color: #3b4d56; }
+    border-color: rgba(13, 17, 20, 0.6); }
 
 .btn-info {
   color: #fff;
@@ -1910,24 +1910,24 @@ fieldset[disabled] a.btn {
     border-color: #b71c1c; }
 
 .btn-outline-secondary {
-  color: #546e7a;
+  color: rgba(38, 50, 56, 0.6);
   background-image: none;
   background-color: transparent;
-  border-color: #546e7a; }
+  border-color: rgba(38, 50, 56, 0.6); }
   .btn-outline-secondary:hover {
     color: #fff;
-    background-color: #546e7a;
-    border-color: #546e7a; }
+    background-color: rgba(38, 50, 56, 0.6);
+    border-color: rgba(38, 50, 56, 0.6); }
   .btn-outline-secondary:focus, .btn-outline-secondary.focus {
-    box-shadow: 0 0 0 2px rgba(84, 110, 122, 0.5); }
+    box-shadow: 0 0 0 2px rgba(38, 50, 56, 0.5); }
   .btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
-    color: #546e7a;
+    color: rgba(38, 50, 56, 0.6);
     background-color: transparent; }
   .btn-outline-secondary:active, .btn-outline-secondary.active,
   .show > .btn-outline-secondary.dropdown-toggle {
     color: #fff;
-    background-color: #546e7a;
-    border-color: #546e7a; }
+    background-color: rgba(38, 50, 56, 0.6);
+    border-color: rgba(38, 50, 56, 0.6); }
 
 .btn-outline-info {
   color: #5bc0de;
@@ -2979,7 +2979,7 @@ tbody.collapse.show {
 
 .card-outline-secondary {
   background-color: transparent;
-  border-color: #546e7a; }
+  border-color: rgba(38, 50, 56, 0.6); }
 
 .card-outline-info {
   background-color: transparent;
diff --git a/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss b/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss
index b2b8c90f..6a0264fc 100755
--- a/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss
+++ b/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss
@@ -12,10 +12,10 @@ $blue_700: #1976d2;
 $blue_400: #42a5f5;
 $green_600: #43a047;
 $green_400: #66bb6a;
-$blue_grey_900: #263238;
-$blue_grey_700: #455a64;
-$blue_grey_600: #546e7a;
-$blue_grey_300: #90a4ae;
+$blue_grey_900: rgba(38, 50, 56, 1);
+$blue_grey_700: rgba(38, 50, 56, .7);
+$blue_grey_600: rgba(38, 50, 56, .6);
+$blue_grey_300: rgba(38, 50, 56, .3);
 $blue_grey_50: #eceff1;
 $deep_orange_a400: #ff3d00;
 $cyan: #00bcd4;
diff --git a/static/scss/style.scss b/static/scss/style.scss
index 8446394e..dcb8dfe5 100644
--- a/static/scss/style.scss
+++ b/static/scss/style.scss
@@ -251,7 +251,7 @@ section#fireinfo {
 	p.fireinfo_per {
 		color: $blue-grey-600;
 		position: absolute;
-		top: calc(50% - 20px);
+		top: calc(50% - 18px);
 		width: 100%;
 	}
 }