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

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
This commit is contained in:
David Yip
2018-01-21 13:36:10 -06:00
parent 2c578a01d8 cfd2b06821
commit 1253279feb
9 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2070,6 +2070,17 @@
margin-right: 5px;
}
.column-link__badge {
display: inline-block;
border-radius: 4px;
font-size: 12px;
line-height: 19px;
font-weight: 500;
background: $ui-base-color;
padding: 4px 8px;
margin: -6px 10px;
}
.column-subheading {
background: $ui-base-color;
color: $ui-base-lighter-color;