Sotaro KARASAWA 10 лет назад
Родитель
Сommit
1f3a1e69df
5 измененных файлов с 17 добавлено и 18 удалено
  1. 3 0
      resource/css/_form.scss
  2. 12 1
      resource/css/_layout.scss
  3. 2 3
      resource/css/_page.scss
  4. 0 8
      resource/css/_user.scss
  5. 0 6
      resource/css/crowi.scss

+ 3 - 0
resource/css/_form.scss

@@ -1,4 +1,6 @@
 .crowi.main-container .main .content-main.on-edit { // {{{ Edit Form of Page
+  padding: 0;
+
   position: fixed;
   z-index: 1060;
   background: #fff;
@@ -97,6 +99,7 @@
 } // }}}
 
 .crowi.main-container .main .page-list.content-main { // {{{ Edit Form of Page List
+
   .close-button {
     display: none;
   }

+ 12 - 1
resource/css/_layout.scss

@@ -61,6 +61,18 @@
 
     } // }}}
 
+    .main {
+      padding: 0; // cancel bootstrap padding
+
+      .header-wrap {
+        padding: 16px 16px 0 16px;
+      }
+
+      .content-main {
+        padding: 16px;
+      }
+    }
+
     .layout-control { // {{{
       transition: .3s ease;
       -webkit-transition: .3s ease;
@@ -249,7 +261,6 @@
     .main {
       article header {
         border-bottom: solid 1px #666;
-        margin-bottom: 20px;
         h1 {
           font-size: 2em;
           color: #000;

+ 2 - 3
resource/css/_page.scss

@@ -1,11 +1,11 @@
 .crowi.main-container {
+  // padding controll of .header-wrap and .content-main are moved to _layout and _form
 
   .main { // {{{ .main of layout related
     transition: .5s ease;
     -webkit-transition: .5s ease;
     background: #fff;
 
-    padding: 20px;
     article {
       background: #fff;
     }
@@ -89,7 +89,7 @@
   .main.grant-specified,
   .main.grant-owner {
     background: #333;
-    padding: 20px 10px;
+    padding: 16px;
 
     .page-grant {
       color: #ccc;
@@ -97,7 +97,6 @@
 
     article {
       border-radius: 5px;
-      padding: 20px;
     }
   }
   // }}}

+ 0 - 8
resource/css/_user.scss

@@ -1,9 +1,7 @@
 .crowi.main-container {
   .main.user-page { // {{{ .main of layout related
-    padding: 0;
 
     .header-wrap {
-      padding: 20px;
 
       h1 {
         margin: 0;
@@ -58,11 +56,5 @@
       }
 
     }
-    .content-main {
-      padding: 20px;
-      &.on-edit {
-        padding: 0;
-      }
-    }
   } // }}}
 }

+ 0 - 6
resource/css/crowi.scss

@@ -62,12 +62,6 @@ footer, aside {
   margin-bottom: 1em;
 }
 
-article {
-  header {
-    margin-bottom: 20px;
-  }
-}
-
 footer {
   h4,
   h3 {