diff options
author | kibigo! <marrus-sh@users.noreply.github.com> | 2018-01-04 21:17:30 -0800 |
---|---|---|
committer | kibigo! <marrus-sh@users.noreply.github.com> | 2018-01-04 21:17:30 -0800 |
commit | d7ce339c2e33a5607c21d3eff316669cff9c6ea3 (patch) | |
tree | 01c4d0a820a52fad49708cb78ca3e71c78e234a5 /app/javascript/flavours/glitch/styles | |
parent | 42f50049ff29ccdc484c22f8a5a19cda2dd03a5b (diff) |
WIP <Compose> Refactor; Fin~
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/composer.scss | 6 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/index.scss | 31 |
2 files changed, 34 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss index 4b09d80d6..46df79906 100644 --- a/app/javascript/flavours/glitch/styles/components/composer.scss +++ b/app/javascript/flavours/glitch/styles/components/composer.scss @@ -180,15 +180,15 @@ &:hover, &:focus, &:active, - &.active { background: darken($ui-secondary-color, 10%) } + &.selected { background: darken($ui-secondary-color, 10%) } & > .emoji { img { display: block; float: left; margin-right: 8px; - width: 16px; - height: 16px; + width: 18px; + height: 18px; } } } diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 0ce0dafc9..ab1359108 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -754,6 +754,37 @@ text-decoration: none; font-size: 14px; } + + &.small { + border: none; + padding: 0; + + & > .account__avatar-wrapper { margin: 0 8px 0 0 } + + & > .display-name { + display: block; + padding: 0; + height: auto; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + + & > strong { + display: inline; + font-size: inherit; + line-height: inherit; + } + + & > span { + display: inline; + color: lighten($ui-base-color, 36%); + font-size: inherit; + line-height: inherit; + + &::before { content: " " } + } + } + } } .account__wrapper { |