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
04161a8c
Commit
04161a8c
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
more derp
parent
f389111e
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/_includes/nav-main.html
+1
-1
docs/_includes/nav-main.html
docs/assets/css/docs.css
+38
-20
docs/assets/css/docs.css
docs/assets/js/application.js
+1
-1
docs/assets/js/application.js
docs/index.html
+4
-5
docs/index.html
with
44 additions
and
27 deletions
+44
-27
docs/_includes/nav-main.html
+
1
-
1
View file @
04161a8c
<header
class=
"navbar navbar-
fixed
-top bs-docs-nav"
role=
"banner"
>
<header
class=
"navbar navbar-
static
-top bs-docs-nav"
role=
"banner"
>
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"navbar-header"
>
<div
class=
"navbar-header"
>
<button
class=
"navbar-toggle"
type=
"button"
data-toggle=
"collapse"
data-target=
".bs-navbar-collapse"
>
<button
class=
"navbar-toggle"
type=
"button"
data-toggle=
"collapse"
data-target=
".bs-navbar-collapse"
>
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.css
+
38
-
20
View file @
04161a8c
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
body
{
body
{
position
:
relative
;
/* For scrollyspy */
position
:
relative
;
/* For scrollyspy */
padding-top
:
50px
;
/*
Account for fixed navbar */
/*
padding-top: 50px; Account for fixed navbar */
}
}
/* Keep code small in tables on account of limited space */
/* Keep code small in tables on account of limited space */
...
@@ -67,7 +67,7 @@ body {
...
@@ -67,7 +67,7 @@ body {
/* Inverted outline button (white on dark) */
/* Inverted outline button (white on dark) */
.btn-outline-inverse
{
.btn-outline-inverse
{
color
:
#
563d7c
;
color
:
#
fff
;
background-color
:
transparent
;
background-color
:
transparent
;
border-color
:
#cdbfe3
;
border-color
:
#cdbfe3
;
}
}
...
@@ -106,6 +106,10 @@ body {
...
@@ -106,6 +106,10 @@ body {
color
:
#563d7c
;
color
:
#563d7c
;
background-color
:
#fff
;
background-color
:
#fff
;
}
}
.bs-booticon-outline
{
background-color
:
transparent
;
border
:
1px
solid
#fff
;
}
/*
/*
...
@@ -115,9 +119,16 @@ body {
...
@@ -115,9 +119,16 @@ body {
*/
*/
.bs-docs-nav
{
.bs-docs-nav
{
margin-bottom
:
0
;
background-color
:
#fff
;
background-color
:
#fff
;
border-color
:
#e5e5e5
;
border-bottom-color
:
rgba
(
0
,
0
,
0
,
.1
);
box-shadow
:
0
0
10px
rgba
(
0
,
0
,
0
,
.05
);
/*box-shadow: 0 0 10px rgba(0,0,0,.05);*/
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding-box
;
background-clip
:
padding-box
;
}
.bs-home-nav
.bs-nav-b
{
display
:
none
;
}
}
.bs-docs-nav
.navbar-brand
,
.bs-docs-nav
.navbar-brand
,
.bs-docs-nav
.navbar-nav
>
li
>
a
{
.bs-docs-nav
.navbar-nav
>
li
>
a
{
...
@@ -217,16 +228,24 @@ body {
...
@@ -217,16 +228,24 @@ body {
* Tweaks to the custom homepage and the masthead (main jumbotron).
* Tweaks to the custom homepage and the masthead (main jumbotron).
*/
*/
.bs-docs-home
{
background-color
:
#f9f9f9
;
}
/* Masthead (headings and download button) */
/* Masthead (headings and download button) */
.bs-masthead
{
.bs-masthead
{
position
:
relative
;
position
:
relative
;
padding
:
30px
15px
;
padding
:
30px
15px
;
color
:
#cdbfe3
;
text-align
:
center
;
text-align
:
center
;
border-bottom
:
1px
solid
#e5e5e5
;
background-color
:
#563d7c
;
background
:
#563d7c
;
background
:
-moz-linear-gradient
(
top
,
#563d7c
0%
,
#654b8d
100%
);
background
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#563d7c
),
color-stop
(
100%
,
#654b8d
));
background
:
-webkit-linear-gradient
(
top
,
#563d7c
0%
,
#654b8d
100%
);
background
:
-o-linear-gradient
(
top
,
#563d7c
0%
,
#654b8d
100%
);
background
:
-ms-linear-gradient
(
top
,
#563d7c
0%
,
#654b8d
100%
);
background
:
linear-gradient
(
to
bottom
,
#563d7c
0%
,
#654b8d
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#563d7c'
,
endColorstr
=
'#654b8d'
,
GradientType
=
0
);
/*654B8D*/
/*border-bottom: 1px solid #e5e5e5;*/
}
}
.bs-masthead
.bs-booticon
{
.bs-masthead
.bs-booticon
{
margin
:
0
auto
30px
;
margin
:
0
auto
30px
;
...
@@ -234,20 +253,21 @@ body {
...
@@ -234,20 +253,21 @@ body {
.bs-masthead
h1
{
.bs-masthead
h1
{
font-weight
:
300
;
font-weight
:
300
;
line-height
:
1
;
line-height
:
1
;
color
:
#fff
;
}
}
.bs-masthead
.lead
{
.bs-masthead
.lead
{
margin
-bottom
:
30px
;
margin
:
0
auto
30px
;
font-size
:
20px
;
font-size
:
20px
;
color
:
#
555
;
color
:
#
fff
;
}
}
.bs-masthead
.btn
-outline
{
.bs-masthead
.btn
{
width
:
100%
;
width
:
100%
;
padding
:
1
4
px
24
px
;
padding
:
1
5
px
30
px
;
font-size
:
20px
;
font-size
:
20px
;
}
}
@media
(
min-width
:
480px
)
{
@media
(
min-width
:
480px
)
{
.bs-masthead
.btn
-outline
{
.bs-masthead
.btn
{
width
:
auto
;
width
:
auto
;
}
}
}
}
...
@@ -267,11 +287,9 @@ body {
...
@@ -267,11 +287,9 @@ body {
@media
(
min-width
:
992px
)
{
@media
(
min-width
:
992px
)
{
.bs-masthead
.lead
{
.bs-masthead
.lead
{
width
:
80%
;
font-size
:
30px
;
font-size
:
30px
;
}
}
.bs-masthead
.btn-outline
{
padding
:
18px
24px
;
}
}
}
...
@@ -514,8 +532,8 @@ body {
...
@@ -514,8 +532,8 @@ body {
/* First level of nav */
/* First level of nav */
.bs-sidenav
{
.bs-sidenav
{
margin-top
:
3
0px
;
margin-top
:
2
0px
;
margin-bottom
:
3
0px
;
margin-bottom
:
2
0px
;
padding-top
:
5px
;
padding-top
:
5px
;
padding-bottom
:
5px
;
padding-bottom
:
5px
;
}
}
...
@@ -581,7 +599,7 @@ body {
...
@@ -581,7 +599,7 @@ body {
}
}
.bs-sidebar.affix
{
.bs-sidebar.affix
{
position
:
fixed
;
/* Undo the static from mobile first approach */
position
:
fixed
;
/* Undo the static from mobile first approach */
top
:
8
0px
;
top
:
2
0px
;
}
}
.bs-sidebar.affix-bottom
{
.bs-sidebar.affix-bottom
{
position
:
absolute
;
/* Undo the static from mobile first approach */
position
:
absolute
;
/* Undo the static from mobile first approach */
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/application.js
+
1
-
1
View file @
04161a8c
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
$body
.
scrollspy
({
$body
.
scrollspy
({
target
:
'
.bs-sidebar
'
,
target
:
'
.bs-sidebar
'
,
offset
:
navHeight
//
offset: navHeight
})
})
$window
.
on
(
'
load
'
,
function
()
{
$window
.
on
(
'
load
'
,
function
()
{
...
...
This diff is collapsed.
Click to expand it.
docs/index.html
+
4
-
5
View file @
04161a8c
...
@@ -5,17 +5,16 @@ title: Bootstrap
...
@@ -5,17 +5,16 @@ title: Bootstrap
<main
class=
"bs-masthead"
id=
"content"
role=
"main"
>
<main
class=
"bs-masthead"
id=
"content"
role=
"main"
>
<div
class=
"container"
>
<div
class=
"container"
>
<span
class=
"bs-booticon bs-booticon-lg"
>
B
</span>
<span
class=
"bs-booticon bs-booticon-lg
bs-booticon-outline
"
>
B
</span>
<h1>
Bootstrap
</h1>
<!--
<h1>Bootstrap</h1>
-->
<p
class=
"lead"
>
The most popular front-end framework for de
signing and building
on the web.
</p>
<p
class=
"lead"
>
The most popular front-end framework for de
veloping responsive, mobile first projects
on the web.
</p>
<p
class=
"lead"
>
<p
class=
"lead"
>
<a
href=
"getting-started#download"
class=
"btn btn-outline btn-lg"
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);"
>
Download Bootstrap
</a>
<a
href=
"getting-started#download"
class=
"btn btn-outline
-inverse
btn-lg"
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);"
>
Download Bootstrap
</a>
</p>
</p>
{% include ads.html %}
{% include ads.html %}
</div>
</div>
</main>
</main>
<div
class=
"bs-featurette"
>
<div
class=
"bs-featurette"
>
<div
class=
"container"
>
<div
class=
"container"
>
<h2
class=
"bs-featurette-title"
>
Designed for everyone, everywhere.
</h2>
<h2
class=
"bs-featurette-title"
>
Designed for everyone, everywhere.
</h2>
...
...
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