diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2018-04-04 11:36:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 11:36:41 -0400 |
commit | 4ab58c3292003e3d55c1a3295242d6d5c7bede4c (patch) | |
tree | 1ce5f46dcc899726c8ae1ef85467bb90118b52b1 /app/javascript/flavours/glitch | |
parent | 1f5bdd8445f6ba192618288504b74c1df7c09ea6 (diff) | |
parent | d0e792e231fa80003659e5eddd3a10d329b5ccab (diff) |
Merge pull request #413 from ThibG/glitch-soc/fixes/fix-account-card-style
Update accounts SCSS for public pages
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r-- | app/javascript/flavours/glitch/styles/accounts.scss | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss index 497ee9ba6..082867f17 100644 --- a/app/javascript/flavours/glitch/styles/accounts.scss +++ b/app/javascript/flavours/glitch/styles/accounts.scss @@ -100,32 +100,6 @@ } } - .controls { - position: absolute; - top: 15px; - left: 15px; - z-index: 2; - - .icon-button { - color: rgba($white, 0.8); - text-decoration: none; - font-size: 13px; - line-height: 13px; - font-weight: 500; - - .fa { - font-weight: 400; - margin-right: 5px; - } - - &:hover, - &:active, - &:focus { - color: $white; - } - } - } - .roles { margin-bottom: 15px; padding: 0 15px; @@ -230,6 +204,40 @@ } } +.card, +.account-grid-card { + .controls { + position: absolute; + top: 15px; + left: 15px; + z-index: 2; + + .icon-button { + color: rgba($white, 0.8); + text-decoration: none; + font-size: 13px; + line-height: 13px; + font-weight: 500; + + .fa { + font-weight: 400; + margin-right: 5px; + } + + &:hover, + &:active, + &:focus { + color: $white; + } + } + } +} + +.account-grid-card .controls { + left: auto; + right: 15px; +} + .pagination { padding: 30px 0; text-align: center; @@ -237,8 +245,8 @@ a, .current, - .next, - .prev, + .newer, + .older, .page, .gap { font-size: 14px; @@ -261,13 +269,13 @@ cursor: default; } - .prev, - .next { + .older, + .newer { text-transform: uppercase; color: $ui-secondary-color; } - .prev { + .older { float: left; padding-left: 0; @@ -277,7 +285,7 @@ } } - .next { + .newer { float: right; padding-right: 0; @@ -299,8 +307,8 @@ display: none; } - .next, - .prev { + .newer, + .older { display: inline-block; } } @@ -418,13 +426,14 @@ font-weight: 400; } - .note { + .account__header__content { padding: 10px 15px; padding-top: 15px; - box-sizing: border-box; color: lighten($ui-base-color, 26%); word-wrap: break-word; - min-height: 80px; + overflow: hidden; + text-overflow: ellipsis; + height: 5.5em; } } } @@ -438,6 +447,7 @@ text-align: center; padding: 60px 0; padding-top: 55px; + margin: 0 auto; cursor: default; } |