Skip to content

B
bootstrap
Commit 2fcb6777 authored by Mark Otto's avatar Mark Otto
Browse files
Options

merging in misc fixes to docs and css from other branch

parents a3caafb9 72899a4e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 363 additions and 289 deletions
bootstrap-1.0.0.css
View file @ 2fcb6777
......@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sat Aug 20 18:59:41 PDT 2011
* Date: Sat Aug 20 20:18:13 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
......@@ -339,7 +339,7 @@ html, body {
background-color: #fff;
}
body {
margin: 0;
margin: 60px 0 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: normal;
......@@ -352,7 +352,7 @@ div.container {
margin: 0 auto;
}
div.container-fluid {
padding: 20px;
padding: 0 20px;
zoom: 1;
}
div.container-fluid:before, div.container-fluid:after {
......@@ -466,7 +466,7 @@ p {
font-size: 13px;
font-weight: normal;
line-height: 18px;
margin-bottom: 18px;
margin-bottom: 9px;
}
p small {
font-size: 11px;
......@@ -594,14 +594,14 @@ blockquote p {
line-height: 18px;
margin-bottom: 0;
}
blockquote small, blockquote cite {
blockquote small {
display: block;
font-size: 12px;
font-weight: 300;
line-height: 18px;
color: #bfbfbf;
}
blockquote small:before, blockquote cite:before {
blockquote small:before {
content: '\2014 \00A0';
}
address {
......@@ -629,6 +629,7 @@ pre {
margin: 0 0 18px;
line-height: 18px;
font-size: 12px;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
......@@ -1118,13 +1119,13 @@ div.topbar a {
color: #bfbfbf;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
div.topbar ul li a:hover, div.topbar ul li.active a, div.topbar a.logo:hover {
div.topbar a:hover, div.topbar ul li.active a {
background-color: #333;
background-color: rgba(255, 255, 255, 0.15);
background-color: rgba(255, 255, 255, 0.05);
color: #ffffff;
text-decoration: none;
}
div.topbar a.logo {
div.topbar h3 a {
float: left;
display: block;
padding: 8px 20px 12px;
......@@ -1134,10 +1135,6 @@ div.topbar a.logo {
font-weight: 200;
line-height: 1;
}
div.topbar a.logo img {
float: left;
margin-right: 6px;
}
div.topbar form {
float: left;
margin: 5px 0 0 0;
......@@ -1326,6 +1323,25 @@ div.topbar ul li ul li span {
color: #808080;
border-top: 1px solid rgba(0, 0, 0, 0.2);
}
.hero-unit {
background-color: #f5f5f5;
margin-bottom: 30px;
padding: 60px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.hero-unit h1 {
margin-bottom: 0;
font-size: 60px;
line-height: 1;
letter-spacing: -1px;
}
.hero-unit p {
font-size: 18px;
font-weight: 200;
line-height: 27px;
}
div.page-header {
margin-bottom: 17px;
border-bottom: 1px solid #ddd;
......@@ -1544,12 +1560,13 @@ div.pagination ul li.disabled a, div.pagination ul li.disabled a:hover {
div.pagination ul li.next a, div.pagination ul li:last-child a {
border: 0;
}
div.well {
background: #f5f5f5;
.well {
background-color: #f5f5f5;
margin-bottom: 20px;
padding: 19px;
min-height: 20px;
border: 1px solid #ddd;
border: 1px solid #eee;
border: 1px solid rgba(0, 0, 0, 0.05);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
......
bootstrap-1.0.0.min.css
View file @ 2fcb6777
This diff is collapsed.
docs/assets/css/docs.css
View file @ 2fcb6777
......@@ -11,8 +11,7 @@ body {
position: relative;
}
section {
padding-top: 80px;
margin-bottom: -40px;
padding-top: 60px;
}
#masthead, #footer {
background-color: #049cd9;
......@@ -45,7 +44,7 @@ section {
font-weight: bold;
}
#masthead {
margin-top: 40px;
margin-top: -20px;
}
#masthead h1,
#masthead p {
......@@ -77,7 +76,6 @@ div.quickstart {
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);
background-image: linear-gradient(#f9f9f9, #f5f5f5);
margin-bottom: -36px;
border-top: 1px solid #fff;
border-bottom: 1px solid #eee;
}
......@@ -133,12 +131,13 @@ div.quickstart form textarea {
/* Special grid styles
-------------------------------------------------- */
.show-grid {
margin-top: 20px;
margin-bottom: 20px;
margin-top: 10px;
margin-bottom: 10px;
}
.show-grid .column, .show-grid .columns {
background: rgba(0, 0, 0, 0.1);
background-color: #eee;
text-align: center;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
height: 30px;
......@@ -181,7 +180,8 @@ div.mini-layout {
height: 340px;
margin-bottom: 20px;
padding: 9px;
border: 1px solid rgba(0, 0, 0, 0.25);
border: 1px solid #ccc;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.125);
......@@ -189,11 +189,12 @@ div.mini-layout {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.125);
}
div.mini-layout div {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
div.mini-layout div.mini-layout-body {
background-color: rgba(141, 192, 219, 0.25);
background-color: #dceaf4;
margin: 0 auto;
width: 450px;
height: 340px;
......@@ -202,7 +203,7 @@ div.mini-layout.fluid div.mini-layout-sidebar, div.mini-layout.fluid div.mini-la
float: left;
}
div.mini-layout.fluid div.mini-layout-sidebar {
background-color: rgba(141, 192, 219, 0.5);
background-color: #bbd8e9;
width: 90px;
height: 340px;
}
......@@ -222,6 +223,7 @@ div.topbar-wrapper div.topbar {
margin: 0 -20px;
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
......@@ -241,7 +243,7 @@ div.popover-well div.popover-wrapper {
height: 160px;
float: left;
margin-left: 55px;
position:relative;
position: relative;
}
div.popover-well div.popover-menu-wrapper {
......@@ -250,5 +252,5 @@ div.popover-well div.popover-menu-wrapper {
img.large-bird {
margin: 5px 0 0 310px;
opacity:.1;
opacity: .1;
}
\ No newline at end of file
docs/index.html
View file @ 2fcb6777
This diff is collapsed.
lib/patterns.less
View file @ 2fcb6777
......@@ -25,30 +25,25 @@ div.topbar {
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}
// Hover and active states for links
ul li a:hover,
ul li.active a,
a.logo:hover {
// Hover and active states
a:hover,
ul li.active a {
background-color: #333;
background-color: rgba(255,255,255,.15);
background-color: rgba(255,255,255,.05);
color: @white;
text-decoration: none;
}
// Logo
a.logo {
// Website name
h3 a {
float: left;
display: block;
padding: 8px 20px 12px;
margin-left: -20px;
margin-left: -20px; // negative indent to left-align the text down the page
color: @white;
font-size: 20px;
font-weight: 200;
line-height: 1;
img {
float: left;
margin-right: 6px;
}
}
// Search Form
......@@ -241,6 +236,28 @@ div.topbar {
}
// PAGE HEADERS
// ------------
.hero-unit {
background-color: #f5f5f5;
margin-bottom: 30px;
padding: 60px;
.border-radius(6px);
h1 {
margin-bottom: 0;
font-size: 60px;
line-height: 1;
letter-spacing: -1px;
}
p {
font-size: 18px;
font-weight: 200;
line-height: @baseline * 1.5;
}
}
// PAGE HEADERS
// ------------
......@@ -458,12 +475,13 @@ div.pagination {
// WELLS
// -----
div.well {
background: #f5f5f5;
.well {
background-color: #f5f5f5;
margin-bottom: 20px;
padding: 19px;
min-height: 20px;
border: 1px solid #ddd;
border: 1px solid #eee;
border: 1px solid rgba(0,0,0,.05);
.border-radius(4px);
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
}
......
lib/scaffolding.less
View file @ 2fcb6777
......@@ -51,7 +51,7 @@ html, body {
background-color: #fff;
}
body {
margin: 0;
margin: 60px 0 0; // Add margin to the top of the page for the topbar
#font > .sans-serif(normal,@basefont,@baseline);
color: @gray;
text-rendering: optimizeLegibility;
......@@ -65,7 +65,7 @@ div.container {
// Fluid layouts (left aligned, with sidebar, min- & max-width content)
div.container-fluid {
padding: 20px;
padding: 0 20px;
.clearfix();
div.sidebar {
float: left;
......
lib/type.less
View file @ 2fcb6777
......@@ -8,9 +8,9 @@
p {
#font > .shorthand(normal,@basefont,@baseline);
margin-bottom: @baseline;
margin-bottom: @baseline / 2;
small {
font-size: 11px;
font-size: @basefont - 2;
color: @grayLight;
}
}
......@@ -142,7 +142,7 @@ blockquote {
#font > .shorthand(300,14px,@baseline);
margin-bottom: 0;
}
small, cite {
small {
display: block;
#font > .shorthand(300,12px,@baseline);
color: @grayLight;
......@@ -178,6 +178,7 @@ pre {
margin: 0 0 @baseline;
line-height: @baseline;
font-size: 12px;
border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.15);
.border-radius(3px);
white-space: pre-wrap;
......
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