From 42bb54b20225682249a83057970f98438bd89847 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 10 Nov 2017 21:41:35 +0000
Subject: [PATCH 1/3] Set widget menu bar background colour.
---
.../vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss | 5 +++++
src/skins/vector/css/themes/_base.scss | 4 ++++
src/skins/vector/css/themes/_dark.scss | 4 ++++
3 files changed, 13 insertions(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
index 7fe2b03c..7af2d25a 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -81,6 +81,11 @@ limitations under the License.
// background-color: $e2e-verified-color;
border-bottom: 1px solid $primary-hairline-color;
font-size: 10px;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ background-color: $widget-menu-bar-bg-color;
}
.mx_AppTileMenuBarWidgets {
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index 3a7eac56..d6417e58 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -101,6 +101,10 @@ $roomsublist-label-bg-color: #d3efe1;
// ********************
+$widget-menu-bar-bg-color: #d3efe1;
+
+// ********************
+
// event tile lifecycle
$event-encrypting-color: #abddbc;
$event-sending-color: #ddd;
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index d6fa88d6..b6eaab4a 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -95,6 +95,10 @@ $roomsublist-label-bg-color: #454545;
// ********************
+$widget-menu-bar-bg-color: #454545;
+
+// ********************
+
// event tile lifecycle
$event-encrypting-color: rgba(171, 221, 188, 0.4);
$event-sending-color: #888;
From d7ceddfe6174d093fce9fe2a5ec06c023ec9a884 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 10 Nov 2017 21:43:34 +0000
Subject: [PATCH 2/3] Revert unintended merge commit.
---
.../vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
index 7af2d25a..2e5e51d7 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -81,10 +81,6 @@ limitations under the License.
// background-color: $e2e-verified-color;
border-bottom: 1px solid $primary-hairline-color;
font-size: 10px;
- display: flex;
- flex-direction: row;
- align-items: center;
- justify-content: space-between;
background-color: $widget-menu-bar-bg-color;
}
From 81ef9b143c8bf948d1b6072396651f612471f25b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 14 Nov 2017 18:44:10 +0000
Subject: [PATCH 3/3] Add widget menubar styling
---
src/skins/vector/themes/status/css/_status.scss | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/skins/vector/themes/status/css/_status.scss b/src/skins/vector/themes/status/css/_status.scss
index 2962ee9d..229d9b92 100644
--- a/src/skins/vector/themes/status/css/_status.scss
+++ b/src/skins/vector/themes/status/css/_status.scss
@@ -163,6 +163,10 @@ $panel-divider-color: rgba(0, 0, 0, 0.2);
// ********************
+$widget-menu-bar-bg-color: #f7f7f7;
+
+// ********************
+
// event tile lifecycle
$event-encrypting-color: #abddbc;
$event-sending-color: #ddd;