From 0480a880f34d2e32387e08688e8441e0b11e5899 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 18 Apr 2017 19:53:56 +0100
Subject: [PATCH 1/2] styling for spoilerized access token view in Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/skins/vector/css/_components.scss | 1 +
.../vector-web/views/settings/_Advanced.scss | 21 +++++++++++++++++++
2 files changed, 22 insertions(+)
create mode 100644 src/skins/vector/css/vector-web/views/settings/_Advanced.scss
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index df3c4600..0c3b209a 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -78,4 +78,5 @@
@import "./vector-web/views/rooms/_RoomDropTarget.scss";
@import "./vector-web/views/rooms/_RoomTooltip.scss";
@import "./vector-web/views/rooms/_SearchBar.scss";
+@import "./vector-web/views/settings/_Advanced.scss";
@import "./vector-web/views/settings/_Notifications.scss";
diff --git a/src/skins/vector/css/vector-web/views/settings/_Advanced.scss b/src/skins/vector/css/vector-web/views/settings/_Advanced.scss
new file mode 100644
index 00000000..2f274038
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/settings/_Advanced.scss
@@ -0,0 +1,21 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+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_UserSettings_advanced_spoiler {
+ cursor: pointer;
+ color: $accent-color;
+ word-break: break-all;
+}
From a8e4a2158a9c0d43e78bd98ab912da098f4f3602 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 22 Apr 2017 04:33:47 +0100
Subject: [PATCH 2/2] move styling to correct place NOTE TO SELF 1:1 mapping
between react component to scss file. Makes sense...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/skins/vector/css/_components.scss | 1 -
.../structures/_UserSettings.scss | 6 ++++++
.../vector-web/views/settings/_Advanced.scss | 21 -------------------
3 files changed, 6 insertions(+), 22 deletions(-)
delete mode 100644 src/skins/vector/css/vector-web/views/settings/_Advanced.scss
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 0c3b209a..df3c4600 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -78,5 +78,4 @@
@import "./vector-web/views/rooms/_RoomDropTarget.scss";
@import "./vector-web/views/rooms/_RoomTooltip.scss";
@import "./vector-web/views/rooms/_SearchBar.scss";
-@import "./vector-web/views/settings/_Advanced.scss";
@import "./vector-web/views/settings/_Notifications.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
index 099b5b51..9f33e1bc 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@@ -213,3 +213,9 @@ input.mx_UserSettings_phoneNumberField {
.mx_UserSettings_avatarPicker_edit > input {
display: none;
}
+
+.mx_UserSettings_advanced_spoiler {
+ cursor: pointer;
+ color: $accent-color;
+ word-break: break-all;
+}
diff --git a/src/skins/vector/css/vector-web/views/settings/_Advanced.scss b/src/skins/vector/css/vector-web/views/settings/_Advanced.scss
deleted file mode 100644
index 2f274038..00000000
--- a/src/skins/vector/css/vector-web/views/settings/_Advanced.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-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_UserSettings_advanced_spoiler {
- cursor: pointer;
- color: $accent-color;
- word-break: break-all;
-}