mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts: bootstrap.css
This commit is contained in:
Jacob Thornton
+6
-27
@@ -93,13 +93,15 @@ input[type=file] {
|
||||
line-height: @baseLineHeight * 1.5;
|
||||
}
|
||||
|
||||
// Chrome on Linux needs background color
|
||||
// Chrome on Linux and Mobile Safari need background-color
|
||||
select {
|
||||
background-color: @white;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
// Make multiple select elements height not fixed
|
||||
select[multiple] {
|
||||
select[multiple],
|
||||
select[size] {
|
||||
height: inherit;
|
||||
}
|
||||
|
||||
@@ -218,7 +220,7 @@ textarea[readonly] {
|
||||
border-color: @borderColor;
|
||||
&:focus {
|
||||
border-color: darken(@borderColor, 10%);
|
||||
.box-shadow(0 0 6px lighten(@borderColor, 20%);
|
||||
.box-shadow(0 0 6px lighten(@borderColor, 20%));
|
||||
}
|
||||
}
|
||||
// Give a small background color for input-prepend/-append
|
||||
@@ -298,40 +300,17 @@ textarea[readonly] {
|
||||
|
||||
|
||||
|
||||
// INLINE FIELDS
|
||||
// -------------
|
||||
|
||||
.inline-inputs {
|
||||
color: @gray;
|
||||
span, input {
|
||||
display: inline-block;
|
||||
}
|
||||
input.mini {
|
||||
width: 60px;
|
||||
}
|
||||
input.small {
|
||||
width: 90px;
|
||||
}
|
||||
span {
|
||||
padding: 0 2px 0 1px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// INPUT GROUPS
|
||||
// ------------
|
||||
|
||||
// Allow us to put symbols and text within the input field for a cleaner look
|
||||
.input-prepend,
|
||||
.input-append {
|
||||
overflow: hidden;
|
||||
.clearfix(); // Clear the float to prevent wrapping
|
||||
input {
|
||||
.border-radius(0 3px 3px 0);
|
||||
}
|
||||
.add-on {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
float: left;
|
||||
display: block;
|
||||
width: auto;
|
||||
|
||||
+8
-2
@@ -25,6 +25,12 @@
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
// IE7 inline-block
|
||||
.ie7-inline-block() {
|
||||
*display: inline; /* IE7 inline-block hack */
|
||||
*zoom: 1;
|
||||
}
|
||||
|
||||
// Sizing shortcuts
|
||||
.size(@height: 5px, @width: 5px) {
|
||||
width: @width;
|
||||
@@ -48,13 +54,13 @@
|
||||
#font {
|
||||
#family {
|
||||
.serif() {
|
||||
font-family: "Georgia", Times New Roman, Times, serif;
|
||||
font-family: Georgia, "Times New Roman", Times, serif;
|
||||
}
|
||||
.sans-serif() {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
}
|
||||
.monospace() {
|
||||
font-family: "Menlo", Monaco, Courier New, monospace;
|
||||
font-family: Menlo, Monaco, Courier New, monospace;
|
||||
}
|
||||
}
|
||||
.shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
|
||||
|
||||
+2
-1
@@ -13,7 +13,8 @@
|
||||
&.fade { opacity: 0; }
|
||||
}
|
||||
|
||||
.modal-backdrop, .modal-backdrop.fade.in {
|
||||
.modal-backdrop,
|
||||
.modal-backdrop.fade.in {
|
||||
.opacity(80);
|
||||
}
|
||||
|
||||
|
||||
+7
-1
@@ -5,7 +5,8 @@
|
||||
height: @baseLineHeight * 2;
|
||||
margin: @baseLineHeight 0;
|
||||
ul {
|
||||
float: left;
|
||||
display: inline-block;
|
||||
.ie7-inline-block();
|
||||
margin: 0;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid rgba(0,0,0,.15);
|
||||
@@ -37,4 +38,9 @@
|
||||
.next a {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
// Centered
|
||||
&.centered {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
+25
-100
@@ -24,11 +24,6 @@
|
||||
}
|
||||
// Text and links
|
||||
.navbar {
|
||||
// Links get text-shadow
|
||||
a {
|
||||
color: @grayLight;
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||
}
|
||||
// Hover and active states
|
||||
.brand a:hover,
|
||||
ul .active > a {
|
||||
@@ -57,6 +52,10 @@
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
// Buttons in navbar
|
||||
.btn {
|
||||
margin-top: 5px; // make buttons vertically centered in navbar
|
||||
}
|
||||
}
|
||||
|
||||
// Navbar search
|
||||
@@ -146,7 +145,9 @@
|
||||
float: none;
|
||||
padding: 10px 10px 11px;
|
||||
line-height: 19px;
|
||||
color: @grayLight;
|
||||
text-decoration: none;
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||
&:hover {
|
||||
color: @white;
|
||||
text-decoration: none;
|
||||
@@ -213,101 +214,6 @@
|
||||
padding: 4px 15px;
|
||||
}
|
||||
|
||||
// Dropdown Menus
|
||||
// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
|
||||
.dropdown {
|
||||
position: relative;
|
||||
}
|
||||
// The link that is clicked to toggle the dropdown
|
||||
.dropdown-toggle:after {
|
||||
display: inline-block;
|
||||
width: 0;
|
||||
height: 0;
|
||||
margin-top: 8px;
|
||||
margin-left: 6px;
|
||||
text-indent: -99999px;
|
||||
vertical-align: top;
|
||||
border-left: 4px solid transparent;
|
||||
border-right: 4px solid transparent;
|
||||
border-top: 4px solid @white;
|
||||
.opacity(30);
|
||||
content: "↓";
|
||||
}
|
||||
.dropdown:hover .dropdown-toggle:after {
|
||||
.opacity(100);
|
||||
}
|
||||
// The dropdown menu (ul)
|
||||
.dropdown-menu {
|
||||
position: absolute;
|
||||
top: 40px;
|
||||
z-index: 900;
|
||||
float: left;
|
||||
display: none; // None by default, but block on "open" of the menu
|
||||
min-width: 160px;
|
||||
max-width: 220px;
|
||||
_width: 160px;
|
||||
padding: 6px 0;
|
||||
margin-left: 0; // override default ul styles
|
||||
margin-right: 0;
|
||||
background-color: @white;
|
||||
border-color: #999;
|
||||
border-color: rgba(0,0,0,.2);
|
||||
border-style: solid;
|
||||
border-width: 0 1px 1px;
|
||||
.border-radius(0 0 6px 6px);
|
||||
.box-shadow(0 2px 4px rgba(0,0,0,.2));
|
||||
.background-clip(padding-box);
|
||||
zoom: 1; // do we need this?
|
||||
|
||||
// Unfloat any li's to make them stack
|
||||
li {
|
||||
float: none;
|
||||
display: block;
|
||||
background-color: none;
|
||||
}
|
||||
// Dividers (basically an hr) within the dropdown
|
||||
.divider {
|
||||
height: 1px;
|
||||
margin: 5px 0;
|
||||
overflow: hidden;
|
||||
background-color: #eee;
|
||||
border-bottom: 1px solid @white;
|
||||
}
|
||||
}
|
||||
|
||||
.topbar .dropdown-menu, .dropdown-menu {
|
||||
// Links within the dropdown menu
|
||||
a {
|
||||
display: block;
|
||||
padding: 4px 15px;
|
||||
clear: both;
|
||||
font-weight: normal;
|
||||
line-height: 18px;
|
||||
color: @gray;
|
||||
text-shadow: 0 1px 0 @white;
|
||||
// Hover state
|
||||
&:hover {
|
||||
color: @grayDark;
|
||||
text-decoration: none;
|
||||
#gradient > .vertical(#eeeeee, #dddddd);
|
||||
@shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
|
||||
.box-shadow(@shadow);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Open state for the dropdown
|
||||
.dropdown.open {
|
||||
.dropdown-toggle {
|
||||
color: @white;
|
||||
background: #ccc;
|
||||
background: rgba(0,0,0,.3);
|
||||
}
|
||||
.dropdown-menu {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -493,6 +399,7 @@ input[type=submit].btn {
|
||||
float: left;
|
||||
margin-left: -1px;
|
||||
.border-radius(0);
|
||||
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
|
||||
&:first-child {
|
||||
margin-left: 0;
|
||||
-webkit-border-top-left-radius: 4px;
|
||||
@@ -510,6 +417,24 @@ input[type=submit].btn {
|
||||
-moz-border-radius-bottomright: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
}
|
||||
// Reset corners for large buttons
|
||||
&.large:first-child {
|
||||
margin-left: 0;
|
||||
-webkit-border-top-left-radius: 6px;
|
||||
-moz-border-radius-topleft: 6px;
|
||||
border-top-left-radius: 6px;
|
||||
-webkit-border-bottom-left-radius: 6px;
|
||||
-moz-border-radius-bottomleft: 6px;
|
||||
border-bottom-left-radius: 6px;
|
||||
}
|
||||
&.large:last-child {
|
||||
-webkit-border-top-right-radius: 6px;
|
||||
-moz-border-radius-topright: 6px;
|
||||
border-top-right-radius: 6px;
|
||||
-webkit-border-bottom-right-radius: 6px;
|
||||
-moz-border-radius-bottomright: 6px;
|
||||
border-bottom-right-radius: 6px;
|
||||
}
|
||||
}
|
||||
// On hover/focus/active, bring the proper btn to front
|
||||
.btn-group .btn:hover,
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
/*!
|
||||
* Bootstrap @VERSION for Print
|
||||
*
|
||||
* Copyright 2011 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.
|
||||
* Date: @DATE
|
||||
*/
|
||||
|
||||
|
||||
// HIDE UNECESSARY COMPONENTS
|
||||
// --------------------------
|
||||
|
||||
.navbar-fixed {
|
||||
display: none;
|
||||
}
|
||||
+13
-1
@@ -43,6 +43,18 @@
|
||||
.horizontal-form .form-actions {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
// Modals
|
||||
.modal {
|
||||
position: fixed;
|
||||
top: 20px;
|
||||
left: 20px;
|
||||
right: 20px;
|
||||
width: auto;
|
||||
.close {
|
||||
padding: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +72,7 @@
|
||||
margin-left: 0;
|
||||
}
|
||||
// Make all columns even
|
||||
[class*="span"] {
|
||||
.row > [class*="span"] {
|
||||
float: none;
|
||||
display: block;
|
||||
width: auto;
|
||||
|
||||
+1
-5
@@ -17,7 +17,7 @@ td {
|
||||
padding: 8px;
|
||||
line-height: @baseLineHeight;
|
||||
text-align: left;
|
||||
border-bottom: 1px solid #ddd;
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
th {
|
||||
font-weight: bold;
|
||||
@@ -26,10 +26,6 @@ th {
|
||||
td {
|
||||
vertical-align: top;
|
||||
}
|
||||
tbody tr:last-child th,
|
||||
tbody tr:last-child td {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
|
||||
// CONDENSED TABLE W/ HALF PADDING
|
||||
|
||||
Reference in New Issue
Block a user