Explorar o código

More color fixes after switching to css properties

JC Brand %!s(int64=6) %!d(string=hai) anos
pai
achega
795d8e0f00
Modificáronse 3 ficheiros con 34 adicións e 6 borrados
  1. 14 3
      css/converse.css
  2. 14 0
      sass/_core.scss
  3. 6 3
      sass/_variables.scss

+ 14 - 3
css/converse.css

@@ -9315,9 +9315,11 @@ readers do not read off random characters that represent icons */
   --chat-head-color-lighten-50-percent: #e7f7ee;
   --chat-head-color-lighten-50-percent: #e7f7ee;
   --chat-head-text-color: white;
   --chat-head-text-color: white;
   --highlight-color: #DCF9F6;
   --highlight-color: #DCF9F6;
-  --primary-color: #E7A151;
-  --secondary-color: #578EA9;
+  --primary-color: #578EA9;
+  --secondary-color: #E7A151;
   --warning-color: #D24E2B;
   --warning-color: #D24E2B;
+  --primary-color-dark: #345566;
+  --secondary-color-dark: #D2842B;
   --light-background-color: #FCFDFD;
   --light-background-color: #FCFDFD;
   --error-color: #A53214;
   --error-color: #A53214;
   --info-color: #1E9652;
   --info-color: #1E9652;
@@ -9796,9 +9798,18 @@ body.reset {
     background: white; }
     background: white; }
   #conversejs .activated {
   #conversejs .activated {
     display: block !important; }
     display: block !important; }
+  #conversejs .nav-pills .nav-link.active,
+  #conversejs .nav-pills .show > .nav-link {
+    background-color: var(--primary-color); }
+  #conversejs .list-group-item.active {
+    background-color: var(--primary-color); }
   #conversejs .btn-primary, #conversejs .button-primary, #conversejs .badge-primary {
   #conversejs .btn-primary, #conversejs .button-primary, #conversejs .badge-primary {
     color: white;
     color: white;
-    background-color: var(--primary-color); }
+    background-color: var(--primary-color);
+    border-color: transparent; }
+    #conversejs .btn-primary:hover, #conversejs .button-primary:hover, #conversejs .badge-primary:hover {
+      background-color: var(--secondary-color-dark);
+      border-color: transparent; }
   #conversejs .btn-info, #conversejs .badge-info {
   #conversejs .btn-info, #conversejs .badge-info {
     color: white;
     color: white;
     background-color: var(--link-color); }
     background-color: var(--link-color); }

+ 14 - 0
sass/_core.scss

@@ -449,9 +449,23 @@ body.reset {
         display: block !important;
         display: block !important;
     }
     }
 
 
+    .nav-pills .nav-link.active,
+    .nav-pills .show > .nav-link {
+        background-color: var(--primary-color);
+    }
+
+    .list-group-item.active {
+        background-color: var(--primary-color);
+    }
+
     .btn-primary, .button-primary, .badge-primary {
     .btn-primary, .button-primary, .badge-primary {
         color: white;
         color: white;
         background-color: var(--primary-color);
         background-color: var(--primary-color);
+        border-color: transparent;
+        &:hover {
+            background-color: var(--secondary-color-dark);
+            border-color: transparent;
+        }
     }
     }
     .btn-info, .badge-info {
     .btn-info, .badge-info {
         color: white;
         color: white;

+ 6 - 3
sass/_variables.scss

@@ -47,9 +47,12 @@ $font-path: "webfonts/icomoon/fonts/" !default;
 
 
     --highlight-color: #DCF9F6;
     --highlight-color: #DCF9F6;
 
 
-    --primary-color: #E7A151; // $orange
-    --secondary-color: #578EA9; // $light-blue
-    --warning-color: #D24E2B; // $dark-red
+    --primary-color: #578EA9; // light-blue
+    --secondary-color: #E7A151; // orange
+    --warning-color: #D24E2B; // dark-red
+
+    --primary-color-dark: #345566; // dark blue
+    --secondary-color-dark: #D2842B; // dark orange
 
 
     --light-background-color: #FCFDFD;
     --light-background-color: #FCFDFD;