diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-02-10 21:50:42 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-10 21:50:42 +0100 |
commit | b7fbcb21b3ca7f7ee560785fa1249bf689fbaff3 (patch) | |
tree | 8dda3dcb72a2d1d5857be514a6676a908f973008 | |
parent | 7ed2aeb6e9b0fe4fc7fbe7c76003d1e044c682eb (diff) |
[Glitch] Add featured hashtags to profiles
Port SCSS changes from 364f2ff9aa2b4bf601d68a12bce758aeb5530467
-rw-r--r-- | app/javascript/flavours/glitch/styles/accounts.scss | 4 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/admin.scss | 7 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/widgets.scss | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss index 9c6518bea..d2ae83b2e 100644 --- a/app/javascript/flavours/glitch/styles/accounts.scss +++ b/app/javascript/flavours/glitch/styles/accounts.scss @@ -290,3 +290,7 @@ border-bottom: 0; } } + +.directory__tag .trends__item__current { + width: auto; +} diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 4e969601b..4dbbaa1e8 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -153,10 +153,15 @@ $content-width: 840px; font-weight: 500; } - .directory__tag a { + .directory__tag > a, + .directory__tag > div { box-shadow: none; } + .directory__tag .table-action-link .fa { + color: inherit; + } + .directory__tag h4 { font-size: 18px; font-weight: 700; diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss index c97337e4e..1eaf30c5b 100644 --- a/app/javascript/flavours/glitch/styles/widgets.scss +++ b/app/javascript/flavours/glitch/styles/widgets.scss @@ -269,7 +269,8 @@ box-sizing: border-box; margin-bottom: 10px; - a { + & > a, + & > div { display: flex; align-items: center; justify-content: space-between; @@ -279,7 +280,9 @@ text-decoration: none; color: inherit; box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); + } + & > a { &:hover, &:active, &:focus { @@ -287,7 +290,7 @@ } } - &.active a { + &.active > a { background: $ui-highlight-color; cursor: default; } |