Commit f5024eb1 authored by Mark Otto's avatar Mark Otto

start the move to rems

parent 81b59d35
...@@ -61,28 +61,28 @@ ...@@ -61,28 +61,28 @@
background-image: none; background-image: none;
} }
.btn-primary { .btn-primary {
background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #015caa 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%); background-image: -o-linear-gradient(top, #027de7 0%, #015caa 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#2d6ca2)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#015caa));
background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%); background-image: linear-gradient(to bottom, #027de7 0%, #015caa 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff015caa', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x; background-repeat: repeat-x;
border-color: #2b669a; border-color: #0157a0;
} }
.btn-primary:hover, .btn-primary:hover,
.btn-primary:focus { .btn-primary:focus {
background-color: #2d6ca2; background-color: #015caa;
background-position: 0 -15px; background-position: 0 -15px;
} }
.btn-primary:active, .btn-primary:active,
.btn-primary.active { .btn-primary.active {
background-color: #2d6ca2; background-color: #015caa;
border-color: #2b669a; border-color: #0157a0;
} }
.btn-primary:disabled, .btn-primary:disabled,
.btn-primary[disabled] { .btn-primary[disabled] {
background-color: #2d6ca2; background-color: #015caa;
background-image: none; background-image: none;
} }
.btn-success { .btn-success {
...@@ -203,12 +203,12 @@ ...@@ -203,12 +203,12 @@
.dropdown-menu > .active > a, .dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus { .dropdown-menu > .active > a:focus {
background-color: #357ebd; background-color: #026fce;
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -o-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#026fce));
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); background-image: linear-gradient(to bottom, #027de7 0%, #026fce 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff026fce', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.navbar-default { .navbar-default {
...@@ -315,11 +315,11 @@ ...@@ -315,11 +315,11 @@
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.progress-bar { .progress-bar {
background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #0262b4 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #3071a9 100%); background-image: -o-linear-gradient(top, #027de7 0%, #0262b4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3071a9)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#0262b4));
background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%); background-image: linear-gradient(to bottom, #027de7 0%, #0262b4 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff0262b4', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.progress-bar-success { .progress-bar-success {
...@@ -367,14 +367,14 @@ ...@@ -367,14 +367,14 @@
.list-group-item.active, .list-group-item.active,
.list-group-item.active:hover, .list-group-item.active:hover,
.list-group-item.active:focus { .list-group-item.active:focus {
text-shadow: 0 -1px 0 #3071a9; text-shadow: 0 -1px 0 #0262b4;
background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #0268c1 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #3278b3 100%); background-image: -o-linear-gradient(top, #027de7 0%, #0268c1 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3278b3)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#0268c1));
background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%); background-image: linear-gradient(to bottom, #027de7 0%, #0268c1 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff0268c1', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
border-color: #3278b3; border-color: #0268c1;
} }
.panel { .panel {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
...@@ -389,11 +389,11 @@ ...@@ -389,11 +389,11 @@
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.panel-primary > .panel-heading { .panel-primary > .panel-heading {
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -o-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#026fce));
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); background-image: linear-gradient(to bottom, #027de7 0%, #026fce 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff026fce', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.panel-success > .panel-heading { .panel-success > .panel-heading {
......
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -290,21 +290,18 @@ body { ...@@ -290,21 +290,18 @@ body {
padding: 30px 0; padding: 30px 0;
margin-bottom: 40px; margin-bottom: 40px;
font-size: 20px; font-size: 20px;
background-color: #fafafa; background-color: #563d7c;
border-bottom: 1px solid #eee; /*border-bottom: 1px solid #eee;*/
}
.bs-docs-header .bs-docs-container {
max-width: none;
} }
.bs-docs-header h1 { .bs-docs-header h1 {
margin-top: 0; margin-top: 0;
color: #563d7c; color: #fff;
} }
.bs-docs-header p { .bs-docs-header p {
margin-bottom: 0; margin-bottom: 0;
font-weight: 300; font-weight: 300;
line-height: 1.4; line-height: 1.4;
color: #777; color: rgba(255,255,255,.65);
} }
.bs-docs-header .container { .bs-docs-header .container {
position: relative; position: relative;
...@@ -561,17 +558,19 @@ body { ...@@ -561,17 +558,19 @@ body {
.bs-docs-container { .bs-docs-container {
position: relative; position: relative;
max-width: 940px; max-width: 62rem;
padding: 15px; padding: 1rem;
margin-right: auto;
margin-left: auto;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.bs-docs-container { .bs-docs-container {
padding: 30px; padding: 2rem;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.bs-docs-container { .bs-docs-container {
padding: 30px 60px; padding: 2rem 4rem;
} }
} }
...@@ -634,8 +633,9 @@ body { ...@@ -634,8 +633,9 @@ body {
font-weight: 500; font-weight: 500;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
background-color: #6f4f9f; /*color: #fff;*/
border-bottom: 3px solid #563d7c; /*background-color: #6f4f9f;*/
/*border-bottom: 3px solid #563d7c;*/
} }
.bs-docs-sidebar-brand:hover, .bs-docs-sidebar-brand:hover,
.bs-docs-sidebar-brand:focus { .bs-docs-sidebar-brand:focus {
...@@ -646,6 +646,10 @@ body { ...@@ -646,6 +646,10 @@ body {
.bs-docs-sidenav { .bs-docs-sidenav {
display: none; display: none;
} }
.bs-docs-toc-item {
margin-right: -15px;
margin-left: -15px;
}
.bs-docs-toc-link { .bs-docs-toc-link {
display: block; display: block;
...@@ -670,6 +674,9 @@ body { ...@@ -670,6 +674,9 @@ body {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
.bs-docs-toc-item:first-child {
margin-top: 0;
}
.bs-docs-toc-item:last-child { .bs-docs-toc-item:last-child {
margin-bottom: 30px; margin-bottom: 30px;
} }
...@@ -940,36 +947,48 @@ h1[id] { ...@@ -940,36 +947,48 @@ h1[id] {
.bs-example { .bs-example {
position: relative; position: relative;
padding: 45px 15px 15px; margin-top: 1rem;
margin: 0 -15px 15px; /*padding: 45px 15px 15px;*/
border-color: #e5e5e5 #eee #eee; /*margin: 0 -15px 15px;*/
border-style: solid; /*border-color: #e5e5e5 #eee #eee;*/
border-width: 1px 0; /*border-style: solid;*/
-webkit-box-shadow: inset 0 3px 6px rgba(0,0,0,.05); /*border-width: 1px 0;*/
box-shadow: inset 0 3px 6px rgba(0,0,0,.05); /*-webkit-box-shadow: inset 0 3px 6px rgba(0,0,0,.05);*/
/*box-shadow: inset 0 3px 6px rgba(0,0,0,.05);*/
} }
/* Echo out a label for the example */ /* Echo out a label for the example */
.bs-example:after { .bs-example:before {
position: absolute; /*position: absolute;*/
top: 15px; /*top: 15px;*/
left: 15px; /*left: 15px;*/
font-size: 12px; display: inline-block;
padding: .5rem .75rem;
margin-bottom: 1rem;
font-size: .8rem;
font-weight: bold; font-weight: bold;
color: #959595; color: #fff;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 1px; letter-spacing: .1rem;
content: "Example"; content: "Example";
background-color: #818a91;
border-radius: .2rem;
} }
/* Tweak display of the code snippets when following an example */ /* Tweak display of the code snippets when following an example */
.bs-example + .highlight { .bs-example + .highlight:before {
margin: -15px -15px 15px; /*margin: -15px -15px 15px;*/
border-width: 0 0 1px; /*border-width: 0 0 1px;*/
border-radius: 0; /*border-radius: 0;*/
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
} }
/* Make the examples and snippets not full-width */ /* Make the examples and snippets not full-width */
@media (min-width: 768px) { @media (min-width: 768px) {
/*
.bs-example { .bs-example {
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
...@@ -980,6 +999,8 @@ h1[id] { ...@@ -980,6 +999,8 @@ h1[id] {
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
*/
/*
.bs-example + .highlight { .bs-example + .highlight {
margin-top: -16px; margin-top: -16px;
margin-right: 0; margin-right: 0;
...@@ -988,6 +1009,7 @@ h1[id] { ...@@ -988,6 +1009,7 @@ h1[id] {
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
*/
} }
/* Undo width of container */ /* Undo width of container */
...@@ -1211,19 +1233,15 @@ h1[id] { ...@@ -1211,19 +1233,15 @@ h1[id] {
*/ */
.highlight { .highlight {
padding: 9px 14px; padding: 1.5rem;
margin-bottom: 14px; margin-top: 1rem;
margin-bottom: 1rem;
background-color: #f7f7f9; background-color: #f7f7f9;
border: 1px solid #e1e1e8;
border-radius: 4px;
} }
.highlight pre { .highlight pre {
padding: 0; padding: 0;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
word-break: normal;
word-wrap: nowrap;
white-space: nowrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }
...@@ -1231,10 +1249,6 @@ h1[id] { ...@@ -1231,10 +1249,6 @@ h1[id] {
font-size: inherit; font-size: inherit;
color: #333; /* Effectively the base text color */ color: #333; /* Effectively the base text color */
} }
.highlight pre code:first-child {
display: inline-block;
padding-right: 45px;
}
/* /*
...@@ -1541,6 +1555,7 @@ h1[id] { ...@@ -1541,6 +1555,7 @@ h1[id] {
.zero-clipboard { .zero-clipboard {
position: relative; position: relative;
display: none; display: none;
float: right;
} }
.btn-clipboard { .btn-clipboard {
position: absolute; position: absolute;
...@@ -1548,18 +1563,16 @@ h1[id] { ...@@ -1548,18 +1563,16 @@ h1[id] {
right: 0; right: 0;
z-index: 10; z-index: 10;
display: block; display: block;
padding: 5px 8px; padding: .25rem .5rem;
font-size: 12px; font-size: 75%;
color: #777; color: #818a91;
cursor: pointer; cursor: pointer;
background-color: #fff; background-color: #eceeef;
border: 1px solid #e1e1e8; border-radius: .2rem;
border-radius: 0 4px 0 4px;
} }
.btn-clipboard-hover { .btn-clipboard-hover {
color: #fff; color: #fff;
background-color: #563d7c; background-color: #027de7;
border-color: #563d7c;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
......
...@@ -61,28 +61,28 @@ ...@@ -61,28 +61,28 @@
background-image: none; background-image: none;
} }
.btn-primary { .btn-primary {
background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #015caa 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #2d6ca2 100%); background-image: -o-linear-gradient(top, #027de7 0%, #015caa 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#2d6ca2)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#015caa));
background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%); background-image: linear-gradient(to bottom, #027de7 0%, #015caa 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff015caa', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x; background-repeat: repeat-x;
border-color: #2b669a; border-color: #0157a0;
} }
.btn-primary:hover, .btn-primary:hover,
.btn-primary:focus { .btn-primary:focus {
background-color: #2d6ca2; background-color: #015caa;
background-position: 0 -15px; background-position: 0 -15px;
} }
.btn-primary:active, .btn-primary:active,
.btn-primary.active { .btn-primary.active {
background-color: #2d6ca2; background-color: #015caa;
border-color: #2b669a; border-color: #0157a0;
} }
.btn-primary:disabled, .btn-primary:disabled,
.btn-primary[disabled] { .btn-primary[disabled] {
background-color: #2d6ca2; background-color: #015caa;
background-image: none; background-image: none;
} }
.btn-success { .btn-success {
...@@ -203,12 +203,12 @@ ...@@ -203,12 +203,12 @@
.dropdown-menu > .active > a, .dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus { .dropdown-menu > .active > a:focus {
background-color: #357ebd; background-color: #026fce;
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -o-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#026fce));
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); background-image: linear-gradient(to bottom, #027de7 0%, #026fce 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff026fce', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.navbar-default { .navbar-default {
...@@ -315,11 +315,11 @@ ...@@ -315,11 +315,11 @@
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.progress-bar { .progress-bar {
background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #0262b4 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #3071a9 100%); background-image: -o-linear-gradient(top, #027de7 0%, #0262b4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3071a9)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#0262b4));
background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%); background-image: linear-gradient(to bottom, #027de7 0%, #0262b4 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff0262b4', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.progress-bar-success { .progress-bar-success {
...@@ -367,14 +367,14 @@ ...@@ -367,14 +367,14 @@
.list-group-item.active, .list-group-item.active,
.list-group-item.active:hover, .list-group-item.active:hover,
.list-group-item.active:focus { .list-group-item.active:focus {
text-shadow: 0 -1px 0 #3071a9; text-shadow: 0 -1px 0 #0262b4;
background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #0268c1 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #3278b3 100%); background-image: -o-linear-gradient(top, #027de7 0%, #0268c1 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#3278b3)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#0268c1));
background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%); background-image: linear-gradient(to bottom, #027de7 0%, #0268c1 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff0268c1', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
border-color: #3278b3; border-color: #0268c1;
} }
.panel { .panel {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
...@@ -389,11 +389,11 @@ ...@@ -389,11 +389,11 @@
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.panel-primary > .panel-heading { .panel-primary > .panel-heading {
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -webkit-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -o-linear-gradient(top, #428bca 0%, #357ebd 100%); background-image: -o-linear-gradient(top, #027de7 0%, #026fce 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#428bca), to(#357ebd)); background-image: -webkit-gradient(linear, left top, left bottom, from(#027de7), to(#026fce));
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); background-image: linear-gradient(to bottom, #027de7 0%, #026fce 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff027de7', endColorstr='#ff026fce', GradientType=0);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.panel-success > .panel-heading { .panel-success > .panel-heading {
......
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -41,21 +41,16 @@ pre { ...@@ -41,21 +41,16 @@ pre {
display: block; display: block;
padding: ((@line-height-computed - 1) / 2); padding: ((@line-height-computed - 1) / 2);
margin: 0 0 (@line-height-computed / 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; line-height: @line-height-base;
word-break: break-all;
word-wrap: break-word;
color: @pre-color; color: @pre-color;
background-color: @pre-bg; 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 // Account for some code outputs that place code tags in pre tags
code { code {
padding: 0; padding: 0;
font-size: inherit; font-size: inherit;
color: inherit; color: inherit;
white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border-radius: 0; border-radius: 0;
} }
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
// Body reset // Body reset
html { html {
font-size: 10px; font-size: @font-size-root;
-webkit-tap-highlight-color: rgba(0,0,0,0); -webkit-tap-highlight-color: rgba(0,0,0,0);
} }
......
...@@ -56,18 +56,12 @@ h6, .h6 { font-size: @font-size-h6; } ...@@ -56,18 +56,12 @@ h6, .h6 { font-size: @font-size-h6; }
// ------------------------- // -------------------------
p { p {
margin: 0 0 (@line-height-computed / 2); margin-top: 0;
margin-bottom: 1rem;
} }
.lead { .lead {
margin-bottom: @line-height-computed; font-size: 1.5rem;
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);
}
} }
...@@ -144,11 +138,11 @@ mark, ...@@ -144,11 +138,11 @@ mark,
// Page header // Page header
// ------------------------- // -------------------------
.page-header { // .page-header {
padding-bottom: ((@line-height-computed / 2) - 1); // padding-bottom: ((@line-height-computed / 2) - 1);
margin: (@line-height-computed * 2) 0 @line-height-computed; // margin: (@line-height-computed * 2) 0 @line-height-computed;
border-bottom: 1px solid @page-header-border-color; // border-bottom: 1px solid @page-header-border-color;
} // }
// Lists // Lists
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
@gray-light: lighten(@gray-base, 46.7%); // #777 @gray-light: lighten(@gray-base, 46.7%); // #777
@gray-lighter: lighten(@gray-base, 93.5%); // #eee @gray-lighter: lighten(@gray-base, 93.5%); // #eee
@brand-primary: #428bca; @brand-primary: #027de7;
@brand-success: #5cb85c; @brand-success: #5cb85c;
@brand-info: #5bc0de; @brand-info: #5bc0de;
@brand-warning: #f0ad4e; @brand-warning: #f0ad4e;
...@@ -46,21 +46,22 @@ ...@@ -46,21 +46,22 @@
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif; @font-family-base: @font-family-sans-serif;
@font-size-base: 14px; @font-size-root: 16px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px @font-size-base: 1rem;
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px @font-size-large: 1.25rem;
@font-size-small: .85rem;
@font-size-h1: floor((@font-size-base * 2.6)); // ~36px @font-size-h1: 3rem;
@font-size-h2: floor((@font-size-base * 2.15)); // ~30px @font-size-h2: 2.5rem;
@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px @font-size-h3: 2rem;
@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px @font-size-h4: 1.5rem;
@font-size-h5: @font-size-base; @font-size-h5: 1.25rem;
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px @font-size-h6: 1rem;
//** Unit-less `line-height` for use in components like buttons. //** 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. //** 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>`. //** By default, this inherits from the `<body>`.
@headings-font-family: inherit; @headings-font-family: inherit;
...@@ -813,7 +814,7 @@ ...@@ -813,7 +814,7 @@
@kbd-color: #fff; @kbd-color: #fff;
@kbd-bg: #333; @kbd-bg: #333;
@pre-bg: #f5f5f5; @pre-bg: #f7f7f9;
@pre-color: @gray-dark; @pre-color: @gray-dark;
@pre-border-color: #ccc; @pre-border-color: #ccc;
@pre-scrollable-max-height: 340px; @pre-scrollable-max-height: 340px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment