ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various CodeClimate warnings

rebase/4.0.0rc2
Claire 2021-03-06 13:12:35 +01:00
parent 454d036b74
commit 318efa49de
13 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/styles/_mixins.scss
View File

@ -55,7 +55,7 @@
outline: 0; outline: 0;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
border: none; border: 0;
box-shadow: none; box-shadow: none;
font-family: inherit; font-family: inherit;
background: $ui-base-color; background: $ui-base-color;

8
app/javascript/flavours/glitch/styles/accessibility.scss
View File

@ -15,21 +15,21 @@ $emojis-requiring-inversion: 'back' 'copyright' 'curly_loop' 'currency_exchange'
.hicolor-privacy-icons { .hicolor-privacy-icons {
.status__visibility-icon.fa-globe, .status__visibility-icon.fa-globe,
.composer--options--dropdown--content--item .fa-globe { .composer--options--dropdown--content--item .fa-globe {
color: #1976D2; color: #1976d2;
} }
.status__visibility-icon.fa-unlock, .status__visibility-icon.fa-unlock,
.composer--options--dropdown--content--item .fa-unlock { .composer--options--dropdown--content--item .fa-unlock {
color: #388E3C; color: #388e3c;
} }
.status__visibility-icon.fa-lock, .status__visibility-icon.fa-lock,
.composer--options--dropdown--content--item .fa-lock { .composer--options--dropdown--content--item .fa-lock {
color: #FFA000; color: #ffa000;
} }
.status__visibility-icon.fa-envelope, .status__visibility-icon.fa-envelope,
.composer--options--dropdown--content--item .fa-envelope { .composer--options--dropdown--content--item .fa-envelope {
color: #D32F2F; color: #d32f2f;
} }
} }

2
app/javascript/flavours/glitch/styles/admin.scss
View File

@ -267,7 +267,7 @@ $content-width: 840px;
text-transform: none; text-transform: none;
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 0; margin-bottom: 0;
border-bottom: none; border-bottom: 0;
} }
& > p { & > p {

4
app/javascript/flavours/glitch/styles/components/accounts.scss
View File

@ -14,7 +14,7 @@
} }
&.small { &.small {
border: none; border: 0;
padding: 0; padding: 0;
& > .account__avatar-wrapper { margin: 0 8px 0 0 } & > .account__avatar-wrapper { margin: 0 8px 0 0 }
@ -278,7 +278,7 @@
} }
.account-gallery__item { .account-gallery__item {
border: none; border: 0;
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
position: relative; position: relative;

2
app/javascript/flavours/glitch/styles/components/columns.scss
View File

@ -264,7 +264,7 @@
& > button { & > button {
margin: 0; margin: 0;
border: none; border: 0;
padding: 15px; padding: 15px;
color: inherit; color: inherit;
background: transparent; background: transparent;

22
app/javascript/flavours/glitch/styles/components/composer.scss
View File

@ -44,7 +44,7 @@
display: block; display: block;
box-sizing: border-box; box-sizing: border-box;
margin: 0; margin: 0;
border: none; border: 0;
border-radius: 4px; border-radius: 4px;
padding: 10px; padding: 10px;
width: 100%; width: 100%;
@ -81,7 +81,9 @@
&:active, &:active,
&:focus, &:focus,
&:hover { text-decoration: none } &:hover {
text-decoration: none;
}
} }
} }
@ -256,7 +258,7 @@
display: block; display: block;
box-sizing: border-box; box-sizing: border-box;
margin: 0; margin: 0;
border: none; border: 0;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
padding: 10px 32px 0 10px; padding: 10px 32px 0 10px;
width: 100%; width: 100%;
@ -277,9 +279,17 @@
all: unset; all: unset;
} }
&:disabled { background: $ui-secondary-color } &:disabled {
&:focus { outline: 0 } background: $ui-secondary-color;
@include single-column('screen and (max-width: 630px)') { font-size: 16px } }
&:focus {
outline: 0;
}
@include single-column('screen and (max-width: 630px)') {
font-size: 16px;
}
@include limited-single-column('screen and (max-width: 600px)') { @include limited-single-column('screen and (max-width: 600px)') {
height: 100px !important; // prevent auto-resize textarea height: 100px !important; // prevent auto-resize textarea

12
app/javascript/flavours/glitch/styles/components/drawer.scss
View File

@ -15,10 +15,16 @@
padding-right: 10px; padding-right: 10px;
} }
@include single-column('screen and (max-width: 630px)') { flex: auto } @include single-column('screen and (max-width: 630px)') {
flex: auto;
}
@include limited-single-column('screen and (max-width: 630px)') { @include limited-single-column('screen and (max-width: 630px)') {
&, &:first-child, &:last-child { padding: 0 } &,
&:first-child,
&:last-child {
padding: 0;
}
} }
.wide & { .wide & {
@ -230,7 +236,7 @@
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
border: none; border: 0;
cursor: inherit; cursor: inherit;
} }

2
app/javascript/flavours/glitch/styles/components/index.scss
View File

@ -1038,7 +1038,7 @@
.setting-text { .setting-text {
color: $darker-text-color; color: $darker-text-color;
background: transparent; background: transparent;
border: none; border: 0;
border-bottom: 2px solid $ui-primary-color; border-bottom: 2px solid $ui-primary-color;
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;

2
app/javascript/flavours/glitch/styles/components/media.scss
View File

@ -82,7 +82,7 @@
} }
.media-gallery__item { .media-gallery__item {
border: none; border: 0;
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
float: left; float: left;

2
app/javascript/flavours/glitch/styles/components/modal.scss
View File

@ -876,7 +876,7 @@
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
width: 100%; width: 100%;
border: none; border: 0;
padding: 10px; padding: 10px;
font-family: 'mastodon-font-monospace', monospace; font-family: 'mastodon-font-monospace', monospace;
background: $ui-base-color; background: $ui-base-color;

8
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -209,7 +209,7 @@
display: inline-block; display: inline-block;
border-radius: 2px; border-radius: 2px;
background: lighten($ui-base-color, 30%); background: lighten($ui-base-color, 30%);
border: none; border: 0;
color: $inverted-text-color; color: $inverted-text-color;
font-weight: 500; font-weight: 500;
font-size: 11px; font-size: 11px;
@ -389,8 +389,10 @@
&:after { &:after {
content: ""; content: "";
position: absolute; position: absolute;
top: 0; bottom: 0; top: 0;
left: 0; right: 0; bottom: 0;
left: 0;
right: 0;
background: linear-gradient(rgba($ui-base-color, 0), rgba($ui-base-color, 1)); background: linear-gradient(rgba($ui-base-color, 0), rgba($ui-base-color, 1));
pointer-events: none; pointer-events: none;
} }

2
app/javascript/flavours/glitch/styles/forms.scss
View File

@ -625,7 +625,7 @@ code {
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
width: 100%; width: 100%;
border: none; border: 0;
padding: 10px; padding: 10px;
font-family: $font-monospace, monospace; font-family: $font-monospace, monospace;
background: $ui-base-color; background: $ui-base-color;

16
app/javascript/styles/mastodon/admin.scss
View File

@ -459,22 +459,6 @@ body,
} }
} }
.flavour-screen {
display: block;
margin: 10px auto;
max-width: 100%;
}
.flavour-description {
display: block;
font-size: 16px;
margin: 10px 0;
& > p {
margin: 10px 0;
}
}
.report-accounts { .report-accounts {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;