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 11, 2024
1 parent 5b97f79 commit 54dc06d
Show file tree
Hide file tree
Showing 11 changed files with 115 additions and 120 deletions.
2 changes: 0 additions & 2 deletions .stylelintignore

This file was deleted.

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

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions client/src/components/GalleryItem/GalleryItem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,20 @@ $gallery-item-label-height: 40px;
}

.gallery-item__thumbnail--loading {
background: white url("../../images/spinner.gif") center center no-repeat;
background: #fff url("../../images/spinner.gif") center center no-repeat;
}

/* stylelint-disable media-feature-name-no-unknown */
@media
only screen and (min-device-pixel-ratio: 2),
only screen and (resolution >= 192dpi),
only screen and (resolution >= 2dppx) {
.gallery-item__thumbnail--loading {
background: white url("../../images/[email protected]") center center no-repeat;
background: #fff url("../../images/[email protected]") center center no-repeat;
background-size: 43px 43px;
}
}
/* stylelint-enable media-feature-name-no-unknown */

.gallery-item__thumbnail--small {
background-size: auto;
Expand Down
74 changes: 36 additions & 38 deletions client/src/components/InsertEmbedModal/InsertEmbedModal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
$placement-image-width: 40px;
$placement-image-height: 36px;

&-label {
.form-check-label {
display: block;
cursor: pointer;

Expand Down Expand Up @@ -122,7 +122,7 @@
}
}

&-input {
.form-check-input {
position: absolute;
left: -9999px;

Expand All @@ -137,55 +137,53 @@
}
}

.option-val {
&--leftAlone { // sass-lint:disable-line class-name-format
+ span:before {
background-position-y: -$placement-image-height;
}
.option-val--leftAlone {
+ span:before {
background-position-y: -$placement-image-height;
}

&.checked + span:before {
background-position-y: 0;
}
&.checked + span:before {
background-position-y: 0;
}
}

&--center {
+ span:before {
background-position-y: 3 * -$placement-image-height;
}
.option-val--center {
+ span:before {
background-position-y: 3 * -$placement-image-height;
}

&.checked + span:before {
background-position-y: 2 * -$placement-image-height;
}
&.checked + span:before {
background-position-y: 2 * -$placement-image-height;
}
}

&--rightAlone { // sass-lint:disable-line class-name-format
+ span:before {
background-position-y: 5 * -$placement-image-height;
}
.option-val--rightAlone {
+ span:before {
background-position-y: 5 * -$placement-image-height;
}

&.checked + span:before {
background-position-y: 4 * -$placement-image-height;
}
&.checked + span:before {
background-position-y: 4 * -$placement-image-height;
}
}

&--left {
+ span:before {
background-position-y: 7 * -$placement-image-height;
}
.option-val--left {
+ span:before {
background-position-y: 7 * -$placement-image-height;
}

&.checked + span:before {
background-position-y: 6 * -$placement-image-height;
}
&.checked + span:before {
background-position-y: 6 * -$placement-image-height;
}
}

&--right {
+ span:before {
background-position-y: 9 * -$placement-image-height;
}
.option-val--right {
+ span:before {
background-position-y: 9 * -$placement-image-height;
}

&.checked + span:before {
background-position-y: 8 * -$placement-image-height;
}
&.checked + span:before {
background-position-y: 8 * -$placement-image-height;
}
}
}
Expand Down
1 change: 0 additions & 1 deletion client/src/components/UploadField/UploadField.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
&:after {
inset: 0;
box-shadow: inset 0 0 10px 0 rgba(0, 0, 0, .2);
background-image: none;
background: rgba(0, 0, 0, .03);
}
}
Expand Down
16 changes: 8 additions & 8 deletions client/src/components/UploadField/UploadFieldItem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ $uploadfield-item-label-height: 40px;
border-top-right-radius: $border-radius-sm;
}

.uploadfield-item--folder {
.uploadfield-item__thumbnail {
background: url("../../images/folder.png") 12px 14px no-repeat;
background-size: 27px 24px;
}
}

.uploadfield-item__thumbnail {
height: $file-item-thumb-height;
width: $file-item-thumb-width;
Expand All @@ -60,6 +53,13 @@ $uploadfield-item-label-height: 40px;
border-radius: $border-radius-sm $border-radius-sm 0 0;
}

.uploadfield-item--folder {
.uploadfield-item__thumbnail {
background: url("../../images/folder.png") 12px 14px no-repeat;
background-size: 27px 24px;
}
}

.uploadfield-item__thumbnail--small {
background-size: auto;
background-color: #fff;
Expand Down Expand Up @@ -147,7 +147,7 @@ $uploadfield-item-label-height: 40px;
height: 28px;
margin: 16px 5px;
padding: 0 10px;
color: white;
color: #fff;
background: $brand-danger;
border-radius: 14px;
max-width: 50%;
Expand Down
47 changes: 23 additions & 24 deletions client/src/containers/Editor/Editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,19 @@
margin-bottom: 2px;
}

.editor-header__field {
.editor__status-flag {
color: #f46b00;
background-color: #fff7f2;
border-color: #f46b00;
clear: both;
text-transform: uppercase;
display: inline-block;
position: relative;
line-height: 1rem;
margin-left: 3px;
}

.editor-header__field {
.file-status-icon {
margin-left: 6px;

Expand Down Expand Up @@ -83,18 +94,6 @@
}
}

.editor__status-flag {
color: #f46b00;
background-color: #fff7f2;
border-color: #f46b00;
clear: both;
text-transform: uppercase;
display: inline-block;
position: relative;
line-height: 1rem;
margin-left: 3px;
}

.editor__specs {
color: $text-muted;
font-size: $font-size-xxs;
Expand All @@ -106,6 +105,16 @@
margin: #{-(calc($panel-padding-x / 2))} #{-$panel-padding-x} $spacer;
}

.editor__thumbnail {
display: block;
max-width: 100%;
max-height: $cms-panel-md * .75;
min-height: 80px;
margin: auto;
transform: scale(1);
transition: all .5s;
}

.editor__file-preview {
text-align: center;
margin: 0 #{-$panel-padding-x} $spacer-xs;
Expand Down Expand Up @@ -159,16 +168,6 @@
}
}

.editor__thumbnail {
display: block;
max-width: 100%;
max-height: $cms-panel-md * .75;
min-height: 80px;
margin: auto;
transform: scale(1);
transition: all .5s;
}

.editor__file-preview-message--file-missing {
margin: #{$spacer * 2} 0 $spacer ;
font-size: $font-size-lg;
Expand All @@ -191,7 +190,7 @@
flex-wrap: wrap;
margin-top: -10px;

& > div {
> div {
width: 100%;
}

Expand Down
65 changes: 32 additions & 33 deletions client/src/containers/Gallery/Gallery.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@

.gallery__back--droppable-hover {
background-color: $btn-secondary-bg;
border-color: transparent;
transform: scale(1.3);
border: 1px solid $brand-primary;
}
Expand Down Expand Up @@ -122,25 +121,10 @@
// Override chosen inline width to fit to icon
.chosen-container {
@include media-breakpoint-down(sm) {
width: auto !important; // sass-lint:disable-line no-important
width: auto !important;
}
}

.chosen-container-active {
.chosen-single {
outline: 5px auto -webkit-focus-ring-color;
}
}

.gallery & .chosen-single {
border: 0;
filter: none; //IE9
background: none;
box-shadow: none;
color: inherit;
margin-top: -1px;
}

.chosen-single {
display: flex;
align-items: center;
Expand Down Expand Up @@ -174,6 +158,21 @@
}
}

.chosen-container-active {
.chosen-single {
outline: 5px auto -webkit-focus-ring-color;
}
}

.gallery & .chosen-single {
border: 0;
filter: none; //IE9
background: none;
box-shadow: none;
color: inherit;
margin-top: -1px;
}

.chosen-drop {
min-width: 160px;
right: 0;
Expand Down Expand Up @@ -256,6 +255,14 @@
$griddle-button-width: 36px;
$griddle-button-height: 30px;

.griddle-previous button:before {
content: "'";
}

.griddle-next button:before {
content: "&";
}

.griddle-previous,
.griddle-next {
width: $griddle-button-width; // hold space so pagination doesn't move around
Expand All @@ -270,15 +277,6 @@ $griddle-button-height: 30px;
border-radius: $btn-border-radius;
overflow: hidden;

&:hover {
background-color: $gray-200;
border-color: transparent;

&:before {
background-color: $gray-200;
}
}

&:before {
font-family: "silverstripe";
color: $text-muted;
Expand All @@ -294,15 +292,16 @@ $griddle-button-height: 30px;
-webkit-font-smoothing: antialiased;
line-height: $line-height-base;
}
}
}

.griddle-previous button:before {
content: "'";
}
&:hover {
background-color: $gray-200;
border-color: transparent;

.griddle-next button:before {
content: "&";
&:before {
background-color: $gray-200;
}
}
}
}
// Pagination end

Expand Down
8 changes: 4 additions & 4 deletions client/src/containers/TableView/TableView.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
th.sort--disabled>span:after {
content: "";
}

.gallery__table {
margin-bottom: -$panel-padding-y;

Expand Down Expand Up @@ -216,7 +220,3 @@ $gallery-list-thumb-height: 68px;
font-family: "silverstripe", sans-serif;
content: "I";
}

th.sort--disabled>span:after {
content: "";
}
Loading

0 comments on commit 54dc06d

Please sign in to comment.