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

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

Browse Source 
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/themes.yml

Removed config/themes.yml, took upstream's mastodon-light.scss
This commit is contained in:
Thibaut Girka
2018-05-25 18:59:02 +02:00
parent 9b75a13104 c7ac039697
commit 11cc2e099a
13 changed files with 330 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,7 +396,7 @@ $small-breakpoint: 960px;
display: flex;
justify-content: center;
align-items: center;
color: $ui-primary-color;
color: $darker-text-color;
text-decoration: none;
padding: 12px 16px;
line-height: 32px;