Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering

res/css/views/elements/_Field.scss

@@ -49,6 +49,7 @@ limitations under the License.
     color: $primary-fg-color;
     background-color: $primary-bg-color;
     flex: 1;
+    min-width: 0;
 }
 
 .mx_Field select {
@@ -148,9 +149,6 @@ limitations under the License.
     color: $greyed-fg-color;
 }
 
-/* Ordering this block by specificity would require breaking it up into several
-   chunks, which seems like it would be more confusing to read. */
-/* stylelint-disable no-descending-specificity */
 .mx_Field_valid {
     &.mx_Field,
     &.mx_Field:focus-within {
@@ -174,7 +172,6 @@ limitations under the License.
         color: $input-invalid-border-color;
     }
 }
-/* stylelint-enable no-descending-specificity */
 
 .mx_Field_tooltip {
     margin-top: -12px;

res/css/views/elements/_FormButton.scss

@@ -0,0 +1,36 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_FormButton {
+    line-height: 16px;
+    padding: 5px 15px;
+    font-size: 12px;
+    height: min-content;
+
+    &:not(:last-child) {
+        margin-right: 8px;
+    }
+
+    &.mx_AccessibleButton_kind_primary {
+        color: $accent-color;
+        background-color: $accent-bg-color;
+    }
+
+    &.mx_AccessibleButton_kind_danger {
+        color: $notice-primary-color;
+        background-color: $notice-primary-bg-color;
+    }
+}

res/css/views/elements/_IconButton.scss

@@ -0,0 +1,55 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_IconButton {
+    width: 32px;
+    height: 32px;
+    border-radius: 100%;
+    background-color: $accent-bg-color;
+    // don't shrink or grow if in a flex container
+    flex: 0 0 auto;
+
+    &.mx_AccessibleButton_disabled {
+        background-color: none;
+
+        &::before {
+            background-color: lightgrey;
+        }
+    }
+
+    &:hover {
+        opacity: 90%;
+    }
+
+    &::before {
+        content: "";
+        display: block;
+        width: 100%;
+        height: 100%;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: 55%;
+        background-color: $accent-color;
+    }
+
+    &.mx_IconButton_icon_check::before {
+        mask-image: url('$(res)/img/feather-customised/check.svg');
+    }
+
+    &.mx_IconButton_icon_edit::before {
+        mask-image: url('$(res)/img/feather-customised/edit.svg');
+    }
+}

res/css/views/elements/_RichText.scss

@@ -13,6 +13,11 @@
     padding-left: 5px;
 }
 
+a.mx_Pill {
+    word-break: break-all;
+    display: inline;
+}
+
 /* More specific to override `.markdown-body a` text-decoration */
 .mx_EventTile_content .markdown-body a.mx_Pill {
     text-decoration: none;