tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
This commit is contained in:
Thibaut Girka
2018-06-21 20:49:57 +02:00
parent 26c20a4ec7 7f59206944
commit ab5f450700
129 changed files with 1169 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
app/javascript/styles/mastodon-light/diff.scss
View File

@@ -25,33 +25,51 @@
background: $ui-base-color url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($white)}"/></svg>') no-repeat bottom / 100% auto;
}
.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button {
color: lighten($white, 7%);
// Change the colors used in compose-form
.compose-form {
.compose-form__modifiers {
.compose-form__upload__actions .icon-button {
color: lighten($white, 7%);
&:active,
&:focus,
&:hover {
color: $white;
&:active,
&:focus,
&:hover {
color: $white;
}
}
.compose-form__upload-description input {
color: lighten($white, 7%);
&::placeholder {
color: lighten($white, 7%);
}
}
}
}
.compose-form .compose-form__modifiers .compose-form__upload-description input {
color: lighten($white, 7%);
&::placeholder {
color: lighten($white, 7%);
.compose-form__buttons-wrapper {
background: darken($ui-base-color, 6%);
}
}
.compose-form .compose-form__buttons-wrapper {
background: darken($ui-base-color, 6%);
.autosuggest-textarea__suggestions {
background: darken($ui-base-color, 6%);
}
.autosuggest-textarea__suggestions__item {
&:hover,
&:focus,
&:active,
&.selected {
background: lighten($ui-base-color, 4%);
}
}
}
.emoji-mart-bar {
border-color: lighten($ui-base-color, 8%);
border-color: lighten($ui-base-color, 4%);
&:first-child {
background: $ui-base-color;
background: darken($ui-base-color, 6%);
}
}
@@ -60,6 +78,7 @@
border-color: $ui-base-color;
}
// Change the background colors of statuses
.focusable:focus {
background: $ui-base-color;
}
@@ -77,7 +96,7 @@
background: darken($ui-base-color, 6%);
}
// Change the background color of status__content__spoiler-link
// Change the background colors of status__content__spoiler-link
.reply-indicator__content .status__content__spoiler-link,
.status__content .status__content__spoiler-link {
background: $ui-base-lighter-color;
@@ -87,8 +106,7 @@
}
}
// Change the background colors of media and video spoiler
// Change the background colors of media and video spoilers
.media-spoiler,
.video-player__spoiler {
background: $ui-base-color;
@@ -101,30 +119,30 @@
// Change the colors used in the dropdown menu
.dropdown-menu {
background: $ui-base-color;
}
.dropdown-menu__arrow {
&.left {
border-left-color: $ui-base-color;
&__arrow {
&.left {
border-left-color: $ui-base-color;
}
&.top {
border-top-color: $ui-base-color;
}
&.bottom {
border-bottom-color: $ui-base-color;
}
&.right {
border-right-color: $ui-base-color;
}
}
&.top {
border-top-color: $ui-base-color;
}
&.bottom {
border-bottom-color: $ui-base-color;
}
&.right {
border-right-color: $ui-base-color;
}
}
.dropdown-menu__item {
a {
background: $ui-base-color;
color: $darker-text-color;
&__item {
a {
background: $ui-base-color;
color: $darker-text-color;
}
}
}

17
app/javascript/styles/mastodon/components.scss
View File

@@ -1211,6 +1211,10 @@ a .account__avatar {
flex: 0 1 calc(50% - 140px);
padding: 10px;
.icon-button {
vertical-align: middle;
}
.dropdown--active {
.dropdown__content.dropdown__right {
left: 6px;
@@ -1230,13 +1234,14 @@ a .account__avatar {
display: flex;
flex: 1 1 auto;
line-height: 18px;
text-align: center;
}
.account__action-bar__tab {
text-decoration: none;
overflow: hidden;
flex: 0 1 80px;
border-left: 1px solid lighten($ui-base-color, 8%);
border-right: 1px solid lighten($ui-base-color, 8%);
padding: 10px 5px;
& > span {
@@ -4936,8 +4941,8 @@ noscript {
.navigation-bar {
& > a:first-child {
will-change: margin-top, margin-left, width;
transition: margin-top $duration $delay, margin-left $duration ($duration + $delay);
will-change: margin-top, margin-left, margin-right, width;
transition: margin-top $duration $delay, margin-left $duration ($duration + $delay), margin-right $duration ($duration + $delay);
}
& > .navigation-bar__profile-edit {
@@ -4970,8 +4975,7 @@ noscript {
padding-bottom: 0;
& > a:first-child {
margin-top: -50px;
margin-left: -40px;
margin: -100px 10px 0 -50px;
}
.navigation-bar__profile {
@@ -4980,7 +4984,7 @@ noscript {
.navigation-bar__profile-edit {
position: absolute;
margin-top: -50px;
margin-top: -60px;
}
.navigation-bar__actions {
@@ -4988,6 +4992,7 @@ noscript {
pointer-events: auto;
opacity: 1;
transform: scale(1.0, 1.0) translate(0, 0);
bottom: 5px;
}
.compose__action-bar .icon-button {

2
app/javascript/styles/mastodon/forms.scss
View File

@@ -140,6 +140,8 @@ code {
}
.input.with_block_label {
padding-top: 15px;
& > label {
font-family: inherit;
font-size: 16px;