treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Merge pull request #475 from ThibG/fixes/update-scss 

Update SCSS from upstream
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
ThibG 2018-05-11 16:51:14 +02:00 committed by GitHub
parent 479e5bbd4a 6284039832
commit e7ed61917b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 310 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
app/javascript/flavours/glitch/styles/about.scss
View File

@ -322,6 +322,11 @@ $small-breakpoint: 960px;
border: 0;
border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
margin: 20px 0;
&.spacer {
height: 1px;
border: 0;
}
}
.container-alt {
@ -681,6 +686,54 @@ $small-breakpoint: 960px;
margin-bottom: 0;
}
.account {
border-bottom: 0;
padding: 0;
&__display-name {
align-items: center;
display: flex;
margin-right: 5px;
}
div.account__display-name {
&:hover {
.display-name strong {
text-decoration: none;
}
}
.account__avatar {
cursor: default;
}
}
&__avatar-wrapper {
margin-left: 0;
flex: 0 0 auto;
}
&__avatar {
width: 44px;
height: 44px;
background-size: 44px 44px;
}
.display-name {
font-size: 15px;
&__account {
font-size: 14px;
}
}
}
@media screen and (max-width: $small-breakpoint) {
.contact {
margin-top: 30px;
}
}
@media screen and (max-width: $column-breakpoint) {
padding: 25px 20px;
}
@ -816,6 +869,8 @@ $small-breakpoint: 960px;
font-size: 16px;
line-height: inherit;
font-weight: inherit;
margin: 0;
padding: 0;
}
.column {
@ -852,8 +907,13 @@ $small-breakpoint: 960px;
}
&__features {
& > p {
padding-right: 60px;
}
.features-list {
margin: 40px 0 !important;
margin: 40px 0;
margin-top: 30px;
}
&__action {
@ -862,17 +922,11 @@ $small-breakpoint: 960px;
}
.features-list {
margin-top: 20px;
.features-list__row {
display: flex;
padding: 10px 0;
justify-content: space-between;
&:first-child {
padding-top: 0;
}
.visual {
flex: 0 0 auto;
display: flex;
@ -898,6 +952,14 @@ $small-breakpoint: 960px;
}
}
}
@media screen and (min-width: $small-breakpoint) {
display: grid;
grid-gap: 30px;
grid-template-columns: 1fr 1fr;
grid-auto-columns: 50%;
grid-auto-rows: max-content;
}
}
.extended-description {

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

@ -141,14 +141,15 @@
}
hr {
margin: 20px 0;
width: 100%;
height: 0;
border: 0;
background: transparent;
border-bottom: 1px solid $ui-base-color;
border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
margin: 20px 0;
&.section-break {
margin: 30px 0;
border-bottom: 2px solid $ui-base-lighter-color;
&.spacer {
height: 1px;
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 {
display: flex;
flex-wrap: wrap;
@ -351,34 +336,9 @@
}
}
.report-note__comment {
margin-bottom: 20px;
}
.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;
}
.simple_form.new_report_note,
.simple_form.new_account_moderation_note {
max-width: 100%;
}
.batch-form-box {
@ -406,13 +366,6 @@
}
}
.batch-checkbox,
.batch-checkbox-all {
display: flex;
align-items: center;
margin-right: 5px;
}
.back-link {
margin-bottom: 10px;
font-size: 14px;
@ -432,7 +385,7 @@
}
.log-entry {
margin-bottom: 8px;
margin-bottom: 20px;
line-height: 20px;
&__header {
@ -530,9 +483,12 @@
}
}
a.name-tag,
.name-tag {
display: flex;
align-items: center;
text-decoration: none;
color: $secondary-text-color;
.avatar {
display: block;
@ -544,4 +500,52 @@
.username {
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;
}
}

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

@ -32,7 +32,8 @@
.account__avatar-wrapper {
float: left;
margin: 6px 16px 6px 6px;
margin-left: 12px;
margin-right: 12px;
}
.account__avatar {

1
app/javascript/flavours/glitch/styles/containers.scss
View File

@ -60,6 +60,7 @@
}
}
.card-standalone__body,
.media-gallery-standalone__body {
overflow: hidden;
}

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

@ -280,6 +280,11 @@ code {
.actions {
margin-top: 30px;
display: flex;
&.actions--top {
margin-top: 0;
margin-bottom: 30px;
}
}
button,
@ -563,9 +568,27 @@ code {
.post-follow-actions {
text-align: center;
color: $ui-primary-color;
color: $darker-text-color;
div {
margin-bottom: 4px;
}
}
.alternative-login {
margin-top: 20px;
margin-bottom: 20px;
h4 {
font-size: 16px;
color: $primary-text-color;
text-align: center;
margin-bottom: 20px;
border: 0;
padding: 0;
}
.button {
display: block;
}
}

16
app/javascript/flavours/glitch/styles/rtl.scss
View File

@ -1,6 +1,22 @@
body.rtl {
direction: rtl;
.column-header > button {
text-align: right;
padding-left: 0;
padding-right: 15px;
}
.landing-page__logo {
margin-right: 0;
margin-left: 20px;
}
.landing-page .features-list .features-list__row .visual {
margin-left: 0;
margin-right: 15px;
}
.column-link__icon,
.column-header__icon {
margin-right: 0;

38
app/javascript/flavours/glitch/styles/stream_entries.scss
View File

@ -6,7 +6,8 @@
background: $simple-background-color;
.detailed-status.light,
.status.light {
.status.light,
.more.light {
border-bottom: 1px solid $ui-secondary-color;
animation: none;
}
@ -65,6 +66,10 @@
}
}
.media-gallery__gifv__label {
bottom: 9px;
}
.status.light {
padding: 14px 14px 14px (48px + 14px * 2);
position: relative;
@ -145,10 +150,10 @@
a.status__content__spoiler-link {
color: $primary-text-color;
background: $ui-primary-color;
background: $ui-base-color;
&:hover {
background: lighten($ui-primary-color, 8%);
background: lighten($ui-base-color, 8%);
}
}
}
@ -215,10 +220,10 @@
a.status__content__spoiler-link {
color: $primary-text-color;
background: $ui-primary-color;
background: $ui-base-color;
&:hover {
background: lighten($ui-primary-color, 8%);
background: lighten($ui-base-color, 8%);
}
}
}
@ -261,16 +266,8 @@
}
.media-spoiler {
background: $ui-primary-color;
color: $inverted-text-color;
transition: all 100ms linear;
&:hover,
&:active,
&:focus {
background: darken($ui-primary-color, 5%);
color: unset;
}
background: $ui-base-color;
color: $darker-text-color;
}
.pre-header {
@ -299,6 +296,17 @@
text-decoration: underline;
}
}
.more {
color: $darker-text-color;
display: block;
padding: 14px;
text-align: center;
&:not(:hover) {
text-decoration: none;
}
}
}
.embed {

116
app/javascript/flavours/glitch/styles/tables.scss
View File

@ -11,6 +11,7 @@
vertical-align: top;
border-top: 1px solid $ui-base-color;
text-align: left;
background: darken($ui-base-color, 4%);
}
& > thead > tr > th {
@ -48,9 +49,38 @@
}
}
&.inline-table > tbody > tr:nth-child(odd) > td,
&.inline-table > tbody > tr:nth-child(odd) > th {
background: transparent;
&.inline-table {
& > tbody > tr:nth-child(odd) {
& > td,
& > th {
background: transparent;
}
}
& > tbody > tr:first-child {
& > td,
& > th {
border-top: 0;
}
}
}
&.batch-table {
& > thead > tr > th {
background: $ui-base-color;
border-top: 1px solid darken($ui-base-color, 8%);
border-bottom: 1px solid darken($ui-base-color, 8%);
&:first-child {
border-radius: 4px 0 0;
border-left: 1px solid darken($ui-base-color, 8%);
}
&:last-child {
border-radius: 0 4px 0 0;
border-right: 1px solid darken($ui-base-color, 8%);
}
}
}
}
@ -63,6 +93,13 @@ samp {
font-family: 'mastodon-font-monospace', monospace;
}
button.table-action-link {
background: transparent;
border: 0;
font: inherit;
}
button.table-action-link,
a.table-action-link {
text-decoration: none;
display: inline-block;
@ -79,4 +116,77 @@ a.table-action-link {
font-weight: 400;
margin-right: 5px;
}
&:first-child {
padding-left: 0;
}
}
.batch-table {
&__toolbar,
&__row {
display: flex;
&__select {
box-sizing: border-box;
padding: 8px 16px;
cursor: pointer;
min-height: 100%;
input {
margin-top: 8px;
}
}
&__actions,
&__content {
padding: 8px 0;
padding-right: 16px;
flex: 1 1 auto;
}
}
&__toolbar {
border: 1px solid darken($ui-base-color, 8%);
background: $ui-base-color;
border-radius: 4px 0 0;
height: 47px;
align-items: center;
&__actions {
text-align: right;
padding-right: 16px - 5px;
}
}
&__row {
border: 1px solid darken($ui-base-color, 8%);
border-top: 0;
background: darken($ui-base-color, 4%);
&:hover {
background: darken($ui-base-color, 2%);
}
&:nth-child(even) {
background: $ui-base-color;
&:hover {
background: lighten($ui-base-color, 2%);
}
}
&__content {
padding-top: 12px;
padding-bottom: 16px;
}
}
.status__content {
padding-top: 0;
strong {
font-weight: 700;
}
}
}