Browse Source

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

pull/97/head
Dave Gamache 12 years ago
parent
commit
fe6fd1fe63
  1. 4
      dist/ratchet.css
  2. 3
      dist/template.html
  3. 13
      docs/css/docs.css
  4. 2
      docs/index.html
  5. 2
      lib/css/base.css
  6. 2
      lib/css/forms.css
  7. 2
      test/app/choose-theater.html
  8. 2
      test/app/settings.html

4
dist/ratchet.css vendored

@ -126,7 +126,7 @@ a {
bottom: 0; bottom: 0;
left: 0; left: 0;
overflow: auto; overflow: auto;
background: #fff; background-color: #fff;
-webkit-transition-property: top, bottom; -webkit-transition-property: top, bottom;
transition-property: top, bottom; transition-property: top, bottom;
-webkit-transition-duration: .2s, .2s; -webkit-transition-duration: .2s, .2s;
@ -637,7 +637,7 @@ input[type="color"],
height: 40px; height: 40px;
padding: 10px; padding: 10px;
margin-bottom: 10px; margin-bottom: 10px;
background: #fff; background-color: #fff;
border: 1px solid rgba(0, 0, 0, .2); border: 1px solid rgba(0, 0, 0, .2);
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1); box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1);

3
dist/template.html vendored

@ -11,6 +11,9 @@
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <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 --> <!-- 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="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"> <link rel="apple-touch-icon-precomposed" sizes="72x72" href="touch-icons/apple-touch-icon-72x72.png">

13
docs/css/docs.css

@ -7,7 +7,7 @@ body {
font-size: 14px; font-size: 14px;
line-height: 1.6; line-height: 1.6;
color: #333; color: #333;
background: #fff; background-color: #fff;
-webkit-font-smoothing: antialiased; /* Fix for webkit rendering */ -webkit-font-smoothing: antialiased; /* Fix for webkit rendering */
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
} }
@ -16,14 +16,6 @@ body {
/* Typography /* Typography
-------------------------------------------------- */ -------------------------------------------------- */
em {
font-style: italic;
}
strong {
font-weight: bold;
}
hr { hr {
height: 0; height: 0;
margin: 10px 0 30px; margin: 10px 0 30px;
@ -44,6 +36,7 @@ h6 {
/* Docs structural styles /* Docs structural styles
-------------------------------------------------- */ -------------------------------------------------- */
.docs-outer-wrapper { .docs-outer-wrapper {
position: relative; position: relative;
} }
@ -274,7 +267,7 @@ h6 {
.social ul { .social ul {
height: 20px; height: 20px;
padding-left: 50px; padding-left: 20px;
list-style: none; list-style: none;
text-align: center; text-align: center;
} }

2
docs/index.html

@ -73,7 +73,7 @@
<header class="docs-outer-wrapper docs-header"> <header class="docs-outer-wrapper docs-header">
<div class="docs-inner-wrapper"> <div class="docs-inner-wrapper">
<hgroup class="docs-header-text"> <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> <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> </hgroup>
</div> </div>

2
lib/css/base.css

@ -118,7 +118,7 @@ a {
bottom: 0; bottom: 0;
left: 0; left: 0;
overflow: auto; overflow: auto;
background: #fff; background-color: #fff;
-webkit-transition-property: top, bottom; -webkit-transition-property: top, bottom;
transition-property: top, bottom; transition-property: top, bottom;
-webkit-transition-duration: .2s, .2s; -webkit-transition-duration: .2s, .2s;

2
lib/css/forms.css

@ -32,7 +32,7 @@ input[type="color"],
height: 40px; height: 40px;
padding: 10px; padding: 10px;
margin-bottom: 10px; margin-bottom: 10px;
background: #fff; background-color: #fff;
border: 1px solid rgba(0, 0, 0, .2); border: 1px solid rgba(0, 0, 0, .2);
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1); box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1);

2
test/app/choose-theater.html

@ -14,7 +14,7 @@
<link rel="stylesheet" href="../../dist/ratchet.css"> <link rel="stylesheet" href="../../dist/ratchet.css">
<link rel="stylesheet" href="css/app.css"> <link rel="stylesheet" href="css/app.css">
<script src="../../dist/ratchet.js"></script> <script src="../../dist/ratchet.js"></script>
<script src="../../dos/js/fingerblast.js"></script> <script src="../../docs/js/fingerblast.js"></script>
</head> </head>
<body> <body>

2
test/app/settings.html

@ -14,7 +14,7 @@
<link rel="stylesheet" href="../../dist/ratchet.css"> <link rel="stylesheet" href="../../dist/ratchet.css">
<link rel="stylesheet" href="css/app.css"> <link rel="stylesheet" href="css/app.css">
<script src="../../dist/ratchet.js"></script> <script src="../../dist/ratchet.js"></script>
<script src="../../dos/js/fingerblast.js"></script> <script src="../../docs/js/fingerblast.js"></script>
</head> </head>
<body> <body>

Loading…
Cancel
Save