Merge branch 'glitch-soc' into develop

app/javascript/flavours/glitch/components/setting_text.jsx

@@ -23,7 +23,7 @@ export default class SettingText extends PureComponent {
       <label>
         <span style={{ display: 'none' }}>{label}</span>
         <input
-          className='setting-text'
+          className='glitch-setting-text'
           value={settings.getIn(settingPath)}
           onChange={this.handleChange}
           placeholder={label}

app/javascript/flavours/glitch/styles/components.scss

@@ -1244,17 +1244,6 @@ body > [data-popper-placement] {
     font-size: 14px;
     font-weight: 500;
   }
-
-  &.copyable {
-    transition: all 300ms linear;
-  }
-
-  &.copied {
-    border-color: $valid-value-color;
-    color: $valid-value-color;
-    transition: none;
-    background-color: rgba($valid-value-color, 0.15);
-  }
 }
 
 .domain__wrapper {
@@ -2949,7 +2938,6 @@ $ui-header-height: 55px;
   cursor: pointer;
   white-space: nowrap;
   font-size: 16px;
-  flex: 0 0 auto;
   padding: 0;
   padding-inline-end: 5px;
   z-index: 3;
@@ -3217,8 +3205,7 @@ $ui-header-height: 55px;
   }
 }
 
-.setting-text {
+input.glitch-setting-text {
-  display: block;
   box-sizing: border-box;
   color: $darker-text-color;
   background: transparent;
@@ -3236,15 +3223,57 @@ $ui-header-height: 55px;
     border-bottom-color: $ui-highlight-color;
   }
 
-  &.light {
+  @media screen and (width <= 600px) {
-    color: $inverted-text-color;
+    font-size: 16px;
-    border-bottom: 2px solid lighten($ui-base-color, 27%);
+  }
+}
 
-    &:focus,
+.setting-text {
-    &:active {
+  display: block;
-      color: $inverted-text-color;
+  box-sizing: border-box;
-      border-bottom-color: $ui-highlight-color;
+  margin: 0;
+  color: $inverted-text-color;
+  background: $white;
+  padding: 7px 10px;
+  font-family: inherit;
+  font-size: 14px;
+  line-height: 22px;
+  border-radius: 4px;
+  border: 1px solid $white;
+
+  &:focus {
+    outline: 0;
+    border-color: lighten($ui-highlight-color, 12%);
+  }
+
+  &__wrapper {
+    background: $white;
+    border: 1px solid $ui-secondary-color;
+    margin-bottom: 10px;
+    border-radius: 4px;
+
+    .setting-text {
+      border: 0;
+      margin-bottom: 0;
+      border-radius: 0;
+
+      &:focus {
+        border: 0;
+      }
     }
+
+    &__modifiers {
+      color: $inverted-text-color;
+      font-family: inherit;
+      font-size: 14px;
+      background: $white;
+    }
+  }
+
+  &__toolbar {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
   }
 
   @media screen and (width <= 600px) {
@@ -5653,20 +5682,6 @@ a.status-card.compact:hover {
   & > div:last-child .status {
     border-bottom: 0;
   }
-
-  & > .hashtag {
-    display: block;
-    padding: 10px;
-    color: $secondary-text-color;
-    text-decoration: none;
-
-    &:hover,
-    &:active,
-    &:focus {
-      color: lighten($secondary-text-color, 4%);
-      text-decoration: underline;
-    }
-  }
 }
 
 .search-results__hashtag {
@@ -6461,56 +6476,11 @@ a.status-card.compact:hover {
   }
 
   .setting-text {
-    display: block;
-    box-sizing: border-box;
     width: 100%;
-    margin: 0;
-    color: $inverted-text-color;
-    background: $white;
-    padding: 10px;
-    font-family: inherit;
-    font-size: 14px;
     resize: none;
-    outline: 0;
-    border-radius: 4px;
-    border: 1px solid $ui-secondary-color;
     min-height: 100px;
     max-height: 50vh;
-    margin-bottom: 10px;
+    border: 0;
-
-    &:focus {
-      border: 1px solid darken($ui-secondary-color, 8%);
-    }
-
-    &__wrapper {
-      background: $white;
-      border: 1px solid $ui-secondary-color;
-      margin-bottom: 10px;
-      border-radius: 4px;
-
-      .setting-text {
-        border: 0;
-        margin-bottom: 0;
-        border-radius: 0;
-
-        &:focus {
-          border: 0;
-        }
-      }
-
-      &__modifiers {
-        color: $inverted-text-color;
-        font-family: inherit;
-        font-size: 14px;
-        background: $white;
-      }
-    }
-
-    &__toolbar {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 20px;
-    }
   }
 
   .setting-toggle {
@@ -7015,6 +6985,8 @@ img.modal-warning {
   position: absolute;
 }
 
+/* End Media Gallery */
+
 .detailed,
 .fullscreen {
   .video-player__volume__current,
@@ -7751,10 +7723,10 @@ noscript {
 }
 
 .column-inline-form {
-  padding: 7px 15px;
+  padding: 15px;
-  padding-inline-end: 5px;
   display: flex;
   justify-content: flex-start;
+  gap: 15px;
   align-items: center;
   background: lighten($ui-base-color, 4%);
 
@@ -7763,18 +7735,8 @@ noscript {
 
     input {
       width: 100%;
-      margin-bottom: 6px;
-
-      &:focus {
-        outline: 0;
-      }
     }
   }
-
-  .icon-button {
-    flex: 0 0 auto;
-    margin: 0 5px;
-  }
 }
 
 .drawer__backdrop {
@@ -9955,11 +9917,6 @@ noscript {
   &:active {
     background: rgba($ui-base-color, 0.85);
   }
-
-  .icon {
-    width: 15px;
-    height: 15px;
-  }
 }
 
 .hashtag-header {

app/javascript/flavours/glitch/styles/mastodon-light/diff.scss

@@ -80,6 +80,10 @@ html {
   background: $white;
 }
 
+.column-header {
+  border-bottom: 0;
+}
+
 .column-header__button.active {
   color: $ui-highlight-color;
 
@@ -422,7 +426,7 @@ html {
 .column-header__collapsible-inner {
   background: darken($ui-base-color, 4%);
   border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
+  border-bottom: 0;
 }
 
 .column-settings__hashtags .column-select__option {