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
603aaa01
Commit
603aaa01
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
remake after updating variables from @lookfirst
parent
66f65355
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bootstrap.css
+4
-4
bootstrap.css
bootstrap.min.css
+2
-2
bootstrap.min.css
with
6 additions
and
6 deletions
+6
-6
bootstrap.css
+
4
-
4
View file @
603aaa01
...
@@ -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: Wed Jan 25 1
0:47:5
5 PST 2012
* Date: Wed Jan 25 1
1:05:1
5 PST 2012
*/
*/
article
,
article
,
aside
,
aside
,
...
@@ -2776,7 +2776,7 @@ a.thumbnail:hover {
...
@@ -2776,7 +2776,7 @@ a.thumbnail:hover {
.progress
.bar
{
.progress
.bar
{
width
:
0%
;
width
:
0%
;
height
:
18px
;
height
:
18px
;
color
:
#fff
;
color
:
#fff
fff
;
font-size
:
12px
;
font-size
:
12px
;
text-align
:
center
;
text-align
:
center
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
...
@@ -2957,10 +2957,10 @@ a.thumbnail:hover {
...
@@ -2957,10 +2957,10 @@ a.thumbnail:hover {
font-size
:
60px
;
font-size
:
60px
;
font-weight
:
100
;
font-weight
:
100
;
line-height
:
30px
;
line-height
:
30px
;
color
:
#fff
;
color
:
#fff
fff
;
text-align
:
center
;
text-align
:
center
;
background
:
#222222
;
background
:
#222222
;
border
:
3px
solid
#fff
;
border
:
3px
solid
#fff
fff
;
-webkit-border-radius
:
23px
;
-webkit-border-radius
:
23px
;
-moz-border-radius
:
23px
;
-moz-border-radius
:
23px
;
border-radius
:
23px
;
border-radius
:
23px
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
2
-
2
View file @
603aaa01
...
@@ -506,7 +506,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
...
@@ -506,7 +506,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.label.notice
{
background-color
:
#62cffc
;}
.label.notice
{
background-color
:
#62cffc
;}
@-webkit-keyframes
progress-bar-stripes
{
from
{
background-position
:
0
0
;}
to
{
background-position
:
40px
0
;}}
@keyframes
progress-bar-stripes
{
from
{
background-position
:
0
0
;}
to
{
background-position
:
40px
0
;}}
.progress
,
.progress
.bar
{
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
@-webkit-keyframes
progress-bar-stripes
{
from
{
background-position
:
0
0
;}
to
{
background-position
:
40px
0
;}}
@keyframes
progress-bar-stripes
{
from
{
background-position
:
0
0
;}
to
{
background-position
:
40px
0
;}}
.progress
,
.progress
.bar
{
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
.progress
{
height
:
18px
;
margin-bottom
:
18px
;
background-color
:
#f9f9f9
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#f5f5f5
),
to
(
#f9f9f9
));
background-image
:
-moz-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
-ms-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#f5f5f5
),
color-stop
(
100%
,
#f9f9f9
));
background-image
:
-webkit-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
-o-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#f5f5f5'
,
endColorstr
=
'#f9f9f9'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
);
-moz-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
);
box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
);}
.progress
{
height
:
18px
;
margin-bottom
:
18px
;
background-color
:
#f9f9f9
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#f5f5f5
),
to
(
#f9f9f9
));
background-image
:
-moz-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
-ms-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#f5f5f5
),
color-stop
(
100%
,
#f9f9f9
));
background-image
:
-webkit-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
-o-linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-image
:
linear-gradient
(
top
,
#f5f5f5
,
#f9f9f9
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#f5f5f5'
,
endColorstr
=
'#f9f9f9'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
);
-moz-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
);
box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
);}
.progress
.bar
{
width
:
0%
;
height
:
18px
;
color
:
#fff
;
font-size
:
12px
;
text-align
:
center
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
background-color
:
#0480be
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#149bdf
),
to
(
#0480be
));
background-image
:
-moz-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
-ms-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#149bdf
),
color-stop
(
100%
,
#0480be
));
background-image
:
-webkit-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
-o-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#149bdf'
,
endColorstr
=
'#0480be'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
-moz-box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
-webkit-transition
:
width
0.6s
ease
;
-moz-transition
:
width
0.6s
ease
;
-ms-transition
:
width
0.6s
ease
;
-o-transition
:
width
0.6s
ease
;
transition
:
width
0.6s
ease
;}
.progress
.bar
{
width
:
0%
;
height
:
18px
;
color
:
#fff
fff
;
font-size
:
12px
;
text-align
:
center
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
background-color
:
#0480be
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#149bdf
),
to
(
#0480be
));
background-image
:
-moz-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
-ms-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#149bdf
),
color-stop
(
100%
,
#0480be
));
background-image
:
-webkit-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
-o-linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-image
:
linear-gradient
(
top
,
#149bdf
,
#0480be
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#149bdf'
,
endColorstr
=
'#0480be'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
-moz-box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
-webkit-transition
:
width
0.6s
ease
;
-moz-transition
:
width
0.6s
ease
;
-ms-transition
:
width
0.6s
ease
;
-o-transition
:
width
0.6s
ease
;
transition
:
width
0.6s
ease
;}
.progress.striped
.bar
{
background-color
:
#62c462
;
background-image
:
-webkit-gradient
(
linear
,
0
100%
,
100%
0
,
color-stop
(
0.25
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.25
,
transparent
),
color-stop
(
0.5
,
transparent
),
color-stop
(
0.5
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
transparent
),
to
(
transparent
));
background-image
:
-webkit-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-moz-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-ms-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-o-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
-webkit-background-size
:
40px
40px
;
-moz-background-size
:
40px
40px
;
-o-background-size
:
40px
40px
;
background-size
:
40px
40px
;}
.progress.striped
.bar
{
background-color
:
#62c462
;
background-image
:
-webkit-gradient
(
linear
,
0
100%
,
100%
0
,
color-stop
(
0.25
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.25
,
transparent
),
color-stop
(
0.5
,
transparent
),
color-stop
(
0.5
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
transparent
),
to
(
transparent
));
background-image
:
-webkit-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-moz-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-ms-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-o-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
-webkit-background-size
:
40px
40px
;
-moz-background-size
:
40px
40px
;
-o-background-size
:
40px
40px
;
background-size
:
40px
40px
;}
.progress.active
.bar
{
-webkit-animation
:
progress-bar-stripes
2s
linear
infinite
;
-moz-animation
:
progress-bar-stripes
2s
linear
infinite
;
animation
:
progress-bar-stripes
2s
linear
infinite
;}
.progress.active
.bar
{
-webkit-animation
:
progress-bar-stripes
2s
linear
infinite
;
-moz-animation
:
progress-bar-stripes
2s
linear
infinite
;
animation
:
progress-bar-stripes
2s
linear
infinite
;}
.progress.danger
.bar
{
background-color
:
#c43c35
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#ee5f5b
),
to
(
#c43c35
));
background-image
:
-moz-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
-ms-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#ee5f5b
),
color-stop
(
100%
,
#c43c35
));
background-image
:
-webkit-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
-o-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ee5f5b'
,
endColorstr
=
'#c43c35'
,
GradientType
=
0
);}
.progress.danger
.bar
{
background-color
:
#c43c35
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#ee5f5b
),
to
(
#c43c35
));
background-image
:
-moz-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
-ms-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#ee5f5b
),
color-stop
(
100%
,
#c43c35
));
background-image
:
-webkit-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
-o-linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-image
:
linear-gradient
(
top
,
#ee5f5b
,
#c43c35
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ee5f5b'
,
endColorstr
=
'#c43c35'
,
GradientType
=
0
);}
...
@@ -531,7 +531,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
...
@@ -531,7 +531,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.carousel
.next.left
,
.carousel
.prev.right
{
left
:
0
;}
.carousel
.next.left
,
.carousel
.prev.right
{
left
:
0
;}
.carousel
.active.left
{
left
:
-100%
;}
.carousel
.active.left
{
left
:
-100%
;}
.carousel
.active.right
{
left
:
100%
;}
.carousel
.active.right
{
left
:
100%
;}
.carousel-control
{
position
:
absolute
;
top
:
40%
;
left
:
15px
;
width
:
40px
;
height
:
40px
;
margin-top
:
-20px
;
font-size
:
60px
;
font-weight
:
100
;
line-height
:
30px
;
color
:
#fff
;
text-align
:
center
;
background
:
#222222
;
border
:
3px
solid
#fff
;
-webkit-border-radius
:
23px
;
-moz-border-radius
:
23px
;
border-radius
:
23px
;
filter
:
alpha
(
opacity
=
50
);
-moz-opacity
:
0.5
;
opacity
:
0.5
;
-webkit-transition
:
all
0.2s
linear
;
-moz-transition
:
all
0.2s
linear
;
-ms-transition
:
all
0.2s
linear
;
-o-transition
:
all
0.2s
linear
;
transition
:
all
0.2s
linear
;}
.carousel-control.right
{
left
:
auto
;
right
:
15px
;}
.carousel-control
{
position
:
absolute
;
top
:
40%
;
left
:
15px
;
width
:
40px
;
height
:
40px
;
margin-top
:
-20px
;
font-size
:
60px
;
font-weight
:
100
;
line-height
:
30px
;
color
:
#fff
fff
;
text-align
:
center
;
background
:
#222222
;
border
:
3px
solid
#fff
fff
;
-webkit-border-radius
:
23px
;
-moz-border-radius
:
23px
;
border-radius
:
23px
;
filter
:
alpha
(
opacity
=
50
);
-moz-opacity
:
0.5
;
opacity
:
0.5
;
-webkit-transition
:
all
0.2s
linear
;
-moz-transition
:
all
0.2s
linear
;
-ms-transition
:
all
0.2s
linear
;
-o-transition
:
all
0.2s
linear
;
transition
:
all
0.2s
linear
;}
.carousel-control.right
{
left
:
auto
;
right
:
15px
;}
.carousel-control
:hover
{
color
:
#ffffff
;
text-decoration
:
none
;
filter
:
alpha
(
opacity
=
90
);
-moz-opacity
:
0.9
;
opacity
:
0.9
;}
.carousel-control
:hover
{
color
:
#ffffff
;
text-decoration
:
none
;
filter
:
alpha
(
opacity
=
90
);
-moz-opacity
:
0.9
;
opacity
:
0.9
;}
.carousel-caption
{
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
0
;
padding
:
10px
15px
5px
;
background
:
#333333
;
background
:
rgba
(
0
,
0
,
0
,
0.75
);}
.carousel-caption
{
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
0
;
padding
:
10px
15px
5px
;
background
:
#333333
;
background
:
rgba
(
0
,
0
,
0
,
0.75
);}
.carousel-caption
h4
,
.carousel-caption
p
{
color
:
#ffffff
;}
.carousel-caption
h4
,
.carousel-caption
p
{
color
:
#ffffff
;}
...
...
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