about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/styles/components/columns.scss
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-12-19 02:17:02 +0100
committerGitHub <noreply@github.com>2020-12-19 02:17:02 +0100
commit79c57810b7fea1962c9746d74c90235ad4e3e899 (patch)
tree6ec332dd20fa4ce8de954d8e260cce3f2dc67aee /app/javascript/flavours/glitch/styles/components/columns.scss
parent92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff)
parent5c966bef8b6aa116cfa2102e83e42d0fe421f3fc (diff)
Merge pull request #1477 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components/columns.scss')
-rw-r--r--app/javascript/flavours/glitch/styles/components/columns.scss8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index 2550f50f4..2d080d3b9 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -443,6 +443,12 @@
   }
 }
 
+.column-header__permission-btn {
+  display: inline;
+  font-weight: inherit;
+  text-decoration: underline;
+}
+
 .column-header__setting-arrows {
   float: right;
 
@@ -690,7 +696,7 @@
 }
 
 .column-settings__row {
-  .text-btn {
+  .text-btn:not(.column-header__permission-btn) {
     margin-bottom: 15px;
   }
 }