Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2d55bf1

Browse files
committedJan 18, 2013
Ported missing styling.
1 parent ca24610 commit 2d55bf1

File tree

3 files changed

+379
-72
lines changed

3 files changed

+379
-72
lines changed
 

Diff for: ‎docs/assets/css/bootstrap.css

+203-40
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ textarea {
215215
.input-block-level {
216216
display: block;
217217
width: 100%;
218-
min-height: 24px;
218+
min-height: 21px;
219219
-webkit-box-sizing: border-box;
220220
-moz-box-sizing: border-box;
221221
box-sizing: border-box;
@@ -407,7 +407,7 @@ a:hover {
407407
display: block;
408408
float: left;
409409
width: 100%;
410-
min-height: 24px;
410+
min-height: 21px;
411411
margin-left: 2.127659574468085%;
412412
*margin-left: 2.074468085106383%;
413413
-webkit-box-sizing: border-box;
@@ -1166,13 +1166,13 @@ input[type="checkbox"] {
11661166

11671167
select,
11681168
input[type="file"] {
1169-
height: 24px;
1169+
height: 21px;
11701170
/* In IE7, the height of the select element cannot be changed by height, only font-size */
11711171

11721172
*margin-top: 4px;
11731173
/* For IE7, add top margin to align select with labels */
11741174

1175-
line-height: 24px;
1175+
line-height: 21px;
11761176
}
11771177

11781178
select {
@@ -6138,16 +6138,19 @@ h6 {
61386138
}
61396139

61406140
code {
6141+
font-size: 10px;
61416142
color: #3b6e22;
61426143
}
61436144

61446145
pre {
6146+
font-size: 12px;
61456147
background-color: #f2f2f2;
61466148
}
61476149

61486150
label,
61496151
input,
61506152
select,
6153+
button,
61516154
textarea {
61526155
font-family: "lucida grande", tahoma, verdana, arial, sans-serif;
61536156
font-size: 11px;
@@ -6160,16 +6163,33 @@ label {
61606163
color: #666666;
61616164
}
61626165

6163-
input,
61646166
textarea,
6165-
select,
6167+
input[type="text"],
6168+
input[type="password"],
6169+
input[type="datetime"],
6170+
input[type="datetime-local"],
6171+
input[type="date"],
6172+
input[type="month"],
6173+
input[type="time"],
6174+
input[type="week"],
6175+
input[type="number"],
6176+
input[type="email"],
6177+
input[type="url"],
6178+
input[type="search"],
6179+
input[type="tel"],
6180+
input[type="color"],
61666181
.uneditable-input {
61676182
border: 1px solid #d4dae8;
61686183
-webkit-border-radius: 0;
61696184
-moz-border-radius: 0;
61706185
border-radius: 0;
61716186
}
61726187

6188+
input[type="radio"],
6189+
input[type="checkbox"] {
6190+
margin: 3px 0 0 0;
6191+
}
6192+
61736193
select {
61746194
padding: 2px;
61756195
}
@@ -6512,24 +6532,52 @@ textarea[readonly] {
65126532
border-radius: 0 0 0 0px;
65136533
}
65146534

6515-
.input-append input {
6516-
-webkit-border-radius: 0 0 0 0px;
6517-
-moz-border-radius: 0 0 0 0px;
6518-
border-radius: 0 0 0 0px;
6535+
.input-prepend .btn,
6536+
.input-append .btn {
6537+
margin-left: auto;
65196538
}
65206539

6521-
.input-append .add-on {
6522-
-webkit-border-radius: 0 0 0px 0;
6523-
-moz-border-radius: 0 0 0px 0;
6524-
border-radius: 0 0 0px 0;
6540+
.input-prepend .btn:last-child,
6541+
.input-append .btn:last-child,
6542+
.input-prepend .btn:first-child,
6543+
.input-append .btn:first-child {
6544+
-webkit-border-radius: 0;
6545+
-moz-border-radius: 0;
6546+
border-radius: 0;
6547+
}
6548+
6549+
.input-prepend .btn-group:first-child > .dropdown-toggle,
6550+
.input-append .btn-group:first-child > .dropdown-toggle,
6551+
.input-prepend .btn-group:last-child > .dropdown-toggle,
6552+
.input-append .btn-group:last-child > .dropdown-toggle {
6553+
-webkit-border-radius: 0;
6554+
-moz-border-radius: 0;
6555+
border-radius: 0;
65256556
}
65266557

6527-
.inputs-list label {
6558+
.input-prepend.input-append .btn:first-child,
6559+
.input-prepend.input-append .btn:last-child {
6560+
margin-right: auto;
6561+
}
6562+
6563+
.input-prepend.input-append input + .btn-group .btn,
6564+
.input-prepend.input-append select + .btn-group .btn {
6565+
-webkit-border-radius: 0;
6566+
-moz-border-radius: 0;
6567+
border-radius: 0;
6568+
}
6569+
6570+
label.checkbox,
6571+
label.radio {
6572+
font-weight: normal;
6573+
}
6574+
6575+
.controls label {
65286576
font-weight: normal;
65296577
line-height: 18px;
65306578
}
65316579

6532-
.inputs-list label strong {
6580+
.controls label strong {
65336581
color: #333333;
65346582
}
65356583

@@ -6552,11 +6600,18 @@ textarea[readonly] {
65526600
background-color: #627aad !important;
65536601
}
65546602

6555-
.nav a.menu:hover,
65566603
.nav li.open .dropdown-menu {
65576604
background: #3b5998;
65586605
}
65596606

6607+
.nav .dropdown-toggle .caret {
6608+
margin-top: 8px;
6609+
}
6610+
6611+
.nav .dropdown-toggle .caret:hover {
6612+
color: #ffffff;
6613+
}
6614+
65606615
.nav .dropdown-menu {
65616616
background-color: #3b5998;
65626617
}
@@ -6575,42 +6630,64 @@ textarea[readonly] {
65756630
border-color: #627aad;
65766631
}
65776632

6578-
.nav-tabs > li > a {
6579-
line-height: 21px;
6580-
-webkit-border-radius: 2px 2px 0 0;
6581-
-moz-border-radius: 2px 2px 0 0;
6582-
border-radius: 2px 2px 0 0;
6633+
.navbar .nav > li > a,
6634+
.navbar-inverse .nav > li > a {
6635+
color: #ffffff;
6636+
text-shadow: none;
65836637
}
65846638

6585-
.nav-pills a {
6586-
padding: 0 10px;
6587-
margin: 3px 3px 3px 0;
6588-
line-height: 20px;
6589-
-webkit-border-radius: 15px;
6590-
-moz-border-radius: 15px;
6591-
border-radius: 15px;
6639+
.navbar .nav > li > a:hover,
6640+
.navbar-inverse .nav > li > a:hover {
6641+
color: #ffffff;
65926642
}
65936643

6594-
.navbar .nav > li > a,
6595-
.navbar-inverse .nav > li > a {
6644+
.navbar .nav .divider-vertical,
6645+
.navbar-inverse .nav .divider-vertical {
6646+
border-color: #3b5998;
6647+
}
6648+
6649+
.navbar .nav > .active > a,
6650+
.navbar-inverse .nav > .active > a {
65966651
color: #ffffff;
65976652
}
65986653

6599-
.navbar .nav > li .dropdown-menu,
6600-
.navbar-inverse .nav > li .dropdown-menu {
6654+
.navbar .nav .dropdown-menu,
6655+
.navbar-inverse .nav .dropdown-menu,
6656+
.navbar .nav > li > .dropdown-menu,
6657+
.navbar-inverse .nav > li > .dropdown-menu {
66016658
border-color: #627aad;
66026659
border-top-width: 0;
66036660
}
66046661

6605-
.navbar .nav > li .dropdown-menu::before,
6606-
.navbar-inverse .nav > li .dropdown-menu::before,
6607-
.navbar .nav > li .dropdown-menu::after,
6608-
.navbar-inverse .nav > li .dropdown-menu::after {
6662+
.navbar .nav .dropdown-menu::before,
6663+
.navbar-inverse .nav .dropdown-menu::before,
6664+
.navbar .nav > li > .dropdown-menu::before,
6665+
.navbar-inverse .nav > li > .dropdown-menu::before,
6666+
.navbar .nav .dropdown-menu::after,
6667+
.navbar-inverse .nav .dropdown-menu::after,
6668+
.navbar .nav > li > .dropdown-menu::after,
6669+
.navbar-inverse .nav > li > .dropdown-menu::after {
66096670
display: none;
66106671
}
66116672

6612-
.navbar .nav > li.dropdown.open > .dropdown-toggle,
6613-
.navbar-inverse .nav > li.dropdown.open > .dropdown-toggle {
6673+
.navbar .nav li.dropdown .dropdown-toggle .caret,
6674+
.navbar-inverse .nav li.dropdown .dropdown-toggle .caret,
6675+
.navbar .nav.dropdown .dropdown-toggle .caret,
6676+
.navbar-inverse .nav.dropdown .dropdown-toggle .caret,
6677+
.navbar .nav li.dropdown .dropdown-toggle:hover .caret,
6678+
.navbar-inverse .nav li.dropdown .dropdown-toggle:hover .caret,
6679+
.navbar .nav.dropdown .dropdown-toggle:hover .caret,
6680+
.navbar-inverse .nav.dropdown .dropdown-toggle:hover .caret {
6681+
margin-top: 6px;
6682+
border-top-color: #ffffff;
6683+
border-bottom-color: #ffffff;
6684+
}
6685+
6686+
.navbar .nav li.dropdown.open > .dropdown-toggle,
6687+
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
6688+
.navbar .nav.dropdown.open > .dropdown-toggle,
6689+
.navbar-inverse .nav.dropdown.open > .dropdown-toggle {
6690+
color: #ffffff;
66146691
background: #3b5998;
66156692
}
66166693

@@ -6625,6 +6702,7 @@ textarea[readonly] {
66256702
margin: 4px 0 0 -20px;
66266703
line-height: 1;
66276704
color: #ffffff;
6705+
text-shadow: none;
66286706
}
66296707

66306708
.navbar .brand:hover,
@@ -6637,13 +6715,17 @@ textarea[readonly] {
66376715
line-height: 38px;
66386716
}
66396717

6718+
.navbar-inverse .navbar-search .search-query {
6719+
background: #e2e2e2;
6720+
}
6721+
66406722
.nav-header {
66416723
text-shadow: none;
66426724
}
66436725

66446726
.dropdown-menu {
6727+
margin-top: 0;
66456728
border-width: 1px 1px 1px;
6646-
xtop: 36px;
66476729
}
66486730

66496731
.dropdown-menu li > a {
@@ -6658,6 +6740,87 @@ textarea[readonly] {
66586740
background-image: none;
66596741
}
66606742

6743+
.nav-tabs > li > a {
6744+
line-height: 21px;
6745+
-webkit-border-radius: 2px 2px 0 0;
6746+
-moz-border-radius: 2px 2px 0 0;
6747+
border-radius: 2px 2px 0 0;
6748+
}
6749+
6750+
.nav-tabs .active > a {
6751+
color: #627aad;
6752+
background-color: #ffffff !important;
6753+
}
6754+
6755+
.nav-tabs .active > a:hover {
6756+
color: #ffffff;
6757+
}
6758+
6759+
.nav-stacked .active > a {
6760+
color: #ffffff;
6761+
background-color: #627aad !important;
6762+
}
6763+
6764+
.nav-stacked .active > a:hover {
6765+
color: #ffffff;
6766+
}
6767+
6768+
.nav-pills a {
6769+
padding: 0 10px;
6770+
margin: 3px 3px 3px 0;
6771+
}
6772+
6773+
.nav-pills > li > a {
6774+
line-height: 21px;
6775+
-webkit-border-radius: 15px;
6776+
-moz-border-radius: 15px;
6777+
border-radius: 15px;
6778+
}
6779+
6780+
.nav-pills .active > a {
6781+
color: #ffffff;
6782+
}
6783+
6784+
.nav-tabs > li > a,
6785+
.nav-pills > li > a {
6786+
padding: 0 15px;
6787+
}
6788+
6789+
.nav-tabs li.open .dropdown-menu,
6790+
.nav-pills li.open .dropdown-menu {
6791+
background: #ffffff;
6792+
}
6793+
6794+
.nav-tabs li.open .dropdown-menu li a,
6795+
.nav-pills li.open .dropdown-menu li a {
6796+
color: #627aad;
6797+
}
6798+
6799+
.nav-tabs li.open .dropdown-menu li a:hover,
6800+
.nav-pills li.open .dropdown-menu li a:hover {
6801+
color: #ffffff;
6802+
}
6803+
6804+
.nav-tabs li.open .dropdown-menu .divider,
6805+
.nav-pills li.open .dropdown-menu .divider {
6806+
background-color: #e5e5e5;
6807+
border-color: #e5e5e5;
6808+
}
6809+
6810+
.nav-list > li > a,
6811+
.nav-list .nav-header {
6812+
margin-right: -26px;
6813+
margin-left: -15px;
6814+
}
6815+
6816+
.nav-list > li > a {
6817+
padding: 3px 20px;
6818+
}
6819+
6820+
.nav-list .nav-header {
6821+
padding: 0 10px;
6822+
}
6823+
66616824
.dropdown.open .dropdown-toggle {
66626825
background: #627aad;
66636826
}

Diff for: ‎less/fbootstrapp-variables.less

+1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222

2323
@baseFontSize: 11px;
2424
@baseLineHeight: 14px;
25+
@inputHeight: @baseLineHeight + 7px;
2526

2627
@navbarHeight: 38px;
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Please sign in to comment.