Merge branch 'master' of github.com:maker/ratchet

diff --git a/dist/ratchet.css b/dist/ratchet.css
index c694f73..ca7fd80 100644 (file)
--- a/dist/ratchet.css
+++ b/dist/ratchet.css
@@ -126,11 +126,11 @@ a {
   bottom: 0;
   left: 0;
   overflow: auto;
-  background: #fff;
+  background-color: #fff;
   -webkit-transition-property: top, bottom;
           transition-property: top, bottom;
-  -webkit-transition-duration: .2s, .2s;  
-          transition-duration: .2s, .2s;  
+  -webkit-transition-duration: .2s, .2s;
+          transition-duration: .2s, .2s;
   -webkit-transition-timing-function: linear, linear;
           transition-timing-function: linear, linear;
   -webkit-overflow-scrolling: touch;
@@ -637,7 +637,7 @@ input[type="color"],
   height: 40px;
   padding: 10px;
   margin-bottom: 10px;
-  background: #fff;
+  background-color: #fff;
   border: 1px solid rgba(0, 0, 0, .2);
   border-radius: 3px;
   box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1);

diff --git a/dist/template.html b/dist/template.html
index b8820c1..5772f39 100644 (file)
--- a/dist/template.html
+++ b/dist/template.html
@@ -10,6 +10,9 @@
     <!-- Makes your prototype chrome-less once bookmarked to your phone's home screen -->
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    
+    <!-- Set a shorter title for iOS6 devices when saved to home screen -->
+    <meta name="apple-mobile-web-app-title" content="Ratchet">
 
     <!-- Set Apple icons for when prototype is saved to home screen -->
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="touch-icons/apple-touch-icon-114x114.png">

diff --git a/docs/css/docs.css b/docs/css/docs.css
index 63244b0..fbf2ca2 100644 (file)
--- a/docs/css/docs.css
+++ b/docs/css/docs.css
@@ -7,7 +7,7 @@ body {
   font-size: 14px;
   line-height: 1.6;
   color: #333;
-  background: #fff;
+  background-color: #fff;
   -webkit-font-smoothing: antialiased; /* Fix for webkit rendering */
   -webkit-text-size-adjust: 100%;
 }
@@ -16,14 +16,6 @@ body {
 /* Typography
 -------------------------------------------------- */
 
-em {
-  font-style: italic;
-}
-
-strong {
-  font-weight: bold;
-}
-
 hr {
   height: 0;
   margin: 10px 0 30px;
@@ -44,6 +36,7 @@ h6 {
 
 /* Docs structural styles
 -------------------------------------------------- */
+
 .docs-outer-wrapper {
   position: relative;
 }
@@ -274,7 +267,7 @@ h6 {
 
 .social ul {
   height: 20px;
-  padding-left: 50px;
+  padding-left: 20px;
   list-style: none;
   text-align: center;
 }
@@ -359,7 +352,7 @@ h6 {
 .iphone .list a[data-transition="slide-out"] {
   padding: 0;
   display: inline;
-  margin: 0; 
+  margin: 0;
   color: #0882f0;
 }
 
@@ -1074,7 +1067,7 @@ h6 {
 [class*="bar-"] {
   -moz-box-sizing: border-box;
 }
-.bar-title, 
+.bar-title,
 .tab-inner {
   display: -moz-box;
   -moz-box-orient: horizontal;

diff --git a/docs/index.html b/docs/index.html
index e26a8f9..96c1c6f 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -73,7 +73,7 @@
     <header class="docs-outer-wrapper docs-header">
       <div class="docs-inner-wrapper">
         <hgroup class="docs-header-text">
-          <h2 class="docs-header-subtitle">Prototype iPhone apps with simple HTML, CSS and JS components.</h2>
+          <h2 class="docs-header-subtitle">Prototype iPhone apps with simple HTML, CSS, and JS components.</h2>
           <a data-ignore="push" href="http://maker.github.com/ratchet/ratchet.zip" class="docs-btn" onClick="_gaq.push(['_trackEvent', 'Downloads', 'V1.0']);">Download Ratchet</a>
         </hgroup>
       </div>

diff --git a/lib/css/base.css b/lib/css/base.css
index 6df61a4..7d2f817 100644 (file)
--- a/lib/css/base.css
+++ b/lib/css/base.css
@@ -118,11 +118,11 @@ a {
   bottom: 0;
   left: 0;
   overflow: auto;
-  background: #fff;
+  background-color: #fff;
   -webkit-transition-property: top, bottom;
           transition-property: top, bottom;
-  -webkit-transition-duration: .2s, .2s;  
-          transition-duration: .2s, .2s;  
+  -webkit-transition-duration: .2s, .2s;
+          transition-duration: .2s, .2s;
   -webkit-transition-timing-function: linear, linear;
           transition-timing-function: linear, linear;
   -webkit-overflow-scrolling: touch;

diff --git a/lib/css/forms.css b/lib/css/forms.css
index 898a748..e2bf4e8 100644 (file)
--- a/lib/css/forms.css
+++ b/lib/css/forms.css
@@ -32,7 +32,7 @@ input[type="color"],
   height: 40px;
   padding: 10px;
   margin-bottom: 10px;
-  background: #fff;
+  background-color: #fff;
   border: 1px solid rgba(0, 0, 0, .2);
   border-radius: 3px;
   box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1);

diff --git a/test/app/choose-theater.html b/test/app/choose-theater.html
index 47cc5b9..1bec8dd 100644 (file)
--- a/test/app/choose-theater.html
+++ b/test/app/choose-theater.html
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="../../dist/ratchet.css">
     <link rel="stylesheet" href="css/app.css">
     <script src="../../dist/ratchet.js"></script>
-    <script src="../../dos/js/fingerblast.js"></script>
+    <script src="../../docs/js/fingerblast.js"></script>
 
   </head>
   <body>

diff --git a/test/app/settings.html b/test/app/settings.html
index 3a647d9..eaed189 100644 (file)
--- a/test/app/settings.html
+++ b/test/app/settings.html
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="../../dist/ratchet.css">
     <link rel="stylesheet" href="css/app.css">
     <script src="../../dist/ratchet.js"></script>
-    <script src="../../dos/js/fingerblast.js"></script>
+    <script src="../../docs/js/fingerblast.js"></script>
 
   </head>
   <body>