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
575a8864
Commit
575a8864
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix general page and page header layout
parent
8e8f8f54
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/_layouts/page.html
+4
-4
docs/_layouts/page.html
docs/assets/css/docs.min.css
+1
-1
docs/assets/css/docs.min.css
docs/assets/css/docs.min.css.map
+0
-0
docs/assets/css/docs.min.css.map
docs/assets/scss/_ads.scss
+6
-1
docs/assets/scss/_ads.scss
docs/assets/scss/_layout.scss
+28
-5
docs/assets/scss/_layout.scss
with
39 additions
and
11 deletions
+39
-11
docs/_layouts/page.html
+
4
-
4
View file @
575a8864
...
@@ -2,19 +2,19 @@
...
@@ -2,19 +2,19 @@
layout: default
layout: default
---
---
<div
class=
"bd-pageheader"
>
<div
class=
"bd-pageheader
text-xs-center text-sm-left
"
>
<div
class=
"container"
>
<div
class=
"container"
>
{% include ads.html %}
{% include page-headers.html %}
{% include page-headers.html %}
{% include ads.html %}
</div>
</div>
</div>
</div>
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-
s
m-3 col-
s
m-push-9 bd-sidebar"
>
<div
class=
"col-m
d
-3 col-m
d
-push-9 bd-sidebar"
>
{% include nav-docs.html %}
{% include nav-docs.html %}
</div>
</div>
<div
class=
"col-
s
m-9 col-
s
m-pull-3 bd-content"
>
<div
class=
"col-m
d
-9 col-m
d
-pull-3 bd-content"
>
<h1
class=
"bd-title"
>
{{ page.title }}
</h1>
<h1
class=
"bd-title"
>
{{ page.title }}
</h1>
{{ content }}
{{ content }}
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.min.css
+
1
-
1
View file @
575a8864
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.min.css.map
+133 bytes (+2%)
View file @
575a8864
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
Click to expand it.
docs/assets/scss/_ads.scss
+
6
-
1
View file @
575a8864
...
@@ -6,9 +6,10 @@
...
@@ -6,9 +6,10 @@
width
:
auto
!
important
;
width
:
auto
!
important
;
height
:
auto
!
important
;
height
:
auto
!
important
;
padding
:
1
.25rem
!
important
;
padding
:
1
.25rem
!
important
;
margin
:
0
-1
.5rem
2rem
!
important
;
margin
:
2rem
-1
.5rem
-
2rem
!
important
;
overflow
:
hidden
;
// clearfix
overflow
:
hidden
;
// clearfix
font-size
:
.8rem
!
important
;
font-size
:
.8rem
!
important
;
font-family
:
inherit
!
important
;
line-height
:
1rem
!
important
;
line-height
:
1rem
!
important
;
color
:
$bd-purple-light
!
important
;
color
:
$bd-purple-light
!
important
;
text-align
:
left
;
text-align
:
left
;
...
@@ -65,3 +66,7 @@
...
@@ -65,3 +66,7 @@
border-radius
:
.25rem
;
border-radius
:
.25rem
;
}
}
}
}
@include
media-breakpoint-up
(
md
)
{
}
This diff is collapsed.
Click to expand it.
docs/assets/scss/_layout.scss
+
28
-
5
View file @
575a8864
...
@@ -34,19 +34,23 @@
...
@@ -34,19 +34,23 @@
.bd-pageheader
{
.bd-pageheader
{
padding-top
:
2rem
;
padding
:
2rem
.75rem
;
padding-bottom
:
2rem
;
margin-bottom
:
3rem
;
margin-bottom
:
3rem
;
color
:
$bd-purple-light
;
color
:
$bd-purple-light
;
background-color
:
$bd-purple
;
background-color
:
$bd-purple
;
.container
{
position
:
relative
;
}
h1
{
h1
{
font-size
:
4
rem
;
font-size
:
3
rem
;
font-weight
:
normal
;
font-weight
:
normal
;
color
:
#fff
;
color
:
#fff
;
}
}
p
{
p
{
margin-bottom
:
0
;
font-size
:
1
.5rem
;
font-size
:
1
.5rem
;
}
}
...
@@ -55,8 +59,27 @@
...
@@ -55,8 +59,27 @@
padding-bottom
:
4rem
;
padding-bottom
:
4rem
;
.carbonad
{
.carbonad
{
float
:
right
;
margin
:
2rem
0
0
!
important
;
margin-left
:
2rem
!
important
;
}
}
@include
media-breakpoint-up
(
md
)
{
h1
{
font-size
:
4rem
;
}
}
@include
media-breakpoint-up
(
lg
)
{
h1
,
p
{
margin-right
:
380px
;
}
.carbonad
{
position
:
absolute
;
top
:
0
;
right
:
.75rem
;
// offset from the .container's padding
margin
:
0
!
important
;
}
}
}
}
}
}
...
...
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