mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Update admin page SCSS from upstream

This commit is contained in:
Thibaut Girka 2018-05-11 14:13:59 +02:00
parent 34142ab29c
commit db73c0bc5d
1 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,14 +141,15 @@
} }
hr { hr {
margin: 20px 0; width: 100%;
height: 0;
border: 0; border: 0;
background: transparent; border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
border-bottom: 1px solid $ui-base-color; margin: 20px 0;
&.section-break { &.spacer {
margin: 30px 0; height: 1px;
border-bottom: 2px solid $ui-base-lighter-color; border: 0;
} }
} }
@ -273,22 +274,6 @@
} }
} }
.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;
@ -351,34 +336,9 @@
} }
} }
.report-note__comment { .simple_form.new_report_note,
margin-bottom: 20px; .simple_form.new_account_moderation_note {
} max-width: 100%;
.report-note__form {
margin-bottom: 20px;
.report-note__textarea {
box-sizing: border-box;
border: 0;
padding: 7px 4px;
margin-bottom: 10px;
font-size: 16px;
color: $inverted-text-color;
display: block;
width: 100%;
outline: 0;
font-family: inherit;
resize: vertical;
}
.report-note__buttons {
text-align: right;
}
.report-note__button {
margin: 0 0 5px 5px;
}
} }
.batch-form-box { .batch-form-box {
@ -406,13 +366,6 @@
} }
} }
.batch-checkbox,
.batch-checkbox-all {
display: flex;
align-items: center;
margin-right: 5px;
}
.back-link { .back-link {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 14px; font-size: 14px;
@ -432,7 +385,7 @@
} }
.log-entry { .log-entry {
margin-bottom: 8px; margin-bottom: 20px;
line-height: 20px; line-height: 20px;
&__header { &__header {
@ -530,9 +483,12 @@
} }
} }
a.name-tag,
.name-tag { .name-tag {
display: flex; display: flex;
align-items: center; align-items: center;
text-decoration: none;
color: $secondary-text-color;
.avatar { .avatar {
display: block; display: block;
@ -544,4 +500,52 @@
.username { .username {
font-weight: 500; font-weight: 500;
} }
&.suspended {
.username {
text-decoration: line-through;
color: lighten($error-red, 12%);
}
.avatar {
filter: grayscale(100%);
opacity: 0.8;
}
}
}
.speech-bubble {
margin-bottom: 20px;
border-left: 4px solid $ui-highlight-color;
&.positive {
border-left-color: $success-green;
}
&.negative {
border-left-color: lighten($error-red, 12%);
}
&__bubble {
padding: 16px;
padding-left: 14px;
font-size: 15px;
line-height: 20px;
border-radius: 4px 4px 4px 0;
position: relative;
font-weight: 500;
a {
color: $darker-text-color;
}
}
&__owner {
padding: 8px;
padding-left: 12px;
}
time {
color: $dark-text-color;
}
} }