Merge pull request #1 from nblogist/asad-branch

Merged Asad's Branch, after resolving conflicts in validators.scss
hicommonwealth · Jun 21, 2020 · 4d8b041 · 4d8b041
2 parents fab01c4 + 80afe1a
commit 4d8b041
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 43 deletions.
diff --git a/client/styles/layout.scss b/client/styles/layout.scss
@@ -9,7 +9,7 @@ html, body {
     width: 100%;
 }
 html {
-    font-family: $fonts;
+    font-family: 'Inter', sans-serif !important;
     font-size: 15px;
     line-height: 1.4;
     -moz-osx-font-smoothing: grayscale;

diff --git a/client/styles/modal.scss b/client/styles/modal.scss
@@ -1,6 +1,8 @@
 @import 'client/styles/shared';
 
 .Modal {
+
+
     .overlay {
         top: 0;
         bottom: 0;
@@ -18,12 +20,11 @@
         @include popout();
         position: relative;
         min-width: 380px;
-        max-width: 800px;
-        max-height: 96%;
+        max-width: 440px;
+        max-height: 559px;
         background: white;
         overflow: hidden;
         overflow-y: auto;
-        max-width: 92%;
         border-radius: 3px;
         z-index: 20;
     }
@@ -49,6 +50,7 @@
     }
 
     .compact-modal-title {
+        display: none;
         padding: 24px 28px 20px;
         background: #272524;
         color: #fff;
@@ -69,6 +71,9 @@
             padding-bottom: 16px;
         }
     }
+    .compact-modal-body th{
+        text-align: left !important;
+    }
     .compact-modal-actions {
         padding: 6px 28px 28px;
     }

diff --git a/client/styles/pages/validators.scss b/client/styles/pages/validators.scss
@@ -1,11 +1,14 @@
-@import "client/styles/shared";
+@import 'client/styles/shared';
+// font added
+@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap');
 
 @mixin small-gray {
-  font-size: 13px;
-  font-weight: 700;
-  text-transform: uppercase;
-  color: #999;
-  letter-spacing: 0.2px;
+    font-family: 'Inter', sans-serif !important;
+    font-size: 13px;
+    font-weight: 700;
+    text-transform: uppercase;
+    color: #999;
+    letter-spacing: 0.2px;
 }
 .bar-outer {
   width: 20em;
@@ -17,6 +20,7 @@
   width: 0%;
   height: 100%;
   background-color: #3c0;
+
 }
 
 .NewStashForm {
@@ -29,6 +33,12 @@
   }
 }
 
+// removed right sidebar
+.right-sidebar{
+    display: none !important;
+}
+
+
 .ViewNominatorsModal {
   max-width: 600px;
 }
@@ -95,41 +105,64 @@
   }
 }
 
+.Jdenticon{
+    height: 20px !important;
+    width: 20px !important;
+}
+
+.Tabs a.tab-entry{
+    padding-right: 30px !important;
+    padding-left: 15px !important;
+    font-size: 16px !important;
+}
+
+.val-hash{
+    overflow-wrap: break-word !important;
+    min-width: 500px !important;
+    padding-right: 10vw !important;
+}
+
 .Validators {
-  width: 100%;
-  th {
-    @include small-gray;
-    text-align: left;
-    border-bottom: none;
-  }
-  td {
-    font-size: 15px;
-    border-bottom: none;
-    padding-top: 0;
-    padding-bottom: 5px;
-    overflow: hidden;
-  }
-  td .User a.user-display-name {
-    font-size: 15px;
-  }
-  .val-name {
-    font-weight: 700;
-  }
-  .val-action {
-    text-align: right;
-  }
-  @include sm-max {
-    .val-nominated {
-      display: none;
+
+    font-family: 'Inter', sans-serif !important;
+    min-width: 70vw;
+    overflow-x: scroll;
+    padding-top: 40px !important;
+    th {
+        @include small-gray;
+        text-align: left;
+        border-bottom: none;
+        overflow-wrap: break-word
+    }
+    td {
+        font-size: 15px;
+        border-bottom: 1;
+        padding-top: 15px;
+        padding-bottom: 14px;
+        overflow: hidden;
+
+    }
+    td .User a.user-display-name {
+        font-size: 15px;
+    }
+    .val-name {
+        font-weight: 700;
+    }
+    .val-action {
+        text-align: right;
+    }
+    @include sm-max {
+        .val-nominated {
+            display: none;
+        }
+    }
+    a.view-nominators {
+        color: #999;
+        float: right;
+    }
+    button.nominate-validator {
+        padding: 3px 10px;
     }
-  }
-  a.view-nominators {
-    color: #999;
-    float: right;
-  }
-  button.nominate-validator {
-    padding: 3px 10px;
-  }
 }
 
 .ValidatorPage {
@@ -150,3 +183,51 @@
     }
   }
 }
+
+// Changes @author Asad Anwer
+.layout-container{
+    padding-top: 75px !important;
+}
+
+.left-sidebar{
+    min-width: 300px !important;
+    margin-right: 40px !important;
+    background-color: #F4F4F9 !important;
+}
+
+.cui-list{
+    background-color: #F4F4F9 !important;
+    margin-bottom: 0px !important;
+    padding-top: 20px !important;
+    padding-bottom: 20px !important;
+}
+
+.cui-list h4{
+    font-family: Inter !important;
+    font-style: normal !important;
+    font-weight: bold !important;
+    font-size: 12px !important;
+    letter-spacing: -0.2px !important;
+}
+
+.cui-list-item{
+    font-family: Inter !important;
+    font-style: normal !important;
+    font-weight: 500 !important;
+    font-size: 16px !important;
+    color: #536E7C !important;
+}
+
+.cui-active{
+    color: white !important;
+}
+
+.cui-list-item svg{
+    color: #536E7C !important;
+}
+
+
+.gray-text{
+    color: #536E7C !important;
+    padding-left: 5px !important;
+}
diff --git a/client/styles/sublayout.scss b/client/styles/sublayout.scss
@@ -8,6 +8,10 @@
     > .left-sidebar {
         width: $sidebar-width;
         margin-right: $gutter-width;
+        min-width: 300px !important;
+        margin-right: 40px !important;
+        background-color: #F4F4F9 !important;
+        min-height: 100vh;
     }
     > .right-sidebar {
         width: $sidebar-width;