Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first

2018-02-14 10:51:20 +00:00
parent 85c0b8dea3 8c1d2a4555
commit b3bb2d2aa5
11 changed files with 311 additions and 325 deletions
@@ -15,7 +15,7 @@ limitations under the License.
 */

 .mx_TagPanel {
-    width: 60px;
+    flex: 0 0 60px;
    background-color: $tertiary-accent-color;
    cursor: pointer;

@@ -37,6 +37,7 @@ limitations under the License.
 .mx_TagPanel .mx_TagTile {
    padding: 6px 3px;
    opacity: 0.5;
+    position: relative;
 }
 .mx_TagPanel .mx_TagTile:focus,
 .mx_TagPanel .mx_TagTile:hover,
@@ -64,6 +65,23 @@ limitations under the License.
    left: 5px;
 }

+.mx_TagTile_context_button {
+    min-width: 15px;
+    height: 15px;
+    position: absolute;
+    right: -5px;
+    top: 1px;
+    border-radius: 8px;
+    background-color: $neutral-badge-color;
+    color: #ffffff;
+    font-weight: 600;
+    font-size: 10px;
+    text-align: center;
+    padding-top: 1px;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
 .mx_TagPanel_createGroupButton {
    opacity: 0.5;
    margin-bottom: 17px;