diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
| commit | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /app/javascript/styles | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | 298ee84488758fc08a0ae9233e04c9637aa2fe02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 1 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/stream_entries.scss | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 547bcfd1e..57237d245 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -628,6 +628,7 @@ overflow: hidden; white-space: pre-wrap; padding-top: 2px; + color: $primary-text-color; &:focus { outline: 0; diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss index 9e2aa720c..5aa809f76 100644 --- a/app/javascript/styles/mastodon/stream_entries.scss +++ b/app/javascript/styles/mastodon/stream_entries.scss @@ -3,6 +3,7 @@ border-radius: 4px; overflow: hidden; margin-bottom: 10px; + text-align: left; @media screen and (max-width: $no-gap-breakpoint) { margin-bottom: 0; @@ -36,7 +37,8 @@ &:last-child { .detailed-status, - .status { + .status, + .load-more { border-bottom: 0; border-radius: 0 0 4px 4px; } @@ -44,13 +46,15 @@ &:first-child { .detailed-status, - .status { + .status, + .load-more { border-radius: 4px 4px 0 0; } &:last-child { .detailed-status, - .status { + .status, + .load-more { border-radius: 4px; } } @@ -58,11 +62,16 @@ @media screen and (max-width: 740px) { .detailed-status, - .status { + .status, + .load-more { border-radius: 0 !important; } } } + + &--highlighted .entry { + background: lighten($ui-base-color, 8%); + } } .button.logo-button { |