mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

start the move to rems

Browse Source
This commit is contained in:
Mark Otto
2014-07-07 23:36:40 -07:00
parent 81b59d3536
commit f5024eb13a
18 changed files with 498 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/code.less
+1 -6
View File
@@ -41,21 +41,16 @@ pre {
display: block;
padding: ((@line-height-computed - 1) / 2);
margin: 0 0 (@line-height-computed / 2);
font-size: (@font-size-base - 1); // 14px to 13px
font-size: 90%;
line-height: @line-height-base;
word-break: break-all;
word-wrap: break-word;
color: @pre-color;
background-color: @pre-bg;
border: 1px solid @pre-border-color;
border-radius: @border-radius-base;
// Account for some code outputs that place code tags in pre tags
code {
padding: 0;
font-size: inherit;
color: inherit;
white-space: pre-wrap;
background-color: transparent;
border-radius: 0;
}
less/scaffolding.less
+1 -1
View File
@@ -20,7 +20,7 @@
// Body reset
html {
font-size: 10px;
font-size: @font-size-root;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
less/type.less
+8 -14
View File
@@ -56,18 +56,12 @@ h6, .h6 { font-size: @font-size-h6; }
// -------------------------
p {
margin: 0 0 (@line-height-computed / 2);
margin-top: 0;
margin-bottom: 1rem;
}
.lead {
margin-bottom: @line-height-computed;
font-size: floor((@font-size-base * 1.15));
font-weight: 300;
line-height: 1.4;
@media (min-width: @screen-sm-min) {
font-size: (@font-size-base * 1.5);
}
font-size: 1.5rem;
}
@@ -144,11 +138,11 @@ mark,
// Page header
// -------------------------
.page-header {
padding-bottom: ((@line-height-computed / 2) - 1);
margin: (@line-height-computed * 2) 0 @line-height-computed;
border-bottom: 1px solid @page-header-border-color;
}
// .page-header {
// padding-bottom: ((@line-height-computed / 2) - 1);
// margin: (@line-height-computed * 2) 0 @line-height-computed;
// border-bottom: 1px solid @page-header-border-color;
// }
// Lists
less/variables.less
+14 -13
View File
@@ -14,7 +14,7 @@
@gray-light: lighten(@gray-base, 46.7%); // #777
@gray-lighter: lighten(@gray-base, 93.5%); // #eee
@brand-primary: #428bca;
@brand-primary: #027de7;
@brand-success: #5cb85c;
@brand-info: #5bc0de;
@brand-warning: #f0ad4e;
@@ -46,21 +46,22 @@
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
@font-size-root: 16px;
@font-size-base: 1rem;
@font-size-large: 1.25rem;
@font-size-small: .85rem;
@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
@font-size-h5: @font-size-base;
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
@font-size-h1: 3rem;
@font-size-h2: 2.5rem;
@font-size-h3: 2rem;
@font-size-h4: 1.5rem;
@font-size-h5: 1.25rem;
@font-size-h6: 1rem;
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
@line-height-base: 1.5; // 20/14
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
@line-height-computed: (@font-size-root * @line-height-base); // ~20px
//** By default, this inherits from the `<body>`.
@headings-font-family: inherit;
@@ -813,7 +814,7 @@
@kbd-color: #fff;
@kbd-bg: #333;
@pre-bg: #f5f5f5;
@pre-bg: #f7f7f9;
@pre-color: @gray-dark;
@pre-border-color: #ccc;
@pre-scrollable-max-height: 340px;