Merge 7cd020e into 29eaf51

liqd · Oct 15, 2019 · 2459317 · 2459317
2 parents 29eaf51 + 7cd020e
commit 2459317
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/liqd_product/assets/scss/_variables.scss b/liqd_product/assets/scss/_variables.scss
@@ -7,7 +7,7 @@ $brand-secondary: #00a747 !default;
 $brand-danger: #a72b1e !default;
 
 /* Don't use variables but hex-values here as they should not be overwritten on organisation pages */
-$brand-success: #90efe4 !default; // $brand-secondary from platform.scss
+$brand-success: #a3ef90 !default;
 $brand-info: #2d40cc !default; // $brand-primary from platform.scss
 $brand-warning: #ffc107 !default;
 $brand-danger: #d0011b !default; // $plattform-danger

diff --git a/liqd_product/assets/scss/components/_alerts.scss b/liqd_product/assets/scss/components/_alerts.scss
@@ -22,7 +22,7 @@ $messages-margin-bottom: 25px;
 }
 
 .alert--success {
-    background-color: lighten($brand-success, 20);
+    background-color: lighten($brand-success, 15);
     color: $text-color;
 }
 
@@ -33,7 +33,7 @@ $messages-margin-bottom: 25px;
 }
 
 .alert--warning {
-    background-color: lighten($brand-warning, 20);
+    background-color: lighten($brand-warning, 30);
     color: $text-color;
 }
 
@@ -48,9 +48,9 @@ $messages-margin-bottom: 25px;
 
 // If this directly follows the dialog box (see header.scss), add 16px
 // additional padding to the default value (see above).
-.messages:first-child > :first-child {
-    padding-top: calc(16px + #{$padding * 1.2});
-}
+// .messages:first-child > :first-child {
+//     padding-top: calc(16px + #{$padding * 1.2});
+// }
 
 // compensate for margin-bottom on messages
 .u-after-dialogue-box,

diff --git a/liqd_product/assets/scss/components/_button.scss b/liqd_product/assets/scss/components/_button.scss
@@ -111,7 +111,7 @@
 }
 
 .btn--secondary {
-    @include button-color--product($brand-secondary);
+    @include button-color--product($brand-info);
 }
 
 .btn--secondary-filled {
@@ -224,8 +224,7 @@
 
         &:focus,
         &:hover {
-            //stop btn appear to increase in size
-            z-index: 0;
+            z-index: 0 !important;
             position: relative;
         }
     }

diff --git a/liqd_product/assets/scss/components/_list_item.scss b/liqd_product/assets/scss/components/_list_item.scss
@@ -46,7 +46,7 @@
     background-size: cover;
     background-position: 50%;
     background-repeat: no-repeat;
-    background-color: $brand-secondary;
+    background-color: $brand-info;
 }
 
 .list-item--has-image__copyright {

diff --git a/liqd_product/assets/scss/components/_style_guide.scss b/liqd_product/assets/scss/components/_style_guide.scss
@@ -28,7 +28,7 @@
 }
 
 .info.colour-block {
-    background-color: $brand-success;
+    background-color: $brand-info;
 }
 
 .warning.colour-block {

diff --git a/liqd_product/assets/scss/components/_tabs.scss b/liqd_product/assets/scss/components/_tabs.scss
@@ -7,7 +7,7 @@
 }
 
 .tablist {
-    border-bottom: 2px solid $brand-secondary;
+    border-bottom: 2px solid $brand-info;
     text-align: center;
     margin-bottom: $spacer * 2;
     padding-top: 0.5em;
@@ -34,7 +34,7 @@
     }
 
     &.active {
-        border-color: $brand-secondary;
+        border-color: $brand-info;
         background-color: $body-bg;
     }
 }

diff --git a/liqd_product/assets/scss/components/_upload.scss b/liqd_product/assets/scss/components/_upload.scss
@@ -18,7 +18,7 @@
 
     .far,
     .fas {
-        line-height: 1.4;
+        line-height: 1.3;
     }
 }