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
25d0b341
Commit
25d0b341
authored
Jul 09, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wasn't feeling the new buttons, downsizing again until we get a better balance
parent
9887d3cf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
37 deletions
+49
-37
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+26
-17
less/button-groups.less
less/button-groups.less
+17
-13
less/buttons.less
less/buttons.less
+3
-3
less/dropdowns.less
less/dropdowns.less
+3
-4
No files found.
docs/assets/css/bootstrap.css
View file @
25d0b341
...
...
@@ -2498,8 +2498,8 @@ table .span24 {
.caret
{
display
:
inline-block
;
width
:
0
;
height
:
3px
;
vertical-align
:
middle
;
height
:
0
;
vertical-align
:
top
;
border-top
:
4px
solid
#000000
;
border-right
:
4px
solid
transparent
;
border-left
:
4px
solid
transparent
;
...
...
@@ -2509,6 +2509,7 @@ table .span24 {
}
.dropdown
.caret
{
margin-top
:
8px
;
margin-left
:
2px
;
}
...
...
@@ -2616,8 +2617,6 @@ table .span24 {
.dropup
.caret
,
.navbar-fixed-bottom
.dropdown
.caret
{
height
:
0
;
margin-top
:
-2px
;
border-top
:
0
;
border-bottom
:
4px
solid
#000000
;
content
:
"\2191"
;
...
...
@@ -2726,10 +2725,10 @@ button.close {
.btn
{
display
:
inline-block
;
*
display
:
inline
;
padding
:
4px
14px
4px
;
padding
:
4px
14px
;
margin-bottom
:
0
;
*
margin-left
:
.3em
;
font-size
:
1
4
px
;
font-size
:
1
3
px
;
line-height
:
20px
;
*
line-height
:
20px
;
color
:
#333333
;
...
...
@@ -3123,7 +3122,7 @@ input[type="submit"].btn.btn-mini {
.btn-group
>
.btn
,
.btn-group
>
.dropdown-menu
{
font-size
:
1
4
px
;
font-size
:
1
3
px
;
}
.btn-group
>
.btn-mini
,
...
...
@@ -3188,28 +3187,28 @@ input[type="submit"].btn.btn-mini {
}
.btn-group
>
.dropdown-toggle
{
*
padding-top
:
8
px
;
padding-right
:
10
px
;
*
padding-bottom
:
8
px
;
padding-left
:
10
px
;
*
padding-top
:
4
px
;
padding-right
:
8
px
;
*
padding-bottom
:
4
px
;
padding-left
:
8
px
;
-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
);
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
);
}
.btn-group
>
.btn-mini.dropdown-toggle
{
padding-right
:
8
px
;
padding-left
:
8
px
;
padding-right
:
5
px
;
padding-left
:
5
px
;
}
.btn-group
>
.btn-small.dropdown-toggle
{
*
padding-top
:
6
px
;
*
padding-bottom
:
6
px
;
*
padding-top
:
4
px
;
*
padding-bottom
:
4
px
;
}
.btn-group
>
.btn-large.dropdown-toggle
{
padding-right
:
1
4
px
;
padding-left
:
1
4
px
;
padding-right
:
1
2
px
;
padding-left
:
1
2
px
;
}
.btn-group.open
.dropdown-toggle
{
...
...
@@ -3248,6 +3247,7 @@ input[type="submit"].btn.btn-mini {
}
.btn
.caret
{
margin-top
:
7px
;
margin-left
:
0
;
}
...
...
@@ -3257,7 +3257,16 @@ input[type="submit"].btn.btn-mini {
filter
:
alpha
(
opacity
=
100
);
}
.btn-mini
.caret
{
margin-top
:
5px
;
}
.btn-small
.caret
{
margin-top
:
6px
;
}
.btn-large
.caret
{
margin-top
:
6px
;
border-top-width
:
5px
;
border-right-width
:
5px
;
border-left-width
:
5px
;
...
...
less/button-groups.less
View file @
25d0b341
...
...
@@ -34,16 +34,16 @@
}
.btn-group > .btn,
.btn-group > .dropdown-menu {
font-size:
@baseFontSize
; // redeclare as part 2 of font-size inline-block hack
font-size:
13px
; // redeclare as part 2 of font-size inline-block hack
}
// Reset fonts for other sizes
.btn-group > .btn-mini,
.btn-group > .btn-small {
font-size:
@baseFontSize -
2px;
font-size:
1
2px;
}
.btn-group > .btn-large {
font-size:
@baseFontSize + 2
px;
font-size:
16
px;
}
// 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
...
...
@@ -107,23 +107,23 @@
// Give the line between buttons some depth
.btn-group > .dropdown-toggle {
padding-left:
10
px;
padding-right:
10
px;
padding-left:
8
px;
padding-right:
8
px;
.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:
8
px;
*padding-bottom:
8
px;
*padding-top:
4
px;
*padding-bottom:
4
px;
}
.btn-group > .btn-mini.dropdown-toggle {
padding-left:
8
px;
padding-right:
8
px;
padding-left:
5
px;
padding-right:
5
px;
}
.btn-group > .btn-small.dropdown-toggle {
*padding-top:
6
px;
*padding-bottom:
6
px;
*padding-top:
4
px;
*padding-bottom:
4
px;
}
.btn-group > .btn-large.dropdown-toggle {
padding-left: 1
4
px;
padding-right: 1
4
px;
padding-left: 1
2
px;
padding-right: 1
2
px;
}
.btn-group.open {
...
...
@@ -162,6 +162,7 @@
// Reposition the caret
.btn .caret {
margin-top: 7px;
margin-left: 0;
}
.btn:hover .caret,
...
...
@@ -170,10 +171,13 @@
}
// Carets in other button sizes
.btn-mini .caret {
margin-top: 5px;
}
.btn-small .caret {
margin-top: 6px;
}
.btn-large .caret {
margin-top: 6px;
border-left-width: 5px;
border-right-width: 5px;
border-top-width: 5px;
...
...
less/buttons.less
View file @
25d0b341
...
...
@@ -10,10 +10,10 @@
.btn {
display: inline-block;
.ie7-inline-block();
padding: 4px 14px
4px
;
padding: 4px 14px;
margin-bottom: 0; // For input.btn
font-size:
@baseFontSize
;
line-height:
@baseLineHeight
;
font-size:
13px
;
line-height:
20px
;
*line-height: 20px;
color: @grayDark;
text-align: center;
...
...
less/dropdowns.less
View file @
25d0b341
...
...
@@ -22,8 +22,8 @@
.caret {
display: inline-block;
width: 0;
height:
3px
;
vertical-align:
middle
;
height:
0
;
vertical-align:
top
;
border-top: 4px solid @black;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
...
...
@@ -33,6 +33,7 @@
// Place the caret
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
}
.dropdown a:focus .caret,
...
...
@@ -152,8 +153,6 @@
.navbar-fixed-bottom .dropdown {
// Reverse the caret
.caret {
margin-top: -2px;
height: 0;
border-top: 0;
border-bottom: 4px solid @black;
content: "\2191";
...
...
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