diff options
| author | Mark Otto <[email protected]> | 2013-10-02 00:11:51 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-05 11:44:41 -0500 |
| commit | a8f21b5ae98bf515d79ed6b8a7bfa2d1e84ff056 (patch) | |
| tree | 89468a802a30089ffc24af2b2915160682469511 | |
| parent | 56ee42d335df18d675decc0b67f76757d02ca7e9 (diff) | |
| download | bootstrap-a8f21b5ae98bf515d79ed6b8a7bfa2d1e84ff056.tar.xz bootstrap-a8f21b5ae98bf515d79ed6b8a7bfa2d1e84ff056.zip | |
merge in new ads
| -rw-r--r-- | _layouts/home.html | 5 | ||||
| -rw-r--r-- | docs-assets/css/docs.css | 33 |
2 files changed, 35 insertions, 3 deletions
diff --git a/_layouts/home.html b/_layouts/home.html index 416b3e2bf..c8328feb4 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -14,6 +14,8 @@ {{ content }} <footer class="container" role="contentinfo"> + {% include ads.html %} + {% include social-buttons.html %} <ul class="bs-masthead-links"> @@ -30,9 +32,6 @@ <a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> </li> <li> - <a href="{{ page.base_url }}components/#glyphicons" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a> - </li> - <li> <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a> </li> <li> diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 86fcfc6da..fa472f080 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -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 |