Skip to content

Commit

Permalink
MNT Fix scss lint warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Jun 5, 2024
1 parent bad865d commit 21e9ca6
Show file tree
Hide file tree
Showing 6 changed files with 486 additions and 877 deletions.
2 changes: 0 additions & 2 deletions .stylelintignore

This file was deleted.

2 changes: 1 addition & 1 deletion client/dist/styles/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions client/src/styles/blog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,8 @@
width: 98.75%;
}

.blog-sidebar .WidgetHolder ul {
margin-left: 0;

li {
list-style-type: none;
}
}

// tag cloud related
$base_tag_font_size: 4pt;
$base-tag-font-size: 4pt;

ul.blogTagCloud {
list-style-type: none;
Expand All @@ -34,43 +26,51 @@ ul.blogTagCloud {
}
}

.blog-sidebar .WidgetHolder ul {
margin-left: 0;

li {
list-style-type: none;
}
}

.tagCount10 {
font-size: $base_tag_font_size + 22pt;
font-size: $base-tag-font-size + 22pt;
}

.tagCount9 {
font-size: $base_tag_font_size + 20pt;
font-size: $base-tag-font-size + 20pt;
}

.tagCount8 {
font-size: $base_tag_font_size + 18pt;
font-size: $base-tag-font-size + 18pt;
}

.tagCount7 {
font-size: $base_tag_font_size + 16pt;
font-size: $base-tag-font-size + 16pt;
}

.tagCount6 {
font-size: $base_tag_font_size + 14pt;
font-size: $base-tag-font-size + 14pt;
}

.tagCount5 {
font-size: $base_tag_font_size + 12pt;
font-size: $base-tag-font-size + 12pt;
}

.tagCount4 {
font-size: $base_tag_font_size + 10pt;
font-size: $base-tag-font-size + 10pt;
}

.tagCount3 {
font-size: $base_tag_font_size + 8pt;
font-size: $base-tag-font-size + 8pt;
}

.tagCount2 {
font-size: $base_tag_font_size + 6pt;
font-size: $base-tag-font-size + 6pt;
}

.tagCount1 {
font-size: $base_tag_font_size + 4pt;
font-size: $base-tag-font-size + 4pt;
}
}
29 changes: 16 additions & 13 deletions client/src/styles/cms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
* CMS Styles
*/

#FeaturedImage .middleColumn {
clear: none;
float: left;
.cms table.ss-gridfield-table tr td.MergeAction a {
display: block;
height: 100%;
width: 100%;
}

/* stylelint-disable max-nesting-depth */

.has-panel .cms-content-tools.blog-admin-sidebar {
width: 280px;
border-right: 0;
Expand All @@ -22,16 +25,15 @@
}

.cms-panel-toggle.south {
border-top: 1px solid #aaaaaa;
border-top: 1px solid #aaa;
}

~ .blog-admin-outer {
width: 100%;
padding-right: 280px;
position: absolute;
height: 100%;
overflow-y: hidden;
overflow-x: hidden;
overflow: hidden hidden;
box-sizing: border-box;

> .ss-tabset {
Expand Down Expand Up @@ -109,6 +111,13 @@
}
}

/* stylelint-enable max-nesting-depth */

#FeaturedImage .middleColumn {
clear: none;
float: left;
}

.toggle-description {
display: inline-block;
font-size: 1.2rem;
Expand Down Expand Up @@ -148,12 +157,6 @@
tr td.MergeAction {
width: 225px;

a {
display: block;
height: 100%;
width: 100%;
}

select {
width: 150px;
}
Expand All @@ -167,7 +170,7 @@

.MergeActionReveal:after {
content: "@";
font-family: silverstripe;
font-family: "silverstripe";
display: inline-block;
position: relative;
margin-left: 10px;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"lint": "yarn lint-js && yarn lint-sass",
"lint-js": "eslint client/src",
"lint-js-fix": "eslint client/src --fix",
"lint-sass": "stylelint **/client/src/**/*.scss",
"lint-sass": "stylelint client/src/**/*.scss",
"test": "true"
},
"repository": {
Expand Down
Loading

0 comments on commit 21e9ca6

Please sign in to comment.