Преглед изворни кода

Changed the description about grw-modal-head.
Corrected border colors specified by other than apply-colors.

oshikishintaro пре 5 година
родитељ
комит
49f9f4bc40

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

@@ -16,7 +16,7 @@ body {
 
 
 .grw-modal-head {
 .grw-modal-head {
   font-size: 1em;
   font-size: 1em;
-  border-bottom: 1px solid $modal-header-border-color;
+  border-bottom: 1px solid transparent;
 }
 }
 
 
 // padding settings for GrowiNavbarBottom
 // padding settings for GrowiNavbarBottom

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

@@ -7,7 +7,7 @@
 
 
   .top-of-table-contents {
   .top-of-table-contents {
     line-height: 1.25;
     line-height: 1.25;
-    border-bottom: 1px solid $border-color;
+    border-bottom: 1px solid transparent;
 
 
     .user-list-content {
     .user-list-content {
       direction: rtl;
       direction: rtl;

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

@@ -22,11 +22,9 @@ $table-dark-bg: $bgcolor-table;
 $table-dark-border-color: $border-color-table;
 $table-dark-border-color: $border-color-table;
 $table-dark-hover-color: $color-table-hover;
 $table-dark-hover-color: $color-table-hover;
 $table-dark-hover-bg: $bgcolor-table-hover;
 $table-dark-hover-bg: $bgcolor-table-hover;
-$modal-header-border-color: $border-color;
 
 
 @import 'reboot-bootstrap-border-colors';
 @import 'reboot-bootstrap-border-colors';
 @import 'reboot-bootstrap-tables';
 @import 'reboot-bootstrap-tables';
-@import 'reboot-bootstrap-modal';
 
 
 // List Group
 // List Group
 @include override-list-group-item($color-list, $bgcolor-list, $color-list-hover, $bgcolor-list-hover, $color-list-active, $bgcolor-list-active);
 @include override-list-group-item($color-list, $bgcolor-list, $color-list-hover, $bgcolor-list-hover, $color-list-active, $bgcolor-list-active);
@@ -369,3 +367,10 @@ ul.pagination {
     }
     }
   }
   }
 }
 }
+
+/*
+ * modal
+ */
+.grw-modal-head {
+  border-color: $border-color;
+}

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

@@ -283,3 +283,16 @@ $table-hover-bg: $bgcolor-table-hover;
     background-color: $bgcolor-tags;
     background-color: $bgcolor-tags;
   }
   }
 }
 }
+
+.revision-toc {
+  .top-of-table-contents {
+    border-color: $border-color;
+  }
+}
+
+/*
+ * modal
+ */
+.grw-modal-head {
+  border-color: $border-color;
+}

+ 0 - 3
src/client/styles/scss/theme/_reboot-bootstrap-modal.scss

@@ -1,3 +0,0 @@
-.grw-modal-head {
-  border-bottom-color: $modal-header-border-color;
-}