Browse Source

Merge branch 'optimize_docs_fonts' of github.com:twbs/ratchet into optimize_docs_fonts

Conflicts:
	docs/examples.html
	docs/getting-started.html
	sass/docs.scss
pull/359/head
Mark Otto 11 years ago
parent
commit
5ccaea573b
  1. 4
      docs/_includes/header.html
  2. 67
      docs/assets/css/docs.css
  3. 2
      docs/assets/css/docs.min.css
  4. 48
      docs/examples.html
  5. 3
      docs/getting-started.html
  6. 90
      sass/docs.scss

4
docs/_includes/header.html

@ -32,8 +32,4 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
// Remove once I add back in the docs.js
// $(function() {
// $(window).on('load', function () { new FingerBlast('.body'); });
// });
</script>

67
docs/assets/css/docs.css

@ -92,7 +92,8 @@ body {
}
.docs-header .carbonad {
left: 50% !important;
margin-left: -165px !important;
width: 300px !important;
margin-left: -150px !important;
margin-bottom: 60px !important;
}
@ -106,11 +107,6 @@ body {
transform: translateY(-50%) !important;
}
}
@media screen and (min-width: 1200px) {
.docs-sub-header .carbonad {
right: 30px !important;
}
}
.docs-masthead {
position: relative;
padding-top: 15px;
@ -296,7 +292,7 @@ body {
}
.docs-header-content .btn {
display: block;
padding: 15px 90px 16px;
padding: 15px 75px 16px;
font-size: 18px;
margin-bottom: 0;
color: #0a1855;
@ -365,7 +361,7 @@ body {
height: auto !important;
margin-left: 145px !important;
color: rgba(255, 255, 255, 0.65) !important;
font-family: "adelle-sans", "Helvetica Neue", Helvetica, Arial, sans-serif !important;
font-family: "Open Sans", sans-serif !important;
}
.carbonad-text {
@ -387,7 +383,7 @@ body {
@media screen and (min-width: 768px) {
.carbonad {
width: 330px !important;
width: 360px !important;
border-right: 1px solid rgba(255, 255, 255, 0.1) !important;
border-bottom: 1px solid rgba(255, 255, 255, 0.1) !important;
border-left: 1px solid rgba(255, 255, 255, 0.1) !important;
@ -559,21 +555,13 @@ body {
}
.docs-examples {
margin-top: 50px;
margin-bottom: 50px;
}
.docs-example-group {
margin-top: 30px;
}
.docs-example-group .example-wrap {
display: inline-block;
margin-right: 10px;
}
.docs-example-group .example-wrap:last-child {
margin-right: 10px;
.example-wrap {
margin-bottom: 30px;
}
.docs-example-group .example-wrap .example {
.example-wrap .example {
display: block;
overflow: hidden;
padding: 3px;
@ -581,28 +569,15 @@ body {
border: 1px solid #dddddd;
border-radius: 3px;
}
.docs-example-group .example-wrap h5 {
.example-wrap .example-title {
margin-top: 10px;
}
.docs-example-group .example-wrap img {
.example-wrap img {
display: block;
width: 100%;
height: auto;
}
@media screen and (min-width: 768px) {
.docs-example-group .example-wrap {
display: inline-block;
}
.docs-example-group .example-wrap .example {
width: 180px;
}
}
@media screen and (min-width: 1200px) {
.docs-example-group .example-wrap .example {
width: 220px;
}
}
code {
padding: 2px 4px;
font-size: 90%;
@ -974,16 +949,6 @@ hr {
max-width: 940px;
}
.column {
padding-left: 20px;
padding-right: 20px;
}
.column .column-group {
margin-left: -20px;
margin-right: -20px;
}
.units-1 {
width: 50%;
}
@ -1088,16 +1053,6 @@ hr {
.container {
max-width: 1170px;
}
.column {
padding-left: 30px;
padding-right: 30px;
}
.column .column-group {
margin-left: -30px;
margin-right: -30px;
}
}
.platform-ios {
@-webkit-keyframes fadeOverlay {

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

File diff suppressed because one or more lines are too long

48
docs/examples.html

@ -20,30 +20,38 @@ title: Examples &middot; Ratchet
<div class="container">
<div class="column-group">
<div class="column units-2 lg-units-8 docs-examples">
<p class="section-lead">Checkout out the examples on a desktop browser or visit on your mobile device to see the apps as intended.</p>
<div class="docs-example-group">
<div class="example-wrap">
<a class="example" href="/examples/app-movies" data-ignore="push">
<img src="/assets/img/example.png" alt="Movie finder app example" width="640" height="480">
</a>
<h5>Movie finder</h5>
</div>
<div class="example-wrap">
<a class="example" href="/examples/app-ios-mail" data-ignore="push">
<img src="/assets/img/example-ios.png" alt="iOS mail app example" width="640" height="480">
</a>
<h5>iOS mail app</h5>
<div class="column units-2 lg-units-8 docs-examples docs-content">
<p class="lead">Checkout out the examples on a desktop browser or visit on your mobile device see the apps as intended.</p>
<div class="column-group">
<div class="column units-2 lg-units-4">
<div class="example-wrap">
<a class="example" href="/examples/app-movies" data-ignore="push">
<img src="/assets/img/example.png" alt="Movie finder app example" width="640" height="480">
</a>
<h4 class="example-title">Movie finder</h4>
</div>
</div>
<div class="example-wrap">
<a class="example" href="/examples/app-android-notes" data-ignore="push">
<img src="/assets/img/example-android.png" alt="Android notes app example" width="640" height="480">
</a>
<h5>Android notes app</h5>
<div class="column units-2 lg-units-4">
<div class="example-wrap">
<a class="example" href="/examples/app-ios-mail" data-ignore="push">
<img src="/assets/img/example-ios.png" alt="iOS mail app example" width="640" height="480">
</a>
<h4 class="example-title">iOS mail app</h4>
</div>
</div>
<div class="column units-2 lg-units-4">
<div class="example-wrap">
<a class="example" href="/examples/app-android-notes" data-ignore="push">
<img src="/assets/img/example-android.png" alt="Android notes app example" width="640" height="480">
</a>
<h4 class="example-title">Android notes app</h4>
</div>
</div> <!-- .column-group -->
</div>
</div>
<div class="column units-2 lg-units-4">
{% include download-module.html %}
</div>

3
docs/getting-started.html

@ -21,9 +21,6 @@ title: Getting started &middot; Ratchet
<div class="container">
<div class="column-group">
<div class="column units-2 lg-units-8 docs-content">
<div class="docs-section">
<h2>Quick start</h2>
<p class="lead">Quickly get up and running with a Ratchet prototype.</p>

90
sass/docs.scss

@ -96,7 +96,8 @@ body {
// Ads on the homepage
.carbonad {
left: 50% !important;
margin-left: -165px !important;
width: 300px !important;
margin-left: -150px !important;
margin-bottom: 60px !important;
}
}
@ -110,12 +111,6 @@ body {
@include transform(translateY(-50%) !important);
}
}
// Account for the extra margin for large sceens.
@media screen and (min-width: 1200px) {
.docs-sub-header .carbonad {
right: 30px !important;
}
}
// Masthead and nav
.docs-masthead {
@ -302,7 +297,7 @@ body {
.btn {
display: block;
padding: 15px 90px 16px;
padding: 15px 75px 16px;
font-size: 18px;
margin-bottom: 0;
color: #0a1855;
@ -368,7 +363,7 @@ body {
height: auto !important;
margin-left: 145px !important;
color: rgba(255,255,255,.65) !important;
font-family: "adelle-sans", "Helvetica Neue", Helvetica, Arial, sans-serif !important;
font-family: "Open Sans", sans-serif !important;
}
.carbonad-text {
padding-top: 0 !important;
@ -387,7 +382,7 @@ body {
// Desktop styles for ads
@media screen and (min-width: 768px) {
.carbonad {
width: 330px !important;
width: 360px !important;
border-right: 1px solid rgba(255,255,255,.1) !important;
border-bottom: 1px solid rgba(255,255,255,.1) !important;
border-left: 1px solid rgba(255,255,255,.1) !important;
@ -586,52 +581,27 @@ body {
// Example devices
// --------------------------------------------------
.docs-examples {
margin-top: 50px;
margin-bottom: 50px;
}
.docs-example-group {
margin-top: 30px;
.example-wrap {
display: inline-block;
margin-right: 10px;
&:last-child {
margin-right: 10px;
}
.example {
display: block;
overflow: hidden;
padding: 3px;
width: 100%;
border: $border-default;
border-radius: 3px;
}
h5 {
margin-top: 10px;
}
img {
display: block;
width: 100%;
height: auto;
}
}
}
@media screen and (min-width: 768px) {
// Examples
.docs-example-group .example-wrap {
display: inline-block;
.example-wrap {
margin-bottom: 30px;
.example {
width: 180px;
}
.example {
display: block;
overflow: hidden;
padding: 3px;
width: 100%;
border: $border-default;
border-radius: 3px;
}
}
@media screen and (min-width: 1200px) {
.docs-example-group .example-wrap .example {
width: 220px;
.example-title {
margin-top: 10px;
}
img {
display: block;
width: 100%;
height: auto;
}
}
@ -1015,15 +985,6 @@ hr {
padding: 0;
max-width: 940px;
}
.column {
padding-left: 20px;
padding-right: 20px;
}
// Lines nested grids up correctly.
.column .column-group {
margin-left: -20px;
margin-right: -20px;
}
// Override the mobile grid
.units-1 { width: 50%; }
@ -1065,15 +1026,6 @@ hr {
.container {
max-width: 1170px;
}
.column {
padding-left: 30px;
padding-right: 30px;
}
// Lines nested grids up correctly.
.column .column-group {
margin-left: -30px;
margin-right: -30px;
}
}

Loading…
Cancel
Save