rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

pre font-size increase; revert static top navbar, undo contents section for now

Browse Source
This commit is contained in:
Mark Otto 2012-08-19 23:01:24 -07:00
parent 4e979f084d
commit a667fd93ab
16 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@ -836,7 +836,7 @@ pre {
display: block;
padding: 9.5px;
margin: 0 0 10px;
font-size: 12px;
font-size: 13px;
line-height: 20px;
word-break: break-all;
word-wrap: break-word;

22
docs/assets/css/docs.css
View File

@ -12,6 +12,7 @@
body {
position: relative;
padding-top: 40px;
}
/* Code in headings */
@ -25,12 +26,12 @@ h3 code {
/* Tweak navbar brand link to be super sleek
-------------------------------------------------- */
body > .navbar-static-top {
body > .navbar {
font-size: 13px;
}
/* Change the docs' brand */
body > .navbar-static-top .brand {
body > .navbar .brand {
padding-right: 0;
padding-left: 0;
margin-left: 20px;
@ -42,7 +43,7 @@ body > .navbar-static-top .brand {
-moz-transition: all .2s linear;
transition: all .2s linear;
}
body > .navbar-static-top .brand:hover {
body > .navbar .brand:hover {
text-decoration: none;
text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4);
}
@ -100,9 +101,9 @@ hr.soften {
background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */
background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15);
-moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15);
box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15);
-webkit-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
-moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
}
.jumbotron h1 {
font-size: 80px;
@ -792,6 +793,7 @@ form.bs-docs-example {
z-index: 2;
padding: 9px 15px;
border: 0;
text-shadow: 0 1px 0 rgba(0,0,0,.15);
-webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
-moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
@ -812,10 +814,10 @@ form.bs-docs-example {
.bs-docs-sidenav .active .icon-chevron-right,
.bs-docs-sidenav .active a:hover .icon-chevron-right {
background-image: url(../img/glyphicons-halflings-white.png);
opacity: .75;
opacity: 1;
}
.bs-docs-sidenav.affix {
top: 0;
top: 40px;
}
.bs-docs-sidenav.affix-bottom {
position: absolute;
@ -872,6 +874,10 @@ form.bs-docs-example {
body {
padding-top: 0;
}
/* Widen masthead and social buttons to fill body padding */
.jumbotron {
margin-top: -20px; /* Offset bottom margin on .navbar */
}
/* Adjust sidenav width */
.bs-docs-sidenav {
width: 166px;

4
docs/assets/js/google-code-prettify/prettify.css
View File

@ -21,10 +21,10 @@
/* Specify class=linenums on a pre to get line numbering */
ol.linenums {
margin: 0 0 0 33px; /* IE indents via margin-left */
}
}
ol.linenums li {
padding-left: 12px;
color: #bebec5;
line-height: 18px;
line-height: 20px;
text-shadow: 0 1px 0 #fff;
}

18
docs/base-css.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@ -106,14 +106,6 @@
<h1>Typography</h1>
</div>
<ul>
<li><a href="./base-css.html#headings">Headings</a></li>
<li><a href="./base-css.html#body-copy">Body copy</a></li>
<li><a href="./base-css.html#emphasis">Emphasis</a></li>
</ul>
<hr>
<h2 id="headings">Headings</h2>
<p>All HTML headings, <code>&lt;h1&gt;</code> through <code>&lt;h6&gt;</code> are available.</p>
<div class="bs-docs-example">
@ -182,7 +174,7 @@
<hr class="bs-docs-separator">
<h2>Abbreviations</h2>
<h2 id="abbreviations">Abbreviations</h2>
<p>Stylized implemenation of HTML's <code>&lt;abbr&gt;</code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p>
<h3><code>&lt;abbr&gt;</code></h3>
@ -203,7 +195,7 @@
<hr class="bs-docs-separator">
<h2>Addresses</h2>
<h2 id="addresses">Addresses</h2>
<p>Present contact information for the nearest ancestor or the entire body of work.</p>
<h3><code>&lt;address&gt;</code></h3>
@ -238,7 +230,7 @@
<hr class="bs-docs-separator">
<h2>Blockquotes</h2>
<h2 id="blockquotes">Blockquotes</h2>
<p>For quoting blocks of content from another source within your document.</p>
<h3>Default blockqoute</h3>
@ -291,7 +283,7 @@
<!-- Lists -->
<h2>Lists</h2>
<h2 id="lists">Lists</h2>
<h3>Unordered</h3>
<p>A list of items in which the order does <em>not</em> explicitly matter.</p>

2
docs/components.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

2
docs/customize.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

2
docs/extend.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

7
docs/getting-started.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@ -128,6 +128,7 @@
<div class="page-header">
<h1>2. File structure</h1>
</div>
<p class="lead">Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.</p>
<p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p>
<pre class="prettyprint">
bootstrap/
@ -153,7 +154,7 @@
<div class="page-header">
<h1>3. What's included</h1>
</div>
<p>Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.</p>
<p class="lead">Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.</p>
<h2>Docs sections</h2>
<h4><a href="http://twitter.github.com/bootstrap/scaffolding.html">Scaffolding</a></h4>
@ -197,7 +198,7 @@
<div class="page-header">
<h1>4. Basic HTML template</h1>
</div>
<p>With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p>
<p class="lead">With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p>
<p>Now, here's a look at a <strong>typical HTML file</strong>:</p>
<pre class="prettyprint linenums">
&lt;html&gt;

2
docs/index.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

2
docs/javascript.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

4
docs/scaffolding.html
View File

@ -31,7 +31,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@ -100,7 +100,7 @@
================================================== -->
<section id="global">
<div class="page-header">
<h1>Global styles</h1>
<h1>Global settings</h1>
</div>
<h3>Requires HTML5 doctype</h3>

2
docs/templates/layout.mustache vendored
View File

@ -43,7 +43,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

16
docs/templates/pages/base-css.mustache vendored
View File

@ -35,14 +35,6 @@
<h1>{{_i}}Typography{{/i}}</h1>
</div>
<ul>
<li><a href="./base-css.html#headings">Headings</a></li>
<li><a href="./base-css.html#body-copy">Body copy</a></li>
<li><a href="./base-css.html#emphasis">Emphasis</a></li>
</ul>
<hr>
{{! Headings }}
<h2 id="headings">{{_i}}Headings{{/i}}</h2>
<p>{{_i}}All HTML headings, <code>&lt;h1&gt;</code> through <code>&lt;h6&gt;</code> are available.{{/i}}</p>
@ -117,7 +109,7 @@
{{! Abbreviations }}
<h2>{{_i}}Abbreviations{{/i}}</h2>
<h2 id="abbreviations">{{_i}}Abbreviations{{/i}}</h2>
<p>{{_i}}Stylized implemenation of HTML's <code>&lt;abbr&gt;</code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p>
<h3><code>&lt;abbr&gt;</code></h3>
@ -139,7 +131,7 @@
{{! Addresses }}
<h2>{{_i}}Addresses{{/i}}</h2>
<h2 id="addresses">{{_i}}Addresses{{/i}}</h2>
<p>{{_i}}Present contact information for the nearest ancestor or the entire body of work.{{/i}}</p>
<h3><code>&lt;address&gt;</code></h3>
@ -175,7 +167,7 @@
{{! Blockquotes }}
<h2>{{_i}}Blockquotes{{/i}}</h2>
<h2 id="blockquotes">{{_i}}Blockquotes{{/i}}</h2>
<p>{{_i}}For quoting blocks of content from another source within your document.{{/i}}</p>
<h3>{{_i}}Default blockqoute{{/i}}</h3>
@ -228,7 +220,7 @@
<!-- Lists -->
<h2>{{_i}}Lists{{/i}}</h2>
<h2 id="lists">{{_i}}Lists{{/i}}</h2>
<h3>{{_i}}Unordered{{/i}}</h3>
<p>{{_i}}A list of items in which the order does <em>not</em> explicitly matter.{{/i}}</p>

5
docs/templates/pages/getting-started.mustache vendored
View File

@ -57,6 +57,7 @@
<div class="page-header">
<h1>{{_i}}2. File structure{{/i}}</h1>
</div>
<p class="lead">{{_i}}Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.{{/i}}</p>
<p>{{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}</p>
<pre class="prettyprint">
bootstrap/
@ -82,7 +83,7 @@
<div class="page-header">
<h1>{{_i}}3. What's included{{/i}}</h1>
</div>
<p>{{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.{{/i}}</p>
<p class="lead">{{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.{{/i}}</p>
<h2>{{_i}}Docs sections{{/i}}</h2>
<h4><a href="http://twitter.github.com/bootstrap/scaffolding.html">{{_i}}Scaffolding{{/i}}</a></h4>
@ -126,7 +127,7 @@
<div class="page-header">
<h1>{{_i}}4. Basic HTML template{{/i}}</h1>
</div>
<p>{{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p>
<p class="lead">{{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p>
<p>{{_i}}Now, here's a look at a <strong>typical HTML file</strong>:{{/i}}</p>
<pre class="prettyprint linenums">
&lt;html&gt;

2
docs/templates/pages/scaffolding.mustache vendored
View File

@ -29,7 +29,7 @@
================================================== -->
<section id="global">
<div class="page-header">
<h1>{{_i}}Global styles{{/i}}</h1>
<h1>{{_i}}Global settings{{/i}}</h1>
</div>
<h3>{{_i}}Requires HTML5 doctype{{/i}}</h3>

2
less/code.less
View File

@ -26,7 +26,7 @@ pre {
display: block;
padding: (@baseLineHeight - 1) / 2;
margin: 0 0 @baseLineHeight / 2;
font-size: @baseFontSize - 2; // 14px to 12px
font-size: @baseFontSize - 1; // 14px to 13px
line-height: @baseLineHeight;
word-break: break-all;
word-wrap: break-word;