diff --git a/source/_includes/examples/bordered-pulled.html b/source/_includes/examples/bordered-pulled.html index bc703b24a..b5aa2bf17 100644 --- a/source/_includes/examples/bordered-pulled.html +++ b/source/_includes/examples/bordered-pulled.html @@ -18,7 +18,7 @@ Use a few of the new styles together ... lots of new possibilities. {% endhighlight %} -
+
Use a few of the new styles together, and you've got easy pull quotes or a great introductory article image. Or spinning icons for loading and refreshing content. Or fun big icons in multi-line buttons. You can combine all diff --git a/source/_includes/license.html b/source/_includes/license.html index 06ee35f5f..192e7c2e6 100644 --- a/source/_includes/license.html +++ b/source/_includes/license.html @@ -8,7 +8,7 @@
- Attribution is no longer required as of Font Awesome 3.0 but is much appreciated: + Attribution is no longer required as of Font Awesome 3.0 but is much appreciated:
Font Awesome by Dave Gandy - http://fontawesome.io.
diff --git a/source/assets/less/responsive-1200px-min.less b/source/assets/less/responsive-1200px-min.less new file mode 100755 index 000000000..6599595c1 --- /dev/null +++ b/source/assets/less/responsive-1200px-min.less @@ -0,0 +1,56 @@ +// +// Responsive: Large desktop and up +// -------------------------------------------------- + + +@media (min-width: 1200px) { + + #iconCarousel { + @size: 290px; + font-size: @size; + line-height: @size + 5; + .carousel-control { + top: @size + 20px; + .square(30px); + font-size: 40px; + line-height: 35px; + left: 370/2 - 40px; + &.right { + right: 370/2 - 40px; + } + } + } + + .jumbotron-index { + padding: 50px 0; + h1 { font-size: 100px; } + p { + font-size: 40px; + margin: 20px 0; + } + .btn-large { + font-size: 30px; + padding: 21px 35px; + } + .shameless-self-promotion { + margin-top: 30px; + } + } + + .jumbotron-ad { + padding: 50px 0; + h1 { font-size: 90px; } + p { + font-size: 35px; + margin: 20px 0; + } + } + + .stripe-ad .lead { margin-top: 7px; } + + .lead { + font-size: 26px; + line-height: 36px; + } + +} diff --git a/source/assets/less/responsive-767px-max.less b/source/assets/less/responsive-767px-max.less new file mode 100755 index 000000000..28f14f2af --- /dev/null +++ b/source/assets/less/responsive-767px-max.less @@ -0,0 +1,9 @@ +// +// Responsive: Landscape phone to desktop/tablet +// -------------------------------------------------- + + +@media (max-width: 767px) { + + +} diff --git a/source/assets/less/responsive-768px-979px.less b/source/assets/less/responsive-768px-979px.less new file mode 100755 index 000000000..fcf5908ed --- /dev/null +++ b/source/assets/less/responsive-768px-979px.less @@ -0,0 +1,9 @@ +// +// Responsive: Tablet to desktop +// -------------------------------------------------- + + +@media (min-width: 768px) and (max-width: 979px) { + + +} diff --git a/source/assets/less/responsive-navbar.less b/source/assets/less/responsive-navbar.less new file mode 100755 index 000000000..b15033ed9 --- /dev/null +++ b/source/assets/less/responsive-navbar.less @@ -0,0 +1,11 @@ +// +// Responsive: Navbar +// -------------------------------------------------- + + +// TABLETS AND BELOW +// ----------------- +@media (max-width: @navbarCollapseWidth) { + + +} diff --git a/source/assets/less/responsive.less b/source/assets/less/responsive.less new file mode 100755 index 000000000..1838f2161 --- /dev/null +++ b/source/assets/less/responsive.less @@ -0,0 +1,55 @@ +--- +--- +/*! + * Bootstrap Responsive v2.3.2 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + + +// Responsive.less +// For phone and tablet devices +// ------------------------------------------------------------- + + +// REPEAT VARIABLES & MIXINS +// ------------------------- +// Required since we compile the responsive stuff separately + +@import "bootstrap-{{ site.bootstrap.version }}/variables.less"; // Modify this for custom colors, font-sizes, etc +@import "bootstrap-{{ site.bootstrap.version }}/mixins.less"; + +@import "variables.less"; // Modify this for custom colors, font-sizes, etc + +// RESPONSIVE CLASSES +// ------------------ + +@import "bootstrap-{{ site.bootstrap.version }}/responsive-utilities.less"; + + +// MEDIA QUERIES +// ------------------ + +// Large desktops +@import "bootstrap-{{ site.bootstrap.version }}/responsive-1200px-min.less"; +@import "responsive-1200px-min.less"; + +// Tablets to regular desktops +@import "bootstrap-{{ site.bootstrap.version }}/responsive-768px-979px.less"; +@import "responsive-768px-979px.less"; + +// Phones to portrait tablets and narrow desktops +@import "bootstrap-{{ site.bootstrap.version }}/responsive-767px-max.less"; +@import "responsive-767px-max.less"; + + +// RESPONSIVE NAVBAR +// ------------------ + +// From 979px and below, show a button to toggle navbar contents +@import "bootstrap-{{ site.bootstrap.version }}/responsive-navbar.less"; +@import "responsive-navbar.less"; diff --git a/source/assets/less/site.less b/source/assets/less/site.less index 0a8522baf..458cf1c2b 100644 --- a/source/assets/less/site.less +++ b/source/assets/less/site.less @@ -347,3 +347,5 @@ footer { &.dropdown-split-right > a { padding-left: 7px; } &.dropdown-split-left > a { padding-right: 0; } } + +@import "responsive.less";