diff options
| author | Mark Otto <[email protected]> | 2014-07-08 01:22:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-08 01:22:02 -0700 |
| commit | 8d50d4a68442a413be622002048b00cd0b447a62 (patch) | |
| tree | de17caf478109abcd1b9db3a17e5cdc8883c226a /less | |
| parent | 413750a03c5cde563f0378167698be65f3856d7c (diff) | |
| download | bootstrap-8d50d4a68442a413be622002048b00cd0b447a62.tar.xz bootstrap-8d50d4a68442a413be622002048b00cd0b447a62.zip | |
rems: buttons
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/less/buttons.less b/less/buttons.less index 05bd89d08..3faac5351 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -132,7 +132,7 @@ .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); } .btn-xs { - .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small); + .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-xs; @line-height-small; @border-radius-small); } diff --git a/less/variables.less b/less/variables.less index 239c910a5..d31228e3a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -50,6 +50,7 @@ @font-size-base: 1rem; @font-size-large: 1.25rem; @font-size-small: .85rem; +@font-size-xs: .75rem; @font-size-h1: 3rem; @font-size-h2: 2.5rem; @@ -59,9 +60,9 @@ @font-size-h6: 1rem; //** Unit-less `line-height` for use in components like buttons. -@line-height-base: 1.5; // 20/14 +@line-height-base: 1.5; //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc. -@line-height-computed: (@font-size-root * @line-height-base); // ~20px +@line-height-computed: (@font-size-root * @line-height-base); //** By default, this inherits from the `<body>`. @headings-font-family: inherit; @@ -86,17 +87,17 @@ // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). -@padding-base-vertical: 6px; -@padding-base-horizontal: 12px; +@padding-base-vertical: .5rem; +@padding-base-horizontal: 1rem; -@padding-large-vertical: 10px; -@padding-large-horizontal: 16px; +@padding-large-vertical: .75rem; +@padding-large-horizontal: 1.5rem; -@padding-small-vertical: 5px; -@padding-small-horizontal: 10px; +@padding-small-vertical: .3rem; +@padding-small-horizontal: .75rem; -@padding-xs-vertical: 1px; -@padding-xs-horizontal: 5px; +@padding-xs-vertical: .2rem; +@padding-xs-horizontal: .5rem; @line-height-large: 1.33; @line-height-small: 1.5; |