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
ef4e3bc0
Commit
ef4e3bc0
authored
13 years ago
by
Linmiao Xu
Browse files
Options
Download
Email Patches
Plain Diff
Move hero-unit css out of pattern.less and include it. Fixes
#1185
.
parent
d8e10018
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
bootstrap-responsive.min.css
+1
-1
bootstrap-responsive.min.css
bootstrap.css
+21
-2
bootstrap.css
bootstrap.min.css
+3
-1
bootstrap.min.css
lib/bootstrap.less
+1
-0
lib/bootstrap.less
lib/hero-unit.less
+20
-0
lib/hero-unit.less
lib/patterns.less
+0
-17
lib/patterns.less
with
46 additions
and
21 deletions
+46
-21
bootstrap-responsive.min.css
+
1
-
1
View file @
ef4e3bc0
.hidden
{
display
:
none
;
visibility
:
hidden
;}
@media
(
max-width
:
480px
){
.navbar
.nav
{
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
180px
;
padding-top
:
40px
;
list-style
:
none
;}
.navbar
.nav
,
.navbar
.nav
>
li
:last-child
a
{
-webkit-border-radius
:
0
0
4px
0
;
-moz-border-radius
:
0
0
4px
0
;
border-radius
:
0
0
4px
0
;}
.navbar
.nav
>
li
{
float
:
none
;
display
:
none
;}
.navbar
.nav
>
li
>
a
{
float
:
none
;
background-color
:
#222
;}
.navbar
.nav
>
.active
{
display
:
block
;
position
:
absolute
;
top
:
0
;
left
:
0
;}
.navbar
.nav
>
.active
>
a
{
background-color
:
transparent
;}
.navbar
.nav
>
.active
>
a
:hover
{
background-color
:
#333
;}
.navbar
.nav
>
.active
>
a
:after
{
display
:
inline-block
;
width
:
0
;
height
:
0
;
margin-top
:
8px
;
margin-left
:
6px
;
text-indent
:
-99999px
;
vertical-align
:
top
;
border-left
:
4px
solid
transparent
;
border-right
:
4px
solid
transparent
;
border-top
:
4px
solid
#ffffff
;
opacity
:
1
;
filter
:
alpha
(
opacity
=
100
);
content
:
"↓"
;}
.navbar
.nav
:hover
>
li
{
display
:
block
;}
.navbar
.nav
:hover
>
li
>
a
:hover
{
background-color
:
#333
;}
.form-horizontal
.control-group
>
label
{
float
:
none
;
width
:
auto
;
padding-top
:
0
;
text-align
:
left
;}
.form-horizontal
.controls
{
margin-left
:
0
;}
.form-horizontal
.control-list
{
padding-top
:
0
;}
.form-horizontal
.form-actions
{
padding-left
:
0
;}
.modal
{
position
:
absolute
;
top
:
20px
;
left
:
20px
;
right
:
20px
;
width
:
auto
;
margin
:
0
;}
.modal.fade.in
{
top
:
auto
;}
.modal-header
.close
{
padding
:
10px
;}}
@media
(
max-width
:
768px
){
.navbar-fixed
{
position
:
absolute
;}
.navbar-fixed
.nav
{
float
:
none
;}
.container
{
width
:
auto
;
padding
:
0
20px
;}
.row
{
margin-left
:
0
;}
.row
>[
class
*=
"span"
]
{
float
:
none
;
display
:
block
;
width
:
auto
;
margin
:
0
;}}
@media
(
min-width
:
768px
)
and
(
max-width
:
940px
){
.container
{
width
:
748px
;}
.span1
{
width
:
44px
;}
.span2
{
width
:
108px
;}
.span3
{
width
:
172px
;}
.span4
{
width
:
236px
;}
.span5
{
width
:
300px
;}
.span6
{
width
:
364px
;}
.span7
{
width
:
428px
;}
.span8
{
width
:
492px
;}
.span9
{
width
:
556px
;}
.span10
{
width
:
620px
;}
.span11
{
width
:
684px
;}
.span12
{
width
:
748px
;}
.offset1
{
margin-left
:
84px
;}
.offset2
{
margin-left
:
148px
;}
.offset3
{
margin-left
:
212px
;}
.offset4
{
margin-left
:
276px
;}
.offset5
{
margin-left
:
340px
;}
.offset6
{
margin-left
:
404px
;}
.offset7
{
margin-left
:
468px
;}
.offset8
{
margin-left
:
532px
;}
.offset9
{
margin-left
:
596px
;}
.offset10
{
margin-left
:
660px
;}
.offset11
{
margin-left
:
724px
;}
.offset12
{
margin-left
:
788px
;}}
@media
(
max-width
:
480px
){
.navbar
.nav
{
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
180px
;
padding-top
:
40px
;
list-style
:
none
;}
.navbar
.nav
,
.navbar
.nav
>
li
:last-child
a
{
-webkit-border-radius
:
0
0
4px
0
;
-moz-border-radius
:
0
0
4px
0
;
border-radius
:
0
0
4px
0
;}
.navbar
.nav
>
li
{
float
:
none
;
display
:
none
;}
.navbar
.nav
>
li
>
a
{
float
:
none
;
background-color
:
#222
;}
.navbar
.nav
>
.active
{
display
:
block
;
position
:
absolute
;
top
:
0
;
left
:
0
;}
.navbar
.nav
>
.active
>
a
{
background-color
:
transparent
;}
.navbar
.nav
>
.active
>
a
:hover
{
background-color
:
#333
;}
.navbar
.nav
>
.active
>
a
:after
{
display
:
inline-block
;
width
:
0
;
height
:
0
;
margin-top
:
8px
;
margin-left
:
6px
;
text-indent
:
-99999px
;
vertical-align
:
top
;
border-left
:
4px
solid
transparent
;
border-right
:
4px
solid
transparent
;
border-top
:
4px
solid
#ffffff
;
opacity
:
1
;
filter
:
alpha
(
opacity
=
100
);
content
:
"↓"
;}
.navbar
.nav
:hover
>
li
{
display
:
block
;}
.navbar
.nav
:hover
>
li
>
a
:hover
{
background-color
:
#333
;}
.form-horizontal
.control-group
>
label
{
float
:
none
;
width
:
auto
;
padding-top
:
0
;
text-align
:
left
;}
.form-horizontal
.controls
{
margin-left
:
0
;}
.form-horizontal
.control-list
{
padding-top
:
0
;}
.form-horizontal
.form-actions
{
padding-left
:
0
;}
.modal
{
position
:
absolute
;
top
:
20px
;
left
:
20px
;
right
:
20px
;
width
:
auto
;
margin
:
0
;}
.modal.fade.in
{
top
:
auto
;}
.modal-header
.close
{
padding
:
10px
;}}
@media
(
max-width
:
768px
){
.navbar-fixed
{
position
:
absolute
;}
.navbar-fixed
.nav
{
float
:
none
;}
.container
{
width
:
auto
;
padding
:
0
20px
;}
.row
{
margin-left
:
0
;}
.row
>[
class
*=
"span"
]
{
float
:
none
;
display
:
block
;
width
:
auto
;
margin
:
0
;}}
@media
(
min-width
:
768px
)
and
(
max-width
:
940px
){
.container
{
width
:
748px
;}
.span1
{
width
:
44px
;}
.span2
{
width
:
108px
;}
.span3
{
width
:
172px
;}
.span4
{
width
:
236px
;}
.span5
{
width
:
300px
;}
.span6
{
width
:
364px
;}
.span7
{
width
:
428px
;}
.span8
{
width
:
492px
;}
.span9
{
width
:
556px
;}
.span10
{
width
:
620px
;}
.span11
{
width
:
684px
;}
.span12
{
width
:
748px
;}
.offset1
{
margin-left
:
84px
;}
.offset2
{
margin-left
:
148px
;}
.offset3
{
margin-left
:
212px
;}
.offset4
{
margin-left
:
276px
;}
.offset5
{
margin-left
:
340px
;}
.offset6
{
margin-left
:
404px
;}
.offset7
{
margin-left
:
468px
;}
.offset8
{
margin-left
:
532px
;}
.offset9
{
margin-left
:
596px
;}
.offset10
{
margin-left
:
660px
;}
.offset11
{
margin-left
:
724px
;}
.offset12
{
margin-left
:
788px
;}}
This diff is collapsed.
Click to expand it.
bootstrap.css
+
21
-
2
View file @
ef4e3bc0
...
...
@@ -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: Thu Jan 26 15:
39:24
PST 2012
* Date: Thu Jan 26 15:
50:30
PST 2012
*/
article
,
aside
,
...
...
@@ -1828,7 +1828,7 @@ table .span12 {
.navbar-search
.search-query
:-moz-placeholder
{
color
:
#eeeeee
;
}
.navbar-search
.search-query
::-webkit-input-placeholder
{
.navbar-search
.search-query
::-webkit-input-placeholder
{
color
:
#eeeeee
;
}
.navbar-search
.search-query
:hover
{
...
...
@@ -2998,6 +2998,25 @@ a.thumbnail:hover {
.carousel-caption
h4
,
.carousel-caption
p
{
color
:
#ffffff
;
}
.hero-unit
{
padding
:
60px
;
margin-bottom
:
30px
;
background-color
:
#f5f5f5
;
-webkit-border-radius
:
6px
;
-moz-border-radius
:
6px
;
border-radius
:
6px
;
}
.hero-unit
h1
{
margin-bottom
:
0
;
font-size
:
60px
;
line-height
:
1
;
letter-spacing
:
-1px
;
}
.hero-unit
p
{
font-size
:
18px
;
font-weight
:
200
;
line-height
:
27px
;
}
.pull-right
{
float
:
right
;
}
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
3
-
1
View file @
ef4e3bc0
...
...
@@ -377,7 +377,7 @@ table .span12{float:none;width:924px;margin-left:0;}
.navbar
.btn-group
.btn
{
margin-top
:
0
;}
.navbar-form
{
margin-bottom
:
0
;}
.navbar-form
input
,
.navbar-form
select
{
display
:
inline-block
;
margin-bottom
:
0
;}
.navbar-search
{
position
:
relative
;
float
:
left
;
margin-top
:
6px
;
margin-bottom
:
0
;}
.navbar-search
.search-query
{
padding
:
4px
9px
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
font-size
:
13px
;
font-weight
:
normal
;
line-height
:
1
;
color
:
#ffffff
;
color
:
rgba
(
255
,
255
,
255
,
0.75
);
background
:
#444
;
background
:
rgba
(
255
,
255
,
255
,
0.3
);
border
:
1px
solid
#111
;
-webkit-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
),
0
1px
0px
rgba
(
255
,
255
,
255
,
0.15
);
-moz-box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
),
0
1px
0px
rgba
(
255
,
255
,
255
,
0.15
);
box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.1
),
0
1px
0px
rgba
(
255
,
255
,
255
,
0.15
);
-webkit-transition
:
none
;
-moz-transition
:
none
;
-ms-transition
:
none
;
-o-transition
:
none
;
transition
:
none
;}
.navbar-search
.search-query
:-moz-placeholder
{
color
:
#eeeeee
;}
.navbar-search
.search-query
::-webkit-input-placeholder
{
color
:
#eeeeee
;}
.navbar-search
.search-query
::-webkit-input-placeholder
{
color
:
#eeeeee
;}
.navbar-search
.search-query
:hover
{
color
:
#ffffff
;
background-color
:
#999999
;
background-color
:
rgba
(
255
,
255
,
255
,
0.5
);}
.navbar-search
.search-query
:focus
,
.navbar-search
.search-query.focused
{
padding
:
5px
10px
;
color
:
#333333
;
text-shadow
:
0
1px
0
#ffffff
;
background-color
:
#ffffff
;
border
:
0
;
-webkit-box-shadow
:
0
0
3px
rgba
(
0
,
0
,
0
,
0.15
);
-moz-box-shadow
:
0
0
3px
rgba
(
0
,
0
,
0
,
0.15
);
box-shadow
:
0
0
3px
rgba
(
0
,
0
,
0
,
0.15
);
outline
:
0
;}
.navbar-static
{
margin-bottom
:
18px
;}
...
...
@@ -546,6 +546,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.carousel-control
:hover
{
color
:
#ffffff
;
text-decoration
:
none
;
opacity
:
0.9
;
filter
:
alpha
(
opacity
=
90
);}
.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
;}
.hero-unit
{
padding
:
60px
;
margin-bottom
:
30px
;
background-color
:
#f5f5f5
;
-webkit-border-radius
:
6px
;
-moz-border-radius
:
6px
;
border-radius
:
6px
;}
.hero-unit
h1
{
margin-bottom
:
0
;
font-size
:
60px
;
line-height
:
1
;
letter-spacing
:
-1px
;}
.hero-unit
p
{
font-size
:
18px
;
font-weight
:
200
;
line-height
:
27px
;}
.pull-right
{
float
:
right
;}
.pull-left
{
float
:
left
;}
.hide
{
display
:
none
;}
...
...
This diff is collapsed.
Click to expand it.
lib/bootstrap.less
+
1
-
0
View file @
ef4e3bc0
...
...
@@ -57,6 +57,7 @@
@import "progress-bars.less";
@import "accordion.less";
@import "carousel.less";
@import "hero-unit.less";
// Utility classes
@import "utilities.less"; // Has to be last to override when necessary
This diff is collapsed.
Click to expand it.
lib/hero-unit.less
0 → 100644
+
20
-
0
View file @
ef4e3bc0
// HERO UNIT
// ---------
.hero-unit {
padding: 60px;
margin-bottom: 30px;
background-color: #f5f5f5;
.border-radius(6px);
h1 {
margin-bottom: 0;
font-size: 60px;
line-height: 1;
letter-spacing: -1px;
}
p {
font-size: 18px;
font-weight: 200;
line-height: @baseLineHeight * 1.5;
}
}
This diff is collapsed.
Click to expand it.
lib/patterns.less
+
0
-
17
View file @
ef4e3bc0
...
...
@@ -6,23 +6,6 @@
// PAGE HEADERS
// ------------
.hero-unit {
padding: 60px;
margin-bottom: 30px;
background-color: #f5f5f5;
.border-radius(6px);
h1 {
margin-bottom: 0;
font-size: 60px;
line-height: 1;
letter-spacing: -1px;
}
p {
font-size: 18px;
font-weight: 200;
line-height: @baseLineHeight * 1.5;
}
}
footer {
padding-top: @baseLineHeight - 1;
margin-top: @baseLineHeight - 1;
...
...
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