Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
fc871a48
Commit
fc871a48
authored
Apr 24, 2012
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
parents
73453c7f
1c2db11d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
11 deletions
+27
-11
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+12
-5
less/accordion.less
less/accordion.less
+5
-0
less/button-groups.less
less/button-groups.less
+3
-4
less/buttons.less
less/buttons.less
+5
-0
less/forms.less
less/forms.less
+1
-1
less/variables.less
less/variables.less
+1
-1
No files found.
docs/assets/css/bootstrap.css
View file @
fc871a48
...
...
@@ -873,8 +873,8 @@ input[type="hidden"] {
.radio
,
.checkbox
{
min-height
:
18px
;
padding-left
:
18px
;
overflow
:
auto
;
}
.radio
input
[
type
=
"radio"
],
...
...
@@ -2694,6 +2694,11 @@ button.close {
color
:
rgba
(
255
,
255
,
255
,
0.75
);
}
.btn
{
border-color
:
#ccc
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.25
);
}
.btn-primary
{
background-color
:
#0074cc
;
*
background-color
:
#0055cc
;
...
...
@@ -3003,9 +3008,9 @@ input[type="submit"].btn.btn-mini {
}
.btn-group
>
.dropdown-toggle
{
*
padding-top
:
3
px
;
*
padding-top
:
4
px
;
padding-right
:
8px
;
*
padding-bottom
:
3
px
;
*
padding-bottom
:
4
px
;
padding-left
:
8px
;
-webkit-box-shadow
:
inset
1px
0
0
rgba
(
255
,
255
,
255
,
0.125
),
inset
0
1px
0
rgba
(
255
,
255
,
255
,
0.2
),
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);
-moz-box-shadow
:
inset
1px
0
0
rgba
(
255
,
255
,
255
,
0.125
),
inset
0
1px
0
rgba
(
255
,
255
,
255
,
0.2
),
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);
...
...
@@ -3013,9 +3018,7 @@ input[type="submit"].btn.btn-mini {
}
.btn-group
>
.btn-mini.dropdown-toggle
{
*
padding-top
:
1px
;
padding-right
:
5px
;
*
padding-bottom
:
1px
;
padding-left
:
5px
;
}
...
...
@@ -4773,6 +4776,10 @@ a.badge:hover {
padding
:
8px
15px
;
}
.accordion-toggle
{
cursor
:
pointer
;
}
.accordion-inner
{
padding
:
9px
15px
;
border-top
:
1px
solid
#e5e5e5
;
...
...
less/accordion.less
View file @
fc871a48
...
...
@@ -21,6 +21,11 @@
padding: 8px 15px;
}
// General toggle styles
.accordion-toggle {
cursor: pointer;
}
// Inner needs the styles because you can't animate properly with any styles on the element
.accordion-inner {
padding: 9px 15px;
...
...
less/button-groups.less
View file @
fc871a48
...
...
@@ -41,6 +41,7 @@
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
}
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
.btn-group > .btn:last-child,
.btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px;
...
...
@@ -94,14 +95,12 @@
padding-left: 8px;
padding-right: 8px;
.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
*padding-top:
3
px;
*padding-bottom:
3
px;
*padding-top:
4
px;
*padding-bottom:
4
px;
}
.btn-group > .btn-mini.dropdown-toggle {
padding-left: 5px;
padding-right: 5px;
*padding-top: 1px;
*padding-bottom: 1px;
}
.btn-group > .btn-small.dropdown-toggle {
*padding-top: 4px;
...
...
less/buttons.less
View file @
fc871a48
...
...
@@ -131,6 +131,11 @@
// Set the backgrounds
// -------------------------
.btn {
// reset here as of 2.0.3 due to Recess property order
border-color: #ccc;
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
}
.btn-primary {
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
}
...
...
less/forms.less
View file @
fc871a48
...
...
@@ -173,8 +173,8 @@ input[type="hidden"] {
// Indent the labels to position radios/checkboxes as hanging
.radio,
.checkbox {
min-height: 18px; // clear the floating input if there is no label text
padding-left: 18px;
overflow: auto; // clear the floating input if there is no label text
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
...
...
less/variables.less
View file @
fc871a48
...
...
@@ -71,7 +71,7 @@
// -------------------------
@btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%);
@btnBorder:
darken(@white, 20%)
;
@btnBorder:
#ccc
;
@btnPrimaryBackground: @linkColor;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment