mirror of
https://github.com/jasny/bootstrap.git
synced 2026-04-02 03:00:44 -04:00
Port over temp responsive styles to bootstrap.less; readd buttons
This commit is contained in:
70
less/bootstrap.less
vendored
70
less/bootstrap.less
vendored
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user