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

Merge pull request #879 from weseek/for-change-by-eslint

auto change by eslint
Yuki Takei 7 лет назад
Родитель
Сommit
b17a0a7d22
2 измененных файлов с 43 добавлено и 10 удалено
  1. 28 9
      src/client/styles/scss/_on-edit.scss
  2. 15 1
      src/client/styles/scss/_page.scss

+ 28 - 9
src/client/styles/scss/_on-edit.scss

@@ -1,6 +1,7 @@
 @import 'editor-overlay';
 
 body:not(.on-edit) {
+
   // hide .page-editor-footer
   .page-editor-footer {
     display: none !important;
@@ -18,10 +19,11 @@ body.on-edit {
 
   // for growi layout
   .main {
-    > .row {
+    >.row {
       margin: 0;
-      > .col-lg-10,
-      > .col-md-9 {
+
+      >.col-lg-10,
+      >.col-md-9 {
         width: 100%;
         padding: 0;
       }
@@ -63,12 +65,14 @@ body.on-edit {
   &.hackmd .nav-tab-edit {
     display: none;
   }
+
   &:not(.hackmd) .nav-tab-hackmd {
     display: none;
   }
 
   // hide hackmd related alert
   &.hackmd #page-status-alert {
+
     .alert-hackmd-someone-editing,
     .alert-hackmd-draft-exists {
       display: none;
@@ -94,7 +98,7 @@ body.on-edit {
 
     background: none;
 
-    > .header-container {
+    >.header-container {
       width: 100%; //   for crowi layout
       padding: 0; //    for crowi layout
       pointer-events: initial; // enable pointer-events
@@ -103,8 +107,10 @@ body.on-edit {
     .header-wrap {
       overflow-x: hidden;
     }
+
     div.title-container {
       margin-right: 0px;
+
       h1#revision-path {
         @include variable-font-size(20px);
         line-height: 1em;
@@ -113,14 +119,17 @@ body.on-edit {
         .d-flex {
           flex-wrap: nowrap;
         }
+
         .path-segment {
           white-space: nowrap;
         }
       }
     }
+
     div#page-tag {
       display: inline;
       margin-right: auto;
+
       .page-tag-form {
         border-radius: 5px;
       }
@@ -144,6 +153,7 @@ body.on-edit {
         min-width: 150px;
       }
     }
+
     .btn-submit {
       width: 100px;
     }
@@ -163,16 +173,19 @@ body.on-edit {
   }
 
   &.builtin-editor {
+
     /*****************
     * Editor styles
     *****************/
     .page-editor-editor-container {
       border-right: 1px solid transparent;
+
       // override CodeMirror styles
       .CodeMirror {
         .cm-matchhighlight {
           background-color: cyan;
         }
+
         .CodeMirror-selection-highlight-scrollbar {
           background-color: darkcyan;
         }
@@ -201,8 +214,8 @@ body.on-edit {
         border: none;
       }
     }
-    .page-editor-preview-container {
-    }
+
+    .page-editor-preview-container {}
 
     .page-editor-preview-body {
       padding-top: 18px;
@@ -221,7 +234,8 @@ body.on-edit {
           display: inline-block;
           width: 20px;
         }
-        .dropdown-menu > li > a {
+
+        .dropdown-menu>li>a {
           display: flex;
           align-items: center;
           justify-content: space-between;
@@ -250,7 +264,9 @@ body.on-edit {
         min-width: 150px;
       }
     }
-  } // .builtin-editor .tab-pane#edit
+  }
+
+  // .builtin-editor .tab-pane#edit
 
   &.hackmd {
     #page-editor-options-selector {
@@ -258,7 +274,7 @@ body.on-edit {
     }
 
     .hackmd-preinit,
-    #iframe-hackmd-container > iframe {
+    #iframe-hackmd-container>iframe {
       border: none;
     }
 
@@ -274,12 +290,14 @@ body.on-edit {
         padding-bottom: 6px; // for SplitButton
       }
     }
+
     .hackmd-resume-button-container {
       .dropdown-menu {
         right: 0;
         left: unset;
       }
     }
+
     .hackmd-discard-button {
       text-decoration: underline;
       vertical-align: unset;
@@ -316,6 +334,7 @@ body.on-edit {
       width: 30px;
     }
   }
+
   // active line
   .CodeMirror-hint-active.crowi-emoji-autocomplete {
     .img-container {

+ 15 - 1
src/client/styles/scss/_page.scss

@@ -8,6 +8,7 @@
    * header
    */
   header {
+
     // the container of h1
     div.title-container {
       margin-right: auto;
@@ -24,12 +25,15 @@
       @extend .text-muted;
       border: none;
       opacity: 0.3;
+
       &:not(:hover) {
         background-color: transparent;
       }
     }
+
     // change button opacity
     &:hover {
+
       .btn.btn-copy,
       .btn-copy-link,
       .btn.btn-edit {
@@ -42,15 +46,18 @@
       font-size: 1.2em;
       line-height: 0.8em;
       border: none;
+
       &:not(:hover):not(.active) {
         background-color: transparent;
       }
     }
+
     .btn-like {
       &.active {
         @extend .btn-info;
       }
     }
+
     .btn-bookmark {
       &.active {
         @extend .btn-warning;
@@ -65,6 +72,7 @@
     h1#revision-path {
       margin-top: 0;
       margin-bottom: 0;
+
       .d-flex {
         flex-wrap: wrap; // for long page path
       }
@@ -97,6 +105,7 @@
 .main-container .main .content-main .revision-history {
   .revision-history-list {
     .revision-history-outer {
+
       // add border-top except of first element
       &:not(:first-of-type) {
         border-top: 1px solid $border;
@@ -107,6 +116,7 @@
           width: 32px;
           height: 32px;
         }
+
         .revision-history-meta {
           a:hover {
             cursor: pointer;
@@ -122,12 +132,14 @@
           }
         }
       }
+
       .revision-history-main-nodiff {
         .picture-container {
           min-width: 32px;
           text-align: center; // centering .picture
         }
       }
+
       .revision-history-diff {
         padding-left: 40px;
       }
@@ -138,6 +150,7 @@
       list-style: none;
     }
   }
+
   // compacted list
   .revision-history-list-compact {
     .revision-history-outer-contiguous-nodiff {
@@ -150,6 +163,7 @@
   .d2h-file-header {
     display: none;
   }
+
   .d2h-diff-tbody {
     background-color: white;
   }
@@ -197,7 +211,7 @@
   opacity: 0;
   transition: opacity 0.3s ease-out;
 
-  & > * {
+  &>* {
     box-shadow: 0 0 20px rgba(0, 0, 0, 0.8);
   }
 }