diff --git a/app/javascript/flavours/glitch/components/column_header.js b/app/javascript/flavours/glitch/components/column_header.js
index ccd0714f1b..500612093b 100644
--- a/app/javascript/flavours/glitch/components/column_header.js
+++ b/app/javascript/flavours/glitch/components/column_header.js
@@ -124,8 +124,8 @@ class ColumnHeader extends React.PureComponent {
moveButtons = (
-
-
+
+
);
} else if (multiColumn && this.props.onPin) {
@@ -146,8 +146,8 @@ class ColumnHeader extends React.PureComponent {
];
if (multiColumn) {
- collapsedContent.push(moveButtons);
collapsedContent.push(pinButton);
+ collapsedContent.push(moveButtons);
}
if (children || (multiColumn && this.props.onPin)) {
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index ad17ed4b0a..04d9b41688 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -437,12 +437,17 @@
}
.column-header__setting-btn {
- &:hover {
+ &:hover,
+ &:focus {
color: $darker-text-color;
text-decoration: underline;
}
}
+.column-header__collapsible__extra + .column-header__setting-btn {
+ padding-top: 5px;
+}
+
.column-header__permission-btn {
display: inline;
font-weight: inherit;
@@ -453,10 +458,15 @@
float: right;
.column-header__setting-btn {
- padding: 0 10px;
+ padding: 5px;
+
+ &:first-child {
+ padding-right: 7px;
+ }
&:last-child {
- padding-right: 0;
+ padding-left: 7px;
+ margin-left: 5px;
}
}
}
diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss
index 04bd8805a5..2281a4bb32 100644
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@@ -829,7 +829,7 @@
transition: background-color 0.2s ease;
}
-.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
+.react-toggle:is(:hover, :focus-within):not(.react-toggle--disabled) .react-toggle-track {
background-color: darken($ui-base-color, 10%);
}
@@ -837,7 +837,7 @@
background-color: $ui-highlight-color;
}
-.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track {
+.react-toggle--checked:is(:hover, :focus-within):not(.react-toggle--disabled) .react-toggle-track {
background-color: lighten($ui-highlight-color, 10%);
}
diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss
index f6a90d271d..61e95ad243 100644
--- a/app/javascript/flavours/glitch/styles/rtl.scss
+++ b/app/javascript/flavours/glitch/styles/rtl.scss
@@ -112,6 +112,20 @@ body.rtl {
.column-header__setting-arrows {
float: left;
+
+ .column-header__setting-btn {
+ &:first-child {
+ padding-left: 7px;
+ padding-right: 5px;
+ }
+
+ &:last-child {
+ padding-right: 7px;
+ padding-left: 5px;
+ margin-right: 5px;
+ margin-left: 0;
+ }
+ }
}
.setting-toggle__label {
@@ -428,11 +442,6 @@ body.rtl {
margin-left: 5px;
}
- .column-header__setting-arrows .column-header__setting-btn:last-child {
- padding-left: 0;
- padding-right: 10px;
- }
-
.simple_form .input.radio_buttons .radio > label input {
left: auto;
right: 0;