aboutsummaryrefslogtreecommitdiff
path: root/less/bootstrap.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-16 10:52:33 -0800
committerMark Otto <[email protected]>2013-01-16 10:52:33 -0800
commit8fd26040d80f72e357692d257e80526bf2c36427 (patch)
tree11bd285e3c2c433a6e162512f5ec904809f9aee3 /less/bootstrap.less
parent5a3cb0d778b22db3ecd412dd2c6367d09a356c6d (diff)
downloadbootstrap-8fd26040d80f72e357692d257e80526bf2c36427.tar.xz
bootstrap-8fd26040d80f72e357692d257e80526bf2c36427.zip
Port over temp responsive styles to bootstrap.less; readd buttons
Diffstat (limited to 'less/bootstrap.less')
-rw-r--r--less/bootstrap.less70
1 files changed, 70 insertions, 0 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less
index 8e60e41c0..207118746 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -21,6 +21,8 @@
@import "code.less";
@import "grid.less";
+@import "buttons.less";
+
// Components: common
@import "component-animations.less";
@@ -29,6 +31,74 @@
@import "navbar.less";
+// Responsive: Tablets and up
+@media screen and (min-width: 768px) {
+
+ [class^="span"] {
+ float: left;
+ }
+ .span1 { width: 8.3333333%; }
+ .span2 { width: 16.6666667%; }
+ .span3 { width: 25%; }
+ .span4 { width: 33.3333333%; }
+ .span5 { width: 41.666666667%; }
+ .span6 { width: 50%; }
+ .span7 { width: 58.333333333%; }
+ .span8 { width: 66.666666667%; }
+ .span9 { width: 75%; }
+ .span10 { width: 83.333333333%; }
+ .span11 { width: 91.666666667%; }
+
+}
+
+// Responsive: Desktops and up
+@media screen and (min-width: 992px) {
+
+/* body {
+ font-size: 1.6rem;
+ font-size: 16px;
+ }
+*/
+ .container {
+ width: 940px;
+ margin-left: auto;
+ margin-right: auto;
+ }
+
+ .navbar {
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+ .navbar .brand {
+ float: left;
+ padding-top: 11px;
+ padding-bottom: 11px;
+ margin-left: -15px;
+ }
+ .navbar .nav {
+ overflow: hidden; /* clearfix */
+ margin-top: 0; /* undo top margin to make nav extend full height of navbar */
+ }
+ .navbar .nav > li {
+ float: left;
+ }
+ .navbar .nav > li > a {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ }
+
+ /* Required to make the collapsing navbar work on regular desktops */
+ .navbar .btn-navbar {
+ display: none;
+ }
+ .nav-collapse.collapse {
+ float: left;
+ height: auto !important;
+ overflow: visible !important;
+ }
+
+}
+
/*
// Grid system and page structure
@import "grid.less";