rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Code Issues Actions Packages Releases Activity

fix general page and page header layout

Browse Source
This commit is contained in:
Mark Otto 2015-08-12 17:45:47 -07:00
parent 8e8f8f54cd
commit 575a886437
5 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/_layouts/page.html
View File

@ -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-sm-3 col-sm-push-9 bd-sidebar"> <div class="col-md-3 col-md-push-9 bd-sidebar">
{% include nav-docs.html %} {% include nav-docs.html %}
</div> </div>
<div class="col-sm-9 col-sm-pull-3 bd-content"> <div class="col-md-9 col-md-pull-3 bd-content">
<h1 class="bd-title">{{ page.title }}</h1> <h1 class="bd-title">{{ page.title }}</h1>
{{ content }} {{ content }}
</div> </div>

2
docs/assets/css/docs.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/css/docs.min.css.map
View File

File diff suppressed because one or more lines are too long

7
docs/assets/scss/_ads.scss
View File

@ -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 @@
border-radius: .25rem; border-radius: .25rem;
} }
} }
@include media-breakpoint-up(md) {
}

33
docs/assets/scss/_layout.scss
View File

@ -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: 4rem; font-size: 3rem;
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 @@
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;
} }
} }
} }