2
0
Эх сурвалжийг харах

fix rule-empty-line-before for stylelint

Yuki Takei 7 жил өмнө
parent
commit
0cca8e3293

+ 2 - 1
.stylelintrc.json

@@ -10,7 +10,8 @@
     "indentation": 2,
     "indentation": 2,
     "string-quotes": "single",
     "string-quotes": "single",
     "rule-empty-line-before": [ "always-multi-line", {
     "rule-empty-line-before": [ "always-multi-line", {
-      "ignore": ["after-comment", "after-single-line-comment", "first-nested"]
+      "except": ["after-single-line-comment", "first-nested"],
+      "ignore": ["after-comment", "inside-block"]
     } ],
     } ],
     "selector-combinator-space-before": "always",
     "selector-combinator-space-before": "always",
     "selector-combinator-space-after": "always"
     "selector-combinator-space-after": "always"

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

@@ -1,11 +1,13 @@
 .page-attachments-row {
 .page-attachments-row {
   border-top: solid 1px transparent;
   border-top: solid 1px transparent;
 }
 }
+
 .page-attachments {
 .page-attachments {
   li.attachment {
   li.attachment {
     list-style: none;
     list-style: none;
   }
   }
 }
 }
+
 .page-attachments,
 .page-attachments,
 .page-meta {
 .page-meta {
   font-size: 0.95em;
   font-size: 0.95em;

+ 1 - 0
src/client/styles/scss/_editor-attachment.scss

@@ -110,6 +110,7 @@
     }
     }
   }
   }
 }
 }
+
 .comment-form {
 .comment-form {
   @media (max-width: $screen-sm) {
   @media (max-width: $screen-sm) {
     .desc-long {
     .desc-long {

+ 1 - 0
src/client/styles/scss/_hljs.scss

@@ -30,6 +30,7 @@ pre.hljs {
   user-select: none;
   user-select: none;
   border-right: 1px solid #ccc;
   border-right: 1px solid #ccc;
 }
 }
+
 .hljs-ln td.hljs-ln-code {
 .hljs-ln td.hljs-ln-code {
   padding-left: 10px;
   padding-left: 10px;
 }
 }

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

@@ -107,6 +107,7 @@
 // fix tab width to 95 pixels
 // fix tab width to 95 pixels
 // see also '_on-edit.scss'
 // see also '_on-edit.scss'
 $nav-main-left-tab-width: 95px;
 $nav-main-left-tab-width: 95px;
+
 .nav.nav-tabs {
 .nav.nav-tabs {
   .nav-main-left-tab {
   .nav-main-left-tab {
     width: $nav-main-left-tab-width;
     width: $nav-main-left-tab-width;

+ 1 - 0
src/client/styles/scss/_layout_crowi_sidebar.scss

@@ -182,6 +182,7 @@ body:not(.aside-hidden) #toggle-sidebar {
     display: block;
     display: block;
   }
   }
 }
 }
+
 .aside-hidden {
 .aside-hidden {
   #toggle-sidebar {
   #toggle-sidebar {
     right: 0;
     right: 0;

+ 1 - 0
src/client/styles/scss/_layout_kibela.scss

@@ -187,6 +187,7 @@ body.kibela {
     }
     }
   }
   }
 }
 }
+
 .on-edit {
 .on-edit {
   .kibela-block {
   .kibela-block {
     border: 0px;
     border: 0px;

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

@@ -293,6 +293,7 @@ body.on-edit {
 .nav-tabs-create-portal {
 .nav-tabs-create-portal {
   display: none;
   display: none;
 }
 }
+
 .on-edit .nav-tabs-create-portal {
 .on-edit .nav-tabs-create-portal {
   display: block;
   display: block;
 }
 }

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

@@ -201,6 +201,7 @@
     box-shadow: 0 0 20px rgba(0, 0, 0, 0.8);
     box-shadow: 0 0 20px rgba(0, 0, 0, 0.8);
   }
   }
 }
 }
+
 .overlay-on {
 .overlay-on {
   #wrapper {
   #wrapper {
     filter: blur(5px);
     filter: blur(5px);

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

@@ -53,10 +53,12 @@
   font-weight: bold;
   font-weight: bold;
   color: #e80000;
   color: #e80000;
 }
 }
+
 .popular-page-mid {
 .popular-page-mid {
   font-weight: bold;
   font-weight: bold;
   color: #e47800;
   color: #e47800;
 }
 }
+
 .popular-page-low {
 .popular-page-low {
   color: #ab7c7c;
   color: #ab7c7c;
 }
 }

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

@@ -1,5 +1,6 @@
 // import react-bootstrap-typeahead
 // import react-bootstrap-typeahead
 @import '~react-bootstrap-typeahead/css/Typeahead';
 @import '~react-bootstrap-typeahead/css/Typeahead';
+
 .search-listpage-icon {
 .search-listpage-icon {
   font-size: 16px;
   font-size: 16px;
   color: #999;
   color: #999;
@@ -102,6 +103,7 @@
     }
     }
   }
   }
 }
 }
+
 .search-sidebar {
 .search-sidebar {
   .search-form,
   .search-form,
   .form-group,
   .form-group,
@@ -121,6 +123,7 @@
     //                                  since upgrade react-bootstrap-typeahead to v3.3.2 -- 2019.02.05 Yuki Takei
     //                                  since upgrade react-bootstrap-typeahead to v3.3.2 -- 2019.02.05 Yuki Takei
   }
   }
 }
 }
+
 #search-top,
 #search-top,
 #renamePage,
 #renamePage,
 #duplicatePage,
 #duplicatePage,

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

@@ -90,6 +90,7 @@
     content: '⌘';
     content: '⌘';
   }
   }
 }
 }
+
 .cmd-key.win {
 .cmd-key.win {
   &:after {
   &:after {
     content: 'Ctrl';
     content: 'Ctrl';

+ 2 - 0
src/client/styles/scss/theme/_override-agileadmin.scss

@@ -38,6 +38,7 @@
     text-transform: none;
     text-transform: none;
   }
   }
 }
 }
+
 .logo {
 .logo {
   .logo-mark {
   .logo-mark {
     svg {
     svg {
@@ -185,6 +186,7 @@ button.btn.btn-link:hover {
     padding: 7px 15px;
     padding: 7px 15px;
   }
   }
 }
 }
+
 .panel.panel-primary .panel-heading {
 .panel.panel-primary .panel-heading {
 }
 }