feat: added global styles to pages (#252)

* feat: added global styles to pages * fix: merge bug * fix: delete unused style rules --------- Co-authored-by: Nikita Teremovskiy <[email protected]>
dapplets · Dec 8, 2023 · 4d72fcc · 4d72fcc
1 parent 19c1df4
commit 4d72fcc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 38 deletions.
diff --git a/src/contentscript/overlay/root/assets/styles/pages.scss b/src/contentscript/overlay/root/assets/styles/pages.scss
@@ -0,0 +1,8 @@
+.wrapper {
+  overflow: hidden;
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
+
+  width: 100%;
+}
diff --git a/src/contentscript/overlay/root/pages/Dapplets/Dapplets.module.scss b/src/contentscript/overlay/root/pages/Dapplets/Dapplets.module.scss
@@ -1,9 +1,9 @@
 @import '../../assets/styles/color.variables';
 @import '../../assets/styles/null';
+@import '../../assets/styles/pages';
 @import './adaptive';
 
 .wrapper {
-  display: flex;
   align-items: center;
   justify-content: end;
   margin-bottom: 5px;

diff --git a/src/contentscript/overlay/root/pages/DappletsInfo/DappletsInfo.module.scss b/src/contentscript/overlay/root/pages/DappletsInfo/DappletsInfo.module.scss
@@ -1,22 +1,14 @@
 @import '../../assets/styles/null';
 @import '../../assets/styles/color.variables';
+@import '../../assets/styles/pages';
 @import './modalStyles';
 @import './adaptive';
 
 // ToDo: code duplication
 
 .wrapper {
-  overflow: hidden;
-  overflow: -moz-scrollbars-none;
-  display: flex;
-  flex: 1 1 auto;
-  flex-direction: column;
-
-  width: 100%;
   height: calc(100vh - 100px);
   padding-bottom: 10px;
-
-  -ms-overflow-style: none;
 }
 
 .wrapper::-webkit-scrollbar {

diff --git a/src/contentscript/overlay/root/pages/Notifications/Notifications.module.scss b/src/contentscript/overlay/root/pages/Notifications/Notifications.module.scss
@@ -1,18 +1,10 @@
 @import '../../assets/styles/color.variables';
 @import '../../assets/styles/null';
+@import '../../assets/styles/pages';
 @import './adaptive';
 
-
 .wrapper {
-  overflow: hidden;
-  overflow: -moz-scrollbars-none;
-  display: flex;
-  flex-direction: column;
-
-  width: 100%;
   height: 100%;
-
-  -ms-overflow-style: none;
 }
 
 .wrapper::-webkit-scrollbar {
@@ -223,4 +215,4 @@
   background-image: url('../../assets/icons/notificationIcons/bg.png');
   background-repeat: no-repeat;
   background-size: 100%;
-}
+}
diff --git a/src/contentscript/overlay/root/pages/Settings/Developer/Developer.module.scss b/src/contentscript/overlay/root/pages/Settings/Developer/Developer.module.scss
@@ -1,22 +1,14 @@
 @import '../../../assets/styles/null';
 @import '../../../assets/styles/color.variables';
 @import '../../../assets/styles/animate';
+@import '../../../assets/styles/pages';
 @import './adaptive';
 
 // ToDo: looks that the code below is duplicated
 
 .wrapper {
-  overflow: hidden;
-  overflow: -moz-scrollbars-none;
-  display: flex;
-  flex: 1 1 auto;
-  flex-direction: column;
-
-  width: 100%;
   max-height: calc(100vh - 100px);
   padding-bottom: 10px;
-
-  -ms-overflow-style: none;
 }
 
 .wrapper::-webkit-scrollbar {

diff --git a/src/contentscript/overlay/root/pages/Settings/Settings/Settings.module.scss b/src/contentscript/overlay/root/pages/Settings/Settings/Settings.module.scss
@@ -1,16 +1,11 @@
 @import '../../../assets/styles/color.variables';
 @import '../../../assets/styles/null';
+@import '../../../assets/styles/pages';
 @import './adaptive';
 
 .wrapper {
-  overflow: hidden;
-  overflow: -moz-scrollbars-none;
-
-  width: 100%;
   height: 100%;
   padding: 10px;
-
-  -ms-overflow-style: none;
 }
 
 .wrapperTokenomics {

diff --git a/src/contentscript/overlay/root/pages/UserSettings/UserSettings.module.scss b/src/contentscript/overlay/root/pages/UserSettings/UserSettings.module.scss
@@ -1,10 +1,8 @@
 @import '../../assets/styles/null';
 @import '../../assets/styles/color.variables';
+@import '../../assets/styles/pages';
 
 .wrapper {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
   margin-top: 25px;
 }