From 50540446f56bda51f0ce38e1d661ac32301bafc5 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Fri, 18 May 2018 17:09:32 +0200 Subject: [PATCH 1/4] [Glitch] Improvements to toots display in admin view Port SCSS changes from 0f2fbf7d05825447a0f2a1e82b6137c069cb1658 (I'm sorry for the animated rainbows) --- .../flavours/glitch/styles/admin.scss | 33 +++++++++++++------ .../flavours/glitch/styles/tables.scss | 11 +++++++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 1948a2a231..560b11ddf4 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -484,19 +484,12 @@ } a.name-tag, -.name-tag { - display: flex; - align-items: center; +.name-tag, +a.inline-name-tag, +.inline-name-tag { text-decoration: none; color: $secondary-text-color; - .avatar { - display: block; - margin: 0; - margin-right: 5px; - border-radius: 50%; - } - .username { font-weight: 500; } @@ -514,6 +507,26 @@ a.name-tag, } } +a.name-tag, +.name-tag { + display: flex; + align-items: center; + + .avatar { + display: block; + margin: 0; + margin-right: 5px; + border-radius: 50%; + } + + &.suspended { + .avatar { + filter: grayscale(100%); + opacity: 0.8; + } + } +} + .speech-bubble { margin-bottom: 20px; border-left: 4px solid $ui-highlight-color; diff --git a/app/javascript/flavours/glitch/styles/tables.scss b/app/javascript/flavours/glitch/styles/tables.scss index fa876e6031..982bfd9900 100644 --- a/app/javascript/flavours/glitch/styles/tables.scss +++ b/app/javascript/flavours/glitch/styles/tables.scss @@ -1,3 +1,9 @@ +@keyframes Swag { + 0% { background-position: 0% 0%; } + 50% { background-position: 100% 0%; } + 100% { background-position: 200% 0%; } +} + .table { width: 100%; max-width: 100%; @@ -187,6 +193,11 @@ a.table-action-link { strong { font-weight: 700; + background: linear-gradient(to right, orange , yellow, green, cyan, blue, violet,orange , yellow, green, cyan, blue, violet); + background-size: 200% 100%; + background-clip: text; + color: transparent; + animation: Swag 2s linear 0s infinite; } } } From 9ed8051961e7a43406b8c4f69b96260c20d46b0f Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Fri, 18 May 2018 17:24:11 +0200 Subject: [PATCH 2/4] Add preference to hide following/followers lists Port SCSS from 1e02dc871533de78174b48a6a527f11b0f2bc7ec --- app/javascript/flavours/glitch/styles/accounts.scss | 13 +++++++++++-- app/javascript/flavours/glitch/styles/footer.scss | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss index eff964e504..efff59ff68 100644 --- a/app/javascript/flavours/glitch/styles/accounts.scss +++ b/app/javascript/flavours/glitch/styles/accounts.scss @@ -326,6 +326,15 @@ z-index: 2; position: relative; + &.empty img { + position: absolute; + opacity: 0.2; + height: 200px; + left: 0; + bottom: 0; + pointer-events: none; + } + @media screen and (max-width: 740px) { border-radius: 0; box-shadow: none; @@ -445,8 +454,8 @@ font-size: 14px; font-weight: 500; text-align: center; - padding: 60px 0; - padding-top: 55px; + padding: 130px 0; + padding-top: 125px; margin: 0 auto; cursor: default; } diff --git a/app/javascript/flavours/glitch/styles/footer.scss b/app/javascript/flavours/glitch/styles/footer.scss index ba2a06954e..dd3c1b6884 100644 --- a/app/javascript/flavours/glitch/styles/footer.scss +++ b/app/javascript/flavours/glitch/styles/footer.scss @@ -4,7 +4,7 @@ font-size: 12px; color: $darker-text-color; - .domain { + .footer__domain { font-weight: 500; a { From d250e072a23a9ddb3d67e03efc4727591f7b747d Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 20 May 2018 10:34:20 +0200 Subject: [PATCH 3/4] In footer, replace text "Mastodon" with logo Port SCSS changes from 93c66f0c03c27ee02b9875c3c051d9bf50b33e19 to glitch-soc --- app/javascript/flavours/glitch/styles/footer.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/javascript/flavours/glitch/styles/footer.scss b/app/javascript/flavours/glitch/styles/footer.scss index dd3c1b6884..fe2d40c0cc 100644 --- a/app/javascript/flavours/glitch/styles/footer.scss +++ b/app/javascript/flavours/glitch/styles/footer.scss @@ -26,5 +26,13 @@ text-decoration: none; } } + + img { + margin: 0 4px; + position: relative; + bottom: -1px; + height: 18px; + vertical-align: top; + } } } From c53aacdfa08249d4099073eecd28a768c07f309b Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 21 May 2018 15:56:47 +0200 Subject: [PATCH 4/4] Recover glitch-soc specific styles that were removed by accident --- app/javascript/flavours/glitch/styles/admin.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 560b11ddf4..7fe5e4a197 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -274,6 +274,22 @@ } } +.flavour-screen { + display: block; + margin: 10px auto; + max-width: 100%; +} + +.flavour-description { + display: block; + font-size: 16px; + margin: 10px 0; + + & > p { + margin: 10px 0; + } +} + .report-accounts { display: flex; flex-wrap: wrap;