Просмотр исходного кода

Merge pull request #4420 from grafana/grafana-worldping-tweaks

Beginngings of style adjustments to support worldPing app
Torkel Ödegaard 9 лет назад
Родитель
Сommit
662dbaf8b2

+ 1 - 1
public/sass/_variables.scss

@@ -161,7 +161,7 @@ $table-sm-cell-padding:         .3rem !default;
 // Forms
 $input-padding-x:                .75rem !default;
 $input-padding-y:                .6rem !default;
-$input-line-height:              1.35rem !default;
+$input-line-height:              1.42rem !default;
 
 $input-btn-border-width:         1px;
 $input-border-radius:            0 $border-radius $border-radius 0 !default;

+ 6 - 0
public/sass/components/_cards.scss

@@ -58,6 +58,12 @@
   &:hover {
     background: $card-background-hover;
   }
+
+  .label-tag {
+    margin-left: 6px;
+    font-size: 11px;
+    padding: 2px 6px;
+  }  
 }
 
 .card-item-body {

+ 4 - 0
public/sass/components/_gf-form.scss

@@ -139,6 +139,10 @@ $gf-form-label-margin: 0.25rem;
   }
 }
 
+.gf-form-select-wrapper + .gf-form-select-wrapper { 
+  margin-left: $gf-form-label-margin; 
+}
+
 .gf-form-btn {
   padding: $input-padding-y $input-padding-x;
   line-height: $input-line-height;