Skip to content
GitLab
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
95356ee0
Commit
95356ee0
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
make css after merge
parent
32e57efd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bootstrap.css
+4
-1
bootstrap.css
bootstrap.min.css
+1
-0
bootstrap.min.css
with
5 additions
and
1 deletion
+5
-1
bootstrap.css
+
4
-
1
View file @
95356ee0
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Jan 26 1
4:52:24
PST 2012
* Date: Thu Jan 26 1
5:04:19
PST 2012
*/
*/
article
,
article
,
aside
,
aside
,
...
@@ -2514,6 +2514,9 @@ table .span12 {
...
@@ -2514,6 +2514,9 @@ table .span12 {
-moz-border-radius
:
5px
;
-moz-border-radius
:
5px
;
border-radius
:
5px
;
border-radius
:
5px
;
}
}
.btn.large
.icon
{
margin-top
:
1px
;
}
.btn.small
{
.btn.small
{
padding
:
7px
9px
7px
;
padding
:
7px
9px
7px
;
font-size
:
11px
;
font-size
:
11px
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
1
-
0
View file @
95356ee0
...
@@ -470,6 +470,7 @@ table .span12{float:none;width:924px;margin-left:0;}
...
@@ -470,6 +470,7 @@ table .span12{float:none;width:924px;margin-left:0;}
.btn.disabled
{
cursor
:
default
;
background-image
:
none
;
background-color
:
#e6e6e6
;
opacity
:
0.65
;
filter
:
alpha
(
opacity
=
65
);
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;}
.btn.disabled
{
cursor
:
default
;
background-image
:
none
;
background-color
:
#e6e6e6
;
opacity
:
0.65
;
filter
:
alpha
(
opacity
=
65
);
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;}
.btn
[
disabled
]
{
cursor
:
default
;
background-image
:
none
;
background-color
:
#e6e6e6
;
opacity
:
0.65
;
filter
:
alpha
(
opacity
=
65
);
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;}
.btn
[
disabled
]
{
cursor
:
default
;
background-image
:
none
;
background-color
:
#e6e6e6
;
opacity
:
0.65
;
filter
:
alpha
(
opacity
=
65
);
-webkit-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;}
.btn.large
{
padding
:
9px
14px
9px
;
font-size
:
15px
;
line-height
:
normal
;
-webkit-border-radius
:
5px
;
-moz-border-radius
:
5px
;
border-radius
:
5px
;}
.btn.large
{
padding
:
9px
14px
9px
;
font-size
:
15px
;
line-height
:
normal
;
-webkit-border-radius
:
5px
;
-moz-border-radius
:
5px
;
border-radius
:
5px
;}
.btn.large
.icon
{
margin-top
:
1px
;}
.btn.small
{
padding
:
7px
9px
7px
;
font-size
:
11px
;}
.btn.small
{
padding
:
7px
9px
7px
;
font-size
:
11px
;}
.btn.small
.icon
{
margin-top
:
-2px
;}
.btn.small
.icon
{
margin-top
:
-2px
;}
button
.btn
::-moz-focus-inner
,
input
[
type
=
submit
]
.btn
::-moz-focus-inner
{
padding
:
0
;
border
:
0
;}
button
.btn
::-moz-focus-inner
,
input
[
type
=
submit
]
.btn
::-moz-focus-inner
{
padding
:
0
;
border
:
0
;}
...
...
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