opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 16:02:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

ux: changed body default font size to 13px

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-11-29 15:26:16 +01:00
parent d981fe4f04
commit c9be5c21ae
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/sass/_variables.scss
View File

@ -86,11 +86,11 @@ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
$font-family-base: $font-family-sans-serif !default;
$font-size-root: 14px !default;
$font-size-base: 13px !default;
$font-size-base: 1rem !default;
$font-size-lg: 1.25rem !default;
$font-size-sm: .875rem !default;
$font-size-xs: .75rem !default;
$font-size-lg: 18px !default;
$font-size-sm: 12px !default;
$font-size-xs: 10px !default;
$line-height-base: 1.5 !default;
$font-weight-semi-bold: 500;
@ -159,9 +159,9 @@ $table-cell-padding: 4px 10px !default;
$table-sm-cell-padding: .3rem !default;
// Forms
$input-padding-x: .75rem !default;
$input-padding-y: .6rem !default;
$input-line-height: 1.35rem !default;
$input-padding-x: 10px !default;
$input-padding-y: 8px !default;
$input-line-height: 19px !default;
$input-btn-border-width: 1px;
$input-border-radius: 0 $border-radius $border-radius 0 !default;
@ -172,11 +172,11 @@ $label-border-radius: $border-radius 0 0 $border-radius !default;
$label-border-radius-lg: $border-radius-lg 0 0 $border-radius-lg !default;
$label-border-radius-sm: $border-radius-sm 0 0 $border-radius-sm !default;
$input-padding-x-sm: .5rem !default;
$input-padding-y-sm: .25rem !default;
$input-padding-x-sm: 7px !default;
$input-padding-y-sm: 4px !default;
$input-padding-x-lg: 1.5rem !default;
$input-padding-y-lg: .75rem !default;
$input-padding-x-lg: 20px !default;
$input-padding-y-lg: 10px !default;
$input-height: (($font-size-base * $line-height-base) + ($input-padding-y * 2)) !default;
$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;

2
public/sass/components/_dropdown.scss
View File

@ -18,7 +18,7 @@
position: relative;
top: -3px;
width: 250px;
font-size: 80%;
font-size: $font-size-sm;
margin-left: 22px;
color: $gray-2;
white-space: normal;

8
public/sass/components/_gf-form.scss
View File

@ -1,4 +1,5 @@
$gf-form-margin: 3px;
$input-border: 1px solid $input-border-color;
.gf-form {
margin-bottom: $gf-form-margin;
@ -115,7 +116,7 @@ $gf-form-margin: 3px;
background-color: $input-bg;
background-image: none;
background-clip: padding-box;
border: 1px solid $input-border-color;
border: $input-border;
@include border-radius($input-border-radius-sm);
@include box-shadow($input-box-shadow);
white-space: nowrap;
@ -268,6 +269,7 @@ $gf-form-margin: 3px;
position: relative;
background-color: $input-bg;
padding-right: $input-padding-x;
border: $input-border;
&::after {
position: absolute;
@ -279,6 +281,10 @@ $gf-form-margin: 3px;
content: '\f0d7';
pointer-events: none;
}
.gf-form-input {
border: none;
}
}
.gf-form-help-icon {