Просмотр исходного кода

Merge pull request #7144 from weseek/imprv/apply-colors-div.grw-contextual-navigation

imprv:apply colors div.grw contextual navigation
ayaka0417 3 лет назад
Родитель
Сommit
4e41fb7439

+ 16 - 15
packages/app/src/styles/theme/_apply-colors.scss

@@ -186,7 +186,7 @@ ul.pagination {
 
   // for https://youtrack.weseek.co.jp/issue/GW-2603
   .search-typeahead {
-    background-color: hsla(var(--bgcolor-global-hs),var(--bgcolor-global-l),90%);
+    background-color: hsla(var(--bgcolor-global-hs),var(--bgcolor-global-l),10%);
   }
 }
 
@@ -310,17 +310,17 @@ ul.pagination {
   }
 }
 
-// /*
-//  * Icon
-//  */
-// .editor-container .navbar-editor svg {
-//   fill: var(--color-editor-icons);
-// }
+/*
+ * Icon
+ */
+.editor-container .navbar-editor svg {
+  fill: var(--color-editor-icons);
+}
 
-// // page preview button in link form
-// .btn-page-preview svg {
-//   fill: white;
-// }
+// page preview button in link form
+.btn-page-preview svg {
+  fill: white;
+}
 
 /*
  * Modal
@@ -332,7 +332,8 @@ ul.pagination {
       color: var(--color-modal-header);
     }
     .close {
-      color: hsla(var(--color-modal-header),50%);
+      color: hsla(var(--primary-hs),var(--primary-l),50%);
+
       &:hover {
         opacity: 0.9;
       }
@@ -352,7 +353,7 @@ ul.pagination {
   .nav-item {
     &:hover,
     &:focus {
-      background-color: hsla(var(--color-link),90%);
+      background-color: hsla(var(--color-link-hs),var(--color-link-l),10%);
     }
     .nav-link {
       -webkit-appearance: none;
@@ -379,7 +380,7 @@ ul.pagination {
 .grw-page-accessories-modal {
   .modal-header {
     .close {
-      color: $secondary;
+      color: var(--secondary);
     }
   }
 }
@@ -396,7 +397,7 @@ ul.pagination {
 
 .admin-bot-card {
   .grw-botcard-title-active {
-    color: $gray-200;
+    color: #{$gray-200};
   }
 }
 

+ 75 - 75
packages/preset-themes/src/styles/theme/_apply-colors.scss

@@ -314,100 +314,100 @@
 /*
  * Icon
  */
-.editor-container .navbar-editor svg {
-  fill: var(--color-editor-icons);
-}
+// .editor-container .navbar-editor svg {
+//   fill: var(--color-editor-icons);
+// }
 
-// page preview button in link form
-.btn-page-preview svg {
-  fill: white;
-}
+// // page preview button in link form
+// .btn-page-preview svg {
+//   fill: white;
+// }
 
-/*
- * Modal
- */
-.modal {
-  .modal-header {
-    // border-bottom-color: $border-color-theme;
-    .modal-title {
-      // color: $color-modal-header;
-    }
-    .close {
-      // color: $color-modal-header;
-      opacity: 0.5;
-      &:hover {
-        opacity: 0.9;
-      }
-    }
-  }
+// /*
+//  * Modal
+//  */
+// .modal {
+//   .modal-header {
+//     border-bottom-color: var(--border-color-theme);
+//     .modal-title {
+//       color: var(--color-modal-header);
+//     }
+//     .close {
+//       color: var(--color-modal-header);
+//       opacity: 0.5;
+//       &:hover {
+//         opacity: 0.9;
+//       }
+//     }
+//   }
 
-  .modal-content {
-    background-color: var(--bgcolor-global);
-  }
+//   .modal-content {
+//     background-color: var(--bgcolor-global);
+//   }
 
-  .modal-footer {
-    // border-top-color: $border-color-theme;
-  }
-}
+//   .modal-footer {
+//     border-top-color: var(--border-color-theme);
+//   }
+// }
 
-.grw-custom-nav-tab {
-  .nav-item {
-    &:hover,
-    &:focus {
-      background-color: var(--color-link); opacity:0.9;
-    }
-    .nav-link {
-      -webkit-appearance: none;
-      color: var(--color-link);
-      svg {
-        fill: var(--color-link);
-      }
+// .grw-custom-nav-tab {
+//   .nav-item {
+//     &:hover,
+//     &:focus {
+//       background-color: hsla(var(--color-link-hs),var(--color-link-l),10%);
+//     }
+//     .nav-link {
+//       -webkit-appearance: none;
+//       color: var(--color-link);
+//       svg {
+//         fill: var(--color-link);
+//       }
 
-      // Disabled state lightens text
-      &.disabled {
-        color: $nav-link-disabled-color;
-        svg {
-          fill: $nav-link-disabled-color;
-        }
-      }
-    }
-  }
+//       // Disabled state lightens text
+//       &.disabled {
+//         color: $nav-link-disabled-color;
+//         svg {
+//           fill: $nav-link-disabled-color;
+//         }
+//       }
+//     }
+//   }
 
-  .grw-nav-slide-hr {
-    border-color: var(--color-link);
-  }
-}
+//   .grw-nav-slide-hr {
+//     border-color: var(--color-link);
+//   }
+// }
 
-.grw-page-accessories-modal {
-  .modal-header {
-    .close {
-      color: $secondary;
-    }
-  }
-}
+// .grw-page-accessories-modal {
+//   .modal-header {
+//     .close {
+//       color: var(--secondary);
+//     }
+//   }
+// }
 
 /*
  * cards
  */
-.card.well {
-  color: var(--color-global);
-  background-color: var(--bgcolor-card);
-  border-color: $light;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
+// .card.well {
+//   color: var(--color-global);
+//   background-color: var(--bgcolor-card);
+//   border-color: var(--light);
+//   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+// }
 
-.admin-bot-card {
-  .grw-botcard-title-active {
-    color: $gray-200;
-  }
-}
+// .admin-bot-card {
+//   .grw-botcard-title-active {
+//     color: #{$gray-200};
+//   }
+// }
 
 /*
  * Form Slider
  */
 .admin-page {
   span.slider {
-    background-color: $gray-300;
+    background-color: #{$gray-300};
 
     &:before {
       background-color: white;