rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'v4' of github.com:twbs/derpstrap into v4

Browse Source
This commit is contained in:
Thomas McDonald 2015-08-12 19:49:21 -07:00
commit a7e36a1f1b
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/content/typography.md
View File

@ -179,7 +179,7 @@ For quoting blocks of content from another source within your document. Wrap `<b
Add a `<footer>` for identifying the source. Wrap the name of the source work in `<cite>`.
{% example html %}
<blockquote>
<blockquote class="blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
<footer>Someone famous in <cite title="Source Title">Source Title</cite></footer>
</blockquote>
@ -190,7 +190,7 @@ Add a `<footer>` for identifying the source. Wrap the name of the source work in
Add `.blockquote-reverse` for a blockquote with right-aligned content.
{% example html %}
<blockquote class="blockquote-reverse">
<blockquote class="blockquote blockquote-reverse">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
<footer>Someone famous in <cite title="Source Title">Source Title</cite></footer>
</blockquote>

8
docs/index.html
View File

@ -28,7 +28,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<h4>Managed dependencies</h4>
<p>Include Bootstrap's source Sass and JavaScript files via Bower, Composer, Meteor, or npm. Package managed installs don't include documentation, but do include our Gruntfile and readme.</p>
<p>
<a class="btn btn-primary" href="">View install methods</a>
<a class="btn btn-bs btn-outline" href="">View install methods</a>
</p>
</div>
<!-- <div class="col-sm-4">
@ -51,7 +51,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<hr class="half-rule">
<p class="lead">More customized builds of Bootstrap's CSS and JS are also available.</p>
<a href="{{ site.baseurl }}/getting-started/download" class="btn btn-outline btn-lg">More download options</a>
<a href="{{ site.baseurl }}/getting-started/download" class="btn btn-bs btn-outline btn-lg">More download options</a>
</div>
</div>
@ -83,7 +83,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<hr class="half-rule">
<p class="lead">Bootstrap is open source. It's hosted, developed, and maintained on GitHub.</p>
<a href="{{ site.repo }}" class="btn btn-outline btn-lg">View the GitHub project</a>
<a href="{{ site.repo }}" class="btn btn-bs btn-outline btn-lg">View the GitHub project</a>
</div>
</div>
@ -107,6 +107,6 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<hr class="half-rule">
<p class="lead">We showcase dozens of inspiring projects built with Bootstrap on the Bootstrap Expo.</p>
<a href="{{ site.expo }}" class="btn btn-outline btn-lg">Explore the Expo</a>
<a href="{{ site.expo }}" class="btn btn-bs btn-outline btn-lg">Explore the Expo</a>
</div>
</div>

4
scss/_variables.scss
View File

@ -14,6 +14,8 @@
// Grid breakpoints
// Grid containers
// Grid columns
// Fonts
// Components
// Colors
@ -53,6 +55,7 @@ $enable-hover-media-query: false !default;
$spacer: 1rem !default;
$spacer-x: $spacer !default;
$spacer-y: $spacer !default;
$border-width: .0625rem !default;
// Body
@ -152,7 +155,6 @@ $headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
$headings-color: inherit !default;
$border-width: .0625rem !default;
// Components