diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-21 18:00:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 18:00:08 -0600 |
| commit | a90d0419d97db50cca034b9d30969f3d161a69b1 (patch) | |
| tree | 86c6a4182cda85171caf2f5c1553c054ed7b7e1f /app/javascript/styles | |
| parent | 81b78fac542be867eedc7a0310e29de30b382770 (diff) | |
| parent | 48d79007f616ba03f663d29536927f6ab14e4b53 (diff) | |
Merge pull request #343 from glitch-soc/merge-upstream-20180121
Merge upstream
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 75e37237b..3eb941a23 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -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; |