Merge pull request #405 from twbs/cleanup-dist

Clean up /dist

Gruntfile.js

@@ -44,11 +44,11 @@ module.exports = function(grunt) {
           'js/sliders.js',
           'js/toggles.js'
         ],
-        dest: '<%= meta.distPath %><%= pkg.name %>.js'
+        dest: '<%= meta.distPath %>js/<%= pkg.name %>.js'
       },
       docs: {
-        src: '<%= meta.distPath %><%= pkg.name %>.js',
-        dest: '<%= meta.docsPath %><%= pkg.name %>.js'
+        src: '<%= meta.distPath %>js/<%= pkg.name %>.js',
+        dest: '<%= meta.docsPath %>js/<%= pkg.name %>.js'
       }
     },
 
@@ -60,9 +60,9 @@ module.exports = function(grunt) {
       },
       dist: {
         files: {
-          '<%= meta.distPath %><%= pkg.name %>.css': 'sass/ratchet.scss',
-          '<%= meta.distPath %><%= pkg.name %>-theme-ios.css': 'sass/theme-ios.scss',
-          '<%= meta.distPath %><%= pkg.name %>-theme-android.css': 'sass/theme-android.scss',
+          '<%= meta.distPath %>css/<%= pkg.name %>.css': 'sass/ratchet.scss',
+          '<%= meta.distPath %>css/<%= pkg.name %>-theme-ios.css': 'sass/theme-ios.scss',
+          '<%= meta.distPath %>css/<%= pkg.name %>-theme-android.css': 'sass/theme-android.scss',
           '<%= meta.docsAssetsPath %>css/docs.css': 'sass/docs.scss'
         }
       }
@@ -92,13 +92,13 @@ module.exports = function(grunt) {
         report: 'min'
       },
       ratchet: {
-        src: '<%= meta.distPath %><%= pkg.name %>.css',
-        dest: '<%= meta.distPath %><%= pkg.name %>.min.css'
+        src: '<%= meta.distPath %>css/<%= pkg.name %>.css',
+        dest: '<%= meta.distPath %>css/<%= pkg.name %>.min.css'
       },
       theme: {
         files: {
-          '<%= meta.distPath %><%= pkg.name %>-theme-ios.min.css': '<%= meta.distPath %><%= pkg.name %>-theme-ios.css',
-          '<%= meta.distPath %><%= pkg.name %>-theme-android.min.css' : '<%= meta.distPath %><%= pkg.name %>-theme-android.css'
+          '<%= meta.distPath %>css/<%= pkg.name %>-theme-ios.min.css': '<%= meta.distPath %>css/<%= pkg.name %>-theme-ios.css',
+          '<%= meta.distPath %>css/<%= pkg.name %>-theme-android.min.css' : '<%= meta.distPath %>css/<%= pkg.name %>-theme-android.css'
         }
       },
       docs: {
@@ -119,8 +119,8 @@ module.exports = function(grunt) {
         report: 'min'
       },
       ratchet: {
-        src: '<%= meta.distPath %><%= pkg.name %>.js',
-        dest: '<%= meta.distPath %><%= pkg.name %>.min.js'
+        src: '<%= meta.distPath %>js/<%= pkg.name %>.js',
+        dest: '<%= meta.distPath %>js/<%= pkg.name %>.min.js'
       },
       docs: {
         src: [

docs/dist/ratchet.css → dist/css/ratchet.css

@@ -1250,8 +1250,8 @@ select {
 
 @font-face {
   font-family: Ratchicons;
-  src: url("fonts/ratchicons.eot");
-  src: url("fonts/ratchicons.eot?#iefix") format("embedded-opentype"), url("fonts/ratchicons.woff") format("woff"), url("fonts/ratchicons.ttf") format("truetype"), url("fonts/ratchicons.svg#svgFontName") format("svg");
+  src: url("../fonts/ratchicons.eot");
+  src: url("../fonts/ratchicons.eot?#iefix") format("embedded-opentype"), url("../fonts/ratchicons.woff") format("woff"), url("../fonts/ratchicons.ttf") format("truetype"), url("../fonts/ratchicons.svg#svgFontName") format("svg");
   font-weight: normal;
   font-style: normal;
 }

docs/_includes/footer.html

@@ -41,5 +41,5 @@
 </script>
 
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-<script src="/dist/ratchet.min.js"></script>
+<script src="/dist/js/ratchet.min.js"></script>
 <script src="/assets/js/docs.min.js"></script>

docs/_includes/header.html

@@ -11,7 +11,7 @@
 <!-- Google Web Fonts -->
 <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,500,700|Open+Sans:300">
 
-<link rel="stylesheet" href="/dist/ratchet.min.css">
+<link rel="stylesheet" href="/dist/css/ratchet.min.css">
 <link rel="stylesheet" href="/assets/css/docs.min.css">
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->

docs/examples/app-android-notes/index.html

@@ -10,10 +10,10 @@
     <!-- Roboto -->
     <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:400,500,700">
 
-    <link rel="stylesheet" href="../../dist/ratchet.min.css">
-    <link rel="stylesheet" href="../../dist/ratchet-theme-android.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet-theme-android.min.css">
     <link rel="stylesheet" href="css/app.css">
-    <script src="../../dist/ratchet.min.js"></script>
+    <script src="../../dist/js/ratchet.min.js"></script>
   </head>
   <body>
     <header class="bar bar-nav">

docs/examples/app-ios-mail/inbox.html

@@ -7,10 +7,10 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
-    <link rel="stylesheet" href="../../dist/ratchet.min.css">
-    <link rel="stylesheet" href="../../dist/ratchet-theme-ios.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet-theme-ios.min.css">
     <link rel="stylesheet" href="css/app.css">
-    <script src="../../dist/ratchet.min.js"></script>
+    <script src="../../dist/js/ratchet.min.js"></script>
   </head>
   <body>
     <header class="bar bar-nav">

docs/examples/app-ios-mail/index.html

@@ -7,10 +7,10 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
-    <link rel="stylesheet" href="../../dist/ratchet.min.css">
-    <link rel="stylesheet" href="../../dist/ratchet-theme-ios.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet-theme-ios.min.css">
     <link rel="stylesheet" href="css/app.css">
-    <script src="../../dist/ratchet.min.js"></script>
+    <script src="../../dist/js/ratchet.min.js"></script>
   </head>
   <body>
     <header class="bar bar-nav">

docs/examples/app-movies/choose-theater.html

@@ -7,9 +7,9 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
-    <link rel="stylesheet" href="../../dist/ratchet.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet.min.css">
     <link rel="stylesheet" href="css/app.css">
-    <script src="../../dist/ratchet.min.js"></script>
+    <script src="../../dist/js/ratchet.min.js"></script>
   </head>
   <body>
     <header class="bar bar-nav">

docs/examples/app-movies/index.html

@@ -7,9 +7,9 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
-    <link rel="stylesheet" href="../../dist/ratchet.min.css">
+    <link rel="stylesheet" href="../../dist/css/ratchet.min.css">
     <link rel="stylesheet" href="css/app.css">
-    <script src="../../dist/ratchet.min.js"></script>
+    <script src="../../dist/js/ratchet.min.js"></script>
   </head>
   <body>
     <header class="bar bar-nav">

docs/one.html

@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="favicon.ico">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <link rel="stylesheet" href="/dist/ratchet.css">
+    <link rel="stylesheet" href="/dist/css/ratchet.min.css">
     <!--[if lt IE 9]><script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]-->
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/img/apple-touch-icon-114x114.png">
   </head>

dist/template.html → docs/template.html

@@ -14,16 +14,8 @@
     <!-- 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">
-    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="touch-icons/apple-touch-icon-57x57.png">
-
     <!-- Include the compiled Ratchet CSS -->
-    <link rel="stylesheet" href="ratchet.css">
-
-    <!-- Include the compiled Ratchet JS -->
-    <script src="ratchet.js"></script>
+    <link rel="stylesheet" href="/dist/css/ratchet.min.css">
 
     <!-- Intro paragraph styles. Delete once you start using this page -->
     <style>
@@ -70,5 +62,7 @@ <h1 class="title">Ratchet</h1>
       </div>
     </div>
 
+    <!-- Include the compiled Ratchet JS -->
+    <script src="/dist/js/ratchet.min.js"></script>
   </body>
 </html>

docs/two.html

@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="favicon.ico">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <link rel="stylesheet" href="/dist/ratchet.css">
+    <link rel="stylesheet" href="/dist/css/ratchet.min.css">
     <!--[if lt IE 9]><script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]-->
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/img/apple-touch-icon-114x114.png">
   </head>

sass/ratchicons.scss

@@ -4,11 +4,11 @@
 
 @font-face {
   font-family: Ratchicons;
-  src: url("fonts/ratchicons.eot");
-  src: url("fonts/ratchicons.eot?#iefix") format("embedded-opentype"),
-       url("fonts/ratchicons.woff") format("woff"),
-       url("fonts/ratchicons.ttf") format("truetype"),
-       url("fonts/ratchicons.svg#svgFontName") format("svg");
+  src: url("../fonts/ratchicons.eot");
+  src: url("../fonts/ratchicons.eot?#iefix") format("embedded-opentype"),
+       url("../fonts/ratchicons.woff") format("woff"),
+       url("../fonts/ratchicons.ttf") format("truetype"),
+       url("../fonts/ratchicons.svg#svgFontName") format("svg");
   font-weight: normal;
   font-style: normal;
 }