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

12 years ago · fe6fd1fe63
8 changed files with 19 additions and 23 deletions
--- a/dist/ratchet.css
+++ b/dist/ratchet.css
@ -126,7 +126,7 @@ 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;
@ -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);
--- a/dist/template.html
+++ b/dist/template.html
@ -11,6 +11,9 @@
    <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">
    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="touch-icons/apple-touch-icon-72x72.png">
--- 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;
 }
--- 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>
--- a/lib/css/base.css
+++ b/lib/css/base.css
@ -118,7 +118,7 @@ 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;
--- 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);
--- 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>
--- 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>