mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-06 04:08:22 +01:00
merge in new ads
This commit is contained in:
parent
56ee42d335
commit
a8f21b5ae9
@ -14,6 +14,8 @@
|
|||||||
{{ content }}
|
{{ content }}
|
||||||
|
|
||||||
<footer class="container" role="contentinfo">
|
<footer class="container" role="contentinfo">
|
||||||
|
{% include ads.html %}
|
||||||
|
|
||||||
{% include social-buttons.html %}
|
{% include social-buttons.html %}
|
||||||
|
|
||||||
<ul class="bs-masthead-links">
|
<ul class="bs-masthead-links">
|
||||||
@ -29,9 +31,6 @@
|
|||||||
<li>
|
<li>
|
||||||
<a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
|
<a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
|
||||||
<a href="{{ page.base_url }}components/#glyphicons" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>
|
<a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>
|
||||||
</li>
|
</li>
|
||||||
|
@ -379,6 +379,39 @@ body {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Homepage variations */
|
||||||
|
.bs-docs-home .carbonad {
|
||||||
|
margin: 0 -15px 40px !important;
|
||||||
|
}
|
||||||
|
@media screen and (min-width: 480px) {
|
||||||
|
.bs-docs-home .carbonad {
|
||||||
|
width: 330px !important;
|
||||||
|
margin: 0 auto 40px !important;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (min-width: 768px) {
|
||||||
|
.bs-docs-home .carbonad {
|
||||||
|
float: left;
|
||||||
|
width: 330px !important;
|
||||||
|
margin: 0 0 30px !important;
|
||||||
|
}
|
||||||
|
.bs-docs-home .bs-social,
|
||||||
|
.bs-docs-home .bs-masthead-links {
|
||||||
|
margin-left: 350px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (min-width: 992px) {
|
||||||
|
.bs-docs-home .carbonad {
|
||||||
|
position: static;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (min-width: 1170px) {
|
||||||
|
.bs-docs-home .carbonad {
|
||||||
|
margin-top: -25px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Callout for 2.3.2 docs
|
* Callout for 2.3.2 docs
|
||||||
|
Loading…
x
Reference in New Issue
Block a user