Yuki Takei 5 лет назад
Родитель
Сommit
e614e4dcab

+ 1 - 3
src/client/styles/scss/_layout.scss

@@ -1,5 +1,3 @@
-@import 'layout_variable';
-
 // FIXME: replace with mt-2 or mt-3
 .grw-mt-10px {
   margin-top: 10px !important;
@@ -29,7 +27,7 @@
 
 .grw-modal-head {
   font-size: 1em;
-  border-bottom: 1px solid $grw-line-gray;
+  border-bottom: 1px solid $gray-500;
 }
 
 .main {

+ 1 - 2
src/client/styles/scss/_layout_growi.scss

@@ -1,4 +1,3 @@
-@import 'layout_variable';
 @import 'layout';
 
 .growi {
@@ -10,7 +9,7 @@
     // adjusting position with negative margin
     height: $grw-nav-main-tab-height;
     line-height: 1.25;
-    border-bottom: 1px solid $grw-line-gray;
+    border-bottom: 1px solid transparent;
 
     .liker-user-count,
     .seen-user-count {

+ 0 - 8
src/client/styles/scss/_layout_variable.scss

@@ -1,8 +0,0 @@
-/* color variables */
-
-/* blue */
-$grw-alice-blue: aliceblue;
-
-/* gray */
-$grw-line-gray: #dee2e6;
-$grw-line-light-gray: #ddd;

+ 0 - 2
src/client/styles/scss/_mixins.scss

@@ -1,5 +1,3 @@
-@import 'layout_variable';
-
 @mixin variable-font-size($basesize) {
   font-size: $basesize * 0.6;
 

+ 0 - 1
src/client/styles/scss/_on-edit.scss

@@ -1,5 +1,4 @@
 @import 'editor-overlay';
-@import 'layout_variable';
 
 body:not(.on-edit) {
   // hide .page-editor-footer

+ 0 - 7
src/client/styles/scss/_search.scss

@@ -1,5 +1,3 @@
-@import 'layout_variable';
-
 .search-listpage-icon {
   font-size: 16px;
   color: #999;
@@ -213,9 +211,4 @@
   caption {
     display: table-header-group;
   }
-
-  code {
-    padding: 0.25em;
-    background: $grw-alice-blue;
-  }
 }

+ 1 - 3
src/client/styles/scss/_wiki.scss

@@ -1,5 +1,3 @@
-@import 'layout_variable';
-
 div.body {
   padding: 10px;
 }
@@ -36,7 +34,7 @@ div.body {
     margin-top: 2em;
     font-size: 1.8em;
     line-height: 1.1em;
-    border-bottom: solid 1px $grw-line-light-gray;
+    border-bottom: solid 1px transparent;
   }
   h2 {
     padding-bottom: 0.5em;

+ 0 - 1
src/client/styles/scss/style-app.scss

@@ -40,7 +40,6 @@
 @import 'layout';
 @import 'layout_growi';
 @import 'layout_kibela';
-@import 'layout_variable';
 @import 'login';
 @import 'me';
 @import 'navbar';

+ 2 - 30
src/client/styles/scss/theme/_apply-colors-dark.scss

@@ -39,20 +39,6 @@ textarea.form-control {
   }
 }
 
-/*
- * Panel
- */
-.panel {
-  &,
-  &.panel-white,
-  &.panel-default {
-    .panel-heading,
-    .panel-body {
-      color: theme-color('light');
-    }
-  }
-}
-
 /*
  * Table
  */
@@ -138,18 +124,6 @@ ul.pagination {
   background-color: $bgcolor-subnabvar;
 }
 
-/*
- * GROWI search page
- */
-.search-page {
-  .input-group-btn {
-    .btn-light {
-      // FIXME:
-      // border: 1px solid darken($border, 30%); // fit to input.form-control
-    }
-  }
-}
-
 /*
  * GROWI on-edit
  */
@@ -161,12 +135,10 @@ ul.pagination {
 
 .wiki {
   h1 {
-    // FIXME:
-    // border-color: lighten($border, 10%);
+    border-color: lighten($border-color-theme, 10%);
   }
   h2 {
-    // FIXME:
-    // border-color: $border;
+    border-color: $border-color-theme;
   }
 }
 

+ 4 - 0
src/client/styles/scss/theme/_apply-colors.scss

@@ -230,6 +230,10 @@ pre:not(.hljs):not(.CodeMirror-line) {
   }
 }
 
+.liker-and-seenusers {
+  border-bottom-color: $bordercolor-nav-tabs;
+}
+
 /*
  * cards
  */