diff options
author | Reverite <github@reverite.sh> | 2019-06-22 14:15:02 -0600 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-06-22 14:15:02 -0600 |
commit | 714940de498e93a8bf40dcda1835217df18741bf (patch) | |
tree | eafc1d01710ba978f133216d8d1a6e4d585606c6 /app/javascript/flavours/glitch/styles | |
parent | b2ffaa9f2909c83f23691a02b2843bf41a1a12c0 (diff) | |
parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/drawer.scss | 17 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/status.scss | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/drawer.scss b/app/javascript/flavours/glitch/styles/components/drawer.scss index f054ddbc0..0e50482f6 100644 --- a/app/javascript/flavours/glitch/styles/components/drawer.scss +++ b/app/javascript/flavours/glitch/styles/components/drawer.scss @@ -163,18 +163,15 @@ .drawer--account { padding: 10px; color: $darker-text-color; + display: flex; + align-items: center; - & > a { + a { color: inherit; text-decoration: none; } - & > .avatar { - float: left; - margin-right: 10px; - } - - & > .acct { + .acct { display: block; color: $secondary-text-color; font-weight: 500; @@ -184,6 +181,12 @@ } } +.navigation-bar__profile { + flex: 1 1 auto; + margin-left: 8px; + overflow: hidden; +} + .drawer--results { background: $ui-base-color; overflow-x: hidden; diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index ee4440e89..fa115f21b 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -33,6 +33,12 @@ .status__content__text, .e-content { + + & > ul, + & > ol { + margin-bottom: 20px; + } + h1, h2, h3, h4, h5 { margin-top: 20px; margin-bottom: 20px; |