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:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
This commit is contained in:
Thibaut Girka
2018-05-27 13:20:15 +02:00
parent c2e528916c 63c7b91572
commit 659b8a12ec
51 changed files with 716 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/styles/mastodon/accounts.scss
View File

@ -79,6 +79,10 @@
font-weight: 400;
overflow: hidden;
text-overflow: ellipsis;
.fa {
margin-left: 3px;
}
}
}

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

@ -425,7 +425,7 @@
.icon-button {
flex: 0 1 auto;
color: $action-button-color;
color: $secondary-text-color;
font-size: 14px;
font-weight: 500;
padding: 10px;
@ -434,7 +434,7 @@
&:hover,
&:focus,
&:active {
color: lighten($action-button-color, 7%);
color: lighten($secondary-text-color, 7%);
}
}
@ -1373,9 +1373,8 @@ a.account__display-name {
}
.notification__message {
margin-left: 68px;
padding: 8px 0;
padding-bottom: 0;
margin: 0 10px 0 68px;
padding: 8px 0 0;
cursor: default;
color: $darker-text-color;
font-size: 15px;

8
app/javascript/styles/mastodon/variables.scss
View File

@ -1,10 +1,10 @@
// Commonly used web colors
$black: #000000; // Black
$white: #ffffff; // White
$success-green: #79bd9a; // Padua
$error-red: #df405a; // Cerise
$warning-red: #ff5050; // Sunset Orange
$gold-star: #ca8f04; // Dark Goldenrod
$success-green: #79bd9a !default; // Padua
$error-red: #df405a !default; // Cerise
$warning-red: #ff5050 !default; // Sunset Orange
$gold-star: #ca8f04 !default; // Dark Goldenrod
// Values from the classic Mastodon UI
$classic-base-color: #282c37; // Midnight Express