首頁 探索 說明
註冊 登入
oscarleiva
/
energylink
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

replaced rems with pixels or variables

ijin08 6 年之前
父節點
2db02bd240
當前提交
85bfb1dba8
共有 10 個文件被更改，包括 29 次插入 和 30 次删除
分割檢視 顯示文件統計
  1. 1 1
      public/sass/base/_code.scss
  2. 8 8
      public/sass/components/_code_editor.scss
  3. 2 3
      public/sass/components/_infobox.scss
  4. 2 2
      public/sass/components/_modals.scss
  5. 1 1
      public/sass/components/_old_stuff.scss
  6. 2 2
      public/sass/components/_shortcuts.scss
  7. 1 1
      public/sass/layout/_page.scss
  8. 9 9
      public/sass/pages/_errorpage.scss
  9. 1 1
      public/sass/pages/_playlist.scss
  10. 2 2
      public/sass/pages/_signup.scss

+ 1 - 1
public/sass/base/_code.scss
查看文件 

@@ -23,7 +23,7 @@ code {
 
 
 code.code--small {
 
   font-size: $font-size-xs;
 
-  padding: 0.2rem;
 
+  padding: $space-xxs;
 
   margin: 0 2px;
 
 }

+ 8 - 8
public/sass/components/_code_editor.scss
查看文件 

@@ -1,13 +1,13 @@
 
 .gf-code-editor {
 
-  min-height: 2.6rem;
 
-  min-width: 20rem;
 
+  min-height: 36px;
 
+  min-width: 280px;
 
   flex-grow: 1;
 
-  margin-right: 0.25rem;
 
+  margin-right: $space-xs;
 
 
   &.ace_editor {
 
     @include font-family-monospace();
 
-    font-size: 1rem;
 
-    min-height: 3.6rem; // Include space for horizontal scrollbar
 
+    font-size: $font-size-md;
 
+    min-height: 50px; // Include space for horizontal scrollbar
 
 
     @include border-radius($input-border-radius-sm);
 
     border: $border-width solid $input-border-color;
 
@@ -20,7 +20,7 @@
 
 
 .ace_editor.ace_autocomplete {
 
   @include font-family-monospace();
 
-  font-size: 1rem;
 
+  font-size: $font-size-md;
 
 
   // Ace editor adds <style> tag at the end of <head>, after grafana.css, so !important
 
   // is used for overriding styles with the same CSS specificity.
 
@@ -62,11 +62,11 @@ $doc-font-size: $font-size-sm;
 
   color: $popover-help-color;
 
   background-image: none;
 
   border: 1px solid $dropdownBorder;
 
-  padding: 0.5rem 1rem;
 
+  padding: $space-sm $space-md;
 
 
   hr {
 
     background-color: $popover-help-color;
 
-    margin: 0.5rem 0rem;
 
+    margin: $space-sm 0;
 
   }
 
 
   code {

+ 2 - 3
public/sass/components/_infobox.scss
查看文件 

@@ -1,10 +1,9 @@
 
 .grafana-info-box {
 
   position: relative;
 
-  padding: 1.5rem;
 
+  padding: $space-lg;
 
   background-color: $empty-list-cta-bg;
 
-  margin-bottom: 2rem;
 
   border-top: 3px solid $info-box-border-color;
 
-  margin-bottom: $spacer;
 
+  margin-bottom: $space-md;
 
   margin-right: $space-xs;
 
   box-shadow: $card-shadow;
 
   flex-grow: 1;

+ 2 - 2
public/sass/components/_modals.scss
查看文件 

@@ -122,7 +122,7 @@
 
   }
 
 
   .modal-content-confirm-text {
 
-    margin-bottom: 2rem;
 
+    margin-bottom: $space-xl;
 
     span {
 
       text-align: center;
 
     }
 
@@ -143,7 +143,7 @@
 
 
   .share-modal-big-icon {
 
     margin-bottom: 10px;
 
-    margin-right: 2rem;
 
+    margin-right: $space-xl;
 
     .fa,
 
     .icon-gf {
 
       font-size: 50px;

+ 1 - 1
public/sass/components/_old_stuff.scss
查看文件 

@@ -3,7 +3,7 @@
 
 }
 
 
 .section {
 
-  margin-right: 3rem;
 
+  margin-right: 42px;
 
   vertical-align: top;
 
   display: inline-block;
 
 }

+ 2 - 2
public/sass/components/_shortcuts.scss
查看文件 

@@ -17,7 +17,7 @@
 
     text-align: left;
 
     color: $text-muted;
 
     width: 99%;
 
-    padding: 0.38rem 1rem;
 
+    padding: $space-sm $space-md;
 
   }
 
 
   .shortcut-table-keys {
 
@@ -31,7 +31,7 @@
 
 .shortcut-table-key {
 
   display: inline-block;
 
   text-align: center;
 
-  margin-right: 0.3rem;
 
+  margin-right: $space-xs;
 
   padding: 3px 5px;
 
   font: 11px Consolas, 'Liberation Mono', Menlo, Courier, monospace;
 
   line-height: 10px;

+ 1 - 1
public/sass/layout/_page.scss
查看文件 

@@ -97,7 +97,7 @@
 
 }
 
 
 .page-heading {
 
-  font-size: 1.25rem;
 
+  font-size: $font-size-h4;
 
   margin-top: 0;
 
   margin-bottom: $spacer * 0.7;
 
 }

+ 9 - 9
public/sass/pages/_errorpage.scss
查看文件 

@@ -23,24 +23,24 @@
 
 
 .graph-box {
 
   width: 62%;
 
-  padding: 2rem 1rem;
 
+  padding: $space-xl $space-md;
 
 }
 
 
 .info-box {
 
   width: 38%;
 
-  padding: 2rem 1rem 2rem;
 
+  padding: $space-xl $space-md;
 
 }
 
 
 .graph-percentage {
 
-  padding: 0 0 1.5rem;
 
+  padding: 0 0 18px;
 
 }
 
 
 .image-box {
 
-  padding: 0.5rem;
 
+  padding: $space-sm;
 
 }
 
 
 .left-margin {
 
-  padding: 0 0 0 5rem;
 
+  padding: 0 0 0 64px;
 
 }
 
 
 .current-box {
 
@@ -54,7 +54,7 @@
 
 .current-text {
 
   color: $blue;
 
   font-weight: bold;
 
-  line-height: 1rem;
 
+  line-height: 14px;
 
 }
 
 
 .error-link {
 
@@ -63,14 +63,14 @@
 
 
 .error-minus {
 
   color: #7eb26d;
 
-  padding: 0 0.5rem;
 
-  line-height: 1.5rem;
 
+  padding: 0 $space-sm;
 
+  line-height: 21px;
 
 }
 
 
 .graph-percentage p {
 
   text-align: right;
 
   margin: 0;
 
-  line-height: 1rem;
 
+  line-height: 14px;
 
 }
 
 
 .graph-text {

+ 1 - 1
public/sass/pages/_playlist.scss
查看文件 

@@ -104,7 +104,7 @@
 
 
 .playlist-available-list {
 
   td {
 
-    line-height: 2rem;
 
+    line-height: 28px;
 
     max-width: 335px;
 
     white-space: nowrap;
 
     text-overflow: ellipsis;

+ 2 - 2
public/sass/pages/_signup.scss
查看文件 

@@ -17,6 +17,6 @@
 
 
 .signup__password-strength {
 
   position: absolute;
 
-  margin-left: 9rem;
 
-  width: 194px;
 
+  margin-left: 122px;
 
+  width: 192px;
 
 }