Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
3426877c
Commit
3426877c
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
add ie7 inline block mixin and add ability to center pagination
parent
fec02f50
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
bootstrap.css
+9
-2
bootstrap.css
bootstrap.min.css
+2
-1
bootstrap.min.css
lib/mixins.less
+6
-0
lib/mixins.less
lib/pagination.less
+7
-1
lib/pagination.less
with
24 additions
and
4 deletions
+24
-4
bootstrap.css
+
9
-
2
View file @
3426877c
...
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Dec 27 15:
23
:07 CST 2011
* Date: Tue Dec 27 15:
49
:07 CST 2011
*/
html
,
body
{
margin
:
0
;
...
...
@@ -2211,7 +2211,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
margin
:
18px
0
;
}
.pagination
ul
{
float
:
left
;
display
:
inline-block
;
*
display
:
inline
;
/* IE7 inline-block hack */
*
zoom
:
1
;
margin
:
0
;
border
:
1px
solid
#ddd
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.15
);
...
...
@@ -2247,6 +2251,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.pagination
.next
a
{
border
:
0
;
}
.pagination.centered
{
text-align
:
center
;
}
.modal-backdrop
{
position
:
fixed
;
top
:
0
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
2
-
1
View file @
3426877c
...
...
@@ -292,12 +292,13 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.breadcrumb
{
padding
:
7px
14px
;
margin
:
0
0
18px
;
background-color
:
#f5f5f5
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#ffffff
),
to
(
#f5f5f5
));
background-image
:
-moz-linear-gradient
(
top
,
#ffffff
,
#f5f5f5
);
background-image
:
-ms-linear-gradient
(
top
,
#ffffff
,
#f5f5f5
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#ffffff
),
color-stop
(
100%
,
#f5f5f5
));
background-image
:
-webkit-linear-gradient
(
top
,
#ffffff
,
#f5f5f5
);
background-image
:
-o-linear-gradient
(
top
,
#ffffff
,
#f5f5f5
);
background-image
:
linear-gradient
(
top
,
#ffffff
,
#f5f5f5
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ffffff'
,
endColorstr
=
'#f5f5f5'
,
GradientType
=
0
);
border
:
1px
solid
#ddd
;
-webkit-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;
-webkit-box-shadow
:
inset
0
1px
0
#ffffff
;
-moz-box-shadow
:
inset
0
1px
0
#ffffff
;
box-shadow
:
inset
0
1px
0
#ffffff
;}
.breadcrumb
li
{
display
:
inline
;
text-shadow
:
0
1px
0
#ffffff
;}
.breadcrumb
.divider
{
padding
:
0
5px
;
color
:
#bfbfbf
;}
.breadcrumb
.active
a
{
color
:
#404040
;}
.pagination
{
height
:
36px
;
margin
:
18px
0
;}
.pagination
ul
{
float
:
left
;
margin
:
0
;
border
:
1px
solid
#ddd
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.15
);
-webkit-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;
-webkit-box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);
-moz-box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);
box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);}
.pagination
{
height
:
36px
;
margin
:
18px
0
;}
.pagination
ul
{
display
:
inline-block
;
*
display
:
inline
;
*
zoom
:
1
;
margin
:
0
;
border
:
1px
solid
#ddd
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.15
);
-webkit-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;
-webkit-box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);
-moz-box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);
box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,
0.05
);}
.pagination
li
{
display
:
inline
;}
.pagination
a
{
float
:
left
;
padding
:
0
14px
;
line-height
:
34px
;
text-decoration
:
none
;
border-right
:
1px
solid
;
border-right-color
:
#ddd
;
border-right-color
:
rgba
(
0
,
0
,
0
,
0.15
);
*
border-right-color
:
#ddd
;}
.pagination
a
:hover
,
.pagination
.active
a
{
background-color
:
#c7eefe
;}
.pagination
.disabled
a
,
.pagination
.disabled
a
:hover
{
color
:
#bfbfbf
;
background-color
:
transparent
;}
.pagination
.next
a
{
border
:
0
;}
.pagination.centered
{
text-align
:
center
;}
.modal-backdrop
{
position
:
fixed
;
top
:
0
;
right
:
0
;
bottom
:
0
;
left
:
0
;
z-index
:
10000
;
background-color
:
#000000
;}
.modal-backdrop.fade
{
opacity
:
0
;}
.modal-backdrop
,
.modal-backdrop.fade.in
{
filter
:
alpha
(
opacity
=
80
);
-moz-opacity
:
0.8
;
opacity
:
0.8
;}
.modal
{
position
:
fixed
;
top
:
50%
;
left
:
50%
;
z-index
:
11000
;
width
:
560px
;
margin
:
-250px
0
0
-250px
;
background-color
:
#ffffff
;
border
:
1px
solid
#999
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.3
);
*
border
:
1px
solid
#999
;
-webkit-border-radius
:
6px
;
-moz-border-radius
:
6px
;
border-radius
:
6px
;
-webkit-box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
-moz-box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding-box
;
background-clip
:
padding-box
;}
.modal
.close
{
margin-top
:
7px
;}
...
...
This diff is collapsed.
Click to expand it.
lib/mixins.less
+
6
-
0
View file @
3426877c
...
...
@@ -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;
...
...
This diff is collapsed.
Click to expand it.
lib/pagination.less
+
7
-
1
View file @
3426877c
...
...
@@ -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;
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets