Skip to content

Commit 85f4782

Browse files
connorsconnors
committed
Merge pull request #405 from twbs/cleanup-dist
Clean up /dist
2 parents 92be0fb + 2b29cbf commit 85f4782

35 files changed

+40
-120
lines changed

‎Gruntfile.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ module.exports = function(grunt) {
4444
'js/sliders.js',
4545
'js/toggles.js'
4646
],
47-
dest: '<%= meta.distPath %><%= pkg.name %>.js'
47+
dest: '<%= meta.distPath %>js/<%= pkg.name %>.js'
4848
},
4949
docs: {
50-
src: '<%= meta.distPath %><%= pkg.name %>.js',
51-
dest: '<%= meta.docsPath %><%= pkg.name %>.js'
50+
src: '<%= meta.distPath %>js/<%= pkg.name %>.js',
51+
dest: '<%= meta.docsPath %>js/<%= pkg.name %>.js'
5252
}
5353
},
5454

@@ -60,9 +60,9 @@ module.exports = function(grunt) {
6060
},
6161
dist: {
6262
files: {
63-
'<%= meta.distPath %><%= pkg.name %>.css': 'sass/ratchet.scss',
64-
'<%= meta.distPath %><%= pkg.name %>-theme-ios.css': 'sass/theme-ios.scss',
65-
'<%= meta.distPath %><%= pkg.name %>-theme-android.css': 'sass/theme-android.scss',
63+
'<%= meta.distPath %>css/<%= pkg.name %>.css': 'sass/ratchet.scss',
64+
'<%= meta.distPath %>css/<%= pkg.name %>-theme-ios.css': 'sass/theme-ios.scss',
65+
'<%= meta.distPath %>css/<%= pkg.name %>-theme-android.css': 'sass/theme-android.scss',
6666
'<%= meta.docsAssetsPath %>css/docs.css': 'sass/docs.scss'
6767
}
6868
}
@@ -92,13 +92,13 @@ module.exports = function(grunt) {
9292
report: 'min'
9393
},
9494
ratchet: {
95-
src: '<%= meta.distPath %><%= pkg.name %>.css',
96-
dest: '<%= meta.distPath %><%= pkg.name %>.min.css'
95+
src: '<%= meta.distPath %>css/<%= pkg.name %>.css',
96+
dest: '<%= meta.distPath %>css/<%= pkg.name %>.min.css'
9797
},
9898
theme: {
9999
files: {
100-
'<%= meta.distPath %><%= pkg.name %>-theme-ios.min.css': '<%= meta.distPath %><%= pkg.name %>-theme-ios.css',
101-
'<%= meta.distPath %><%= pkg.name %>-theme-android.min.css' : '<%= meta.distPath %><%= pkg.name %>-theme-android.css'
100+
'<%= meta.distPath %>css/<%= pkg.name %>-theme-ios.min.css': '<%= meta.distPath %>css/<%= pkg.name %>-theme-ios.css',
101+
'<%= meta.distPath %>css/<%= pkg.name %>-theme-android.min.css' : '<%= meta.distPath %>css/<%= pkg.name %>-theme-android.css'
102102
}
103103
},
104104
docs: {
@@ -119,8 +119,8 @@ module.exports = function(grunt) {
119119
report: 'min'
120120
},
121121
ratchet: {
122-
src: '<%= meta.distPath %><%= pkg.name %>.js',
123-
dest: '<%= meta.distPath %><%= pkg.name %>.min.js'
122+
src: '<%= meta.distPath %>js/<%= pkg.name %>.js',
123+
dest: '<%= meta.distPath %>js/<%= pkg.name %>.min.js'
124124
},
125125
docs: {
126126
src: [

‎dist/ratchet-theme-android.css renamed to ‎dist/css/ratchet-theme-android.css

File renamed without changes.

‎dist/ratchet-theme-android.min.css renamed to ‎dist/css/ratchet-theme-android.min.css

File renamed without changes.

‎dist/ratchet-theme-ios.css renamed to ‎dist/css/ratchet-theme-ios.css

File renamed without changes.

‎dist/ratchet-theme-ios.min.css renamed to ‎dist/css/ratchet-theme-ios.min.css

File renamed without changes.

‎docs/dist/ratchet.css renamed to ‎dist/css/ratchet.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,8 +1250,8 @@ select {
12501250

12511251
@font-face {
12521252
font-family: Ratchicons;
1253-
src: url("fonts/ratchicons.eot");
1254-
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");
1253+
src: url("../fonts/ratchicons.eot");
1254+
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");
12551255
font-weight: normal;
12561256
font-style: normal;
12571257
}

‎docs/dist/ratchet.min.css renamed to ‎dist/css/ratchet.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/ratchet.js renamed to ‎dist/js/ratchet.js

File renamed without changes.

‎dist/ratchet.min.js renamed to ‎dist/js/ratchet.min.js

File renamed without changes.

‎dist/touch-icons/apple-touch-icon-114x114.png

-13.2 KB
Binary file not shown.

‎dist/touch-icons/apple-touch-icon-57x57.png

-3.98 KB
Binary file not shown.

‎dist/touch-icons/apple-touch-icon-72x72.png

-5.88 KB
Binary file not shown.

‎docs/_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
</script>
4242

4343
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
44-
<script src="/dist/ratchet.min.js"></script>
44+
<script src="/dist/js/ratchet.min.js"></script>
4545
<script src="/assets/js/docs.min.js"></script>

‎docs/_includes/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- Google Web Fonts -->
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,500,700|Open+Sans:300">
1313

14-
<link rel="stylesheet" href="/dist/ratchet.min.css">
14+
<link rel="stylesheet" href="/dist/css/ratchet.min.css">
1515
<link rel="stylesheet" href="/assets/css/docs.min.css">
1616

1717
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->

‎docs/dist/ratchet-theme-android.css renamed to ‎docs/dist/css/ratchet-theme-android.css

File renamed without changes.

‎docs/dist/ratchet-theme-android.min.css renamed to ‎docs/dist/css/ratchet-theme-android.min.css

File renamed without changes.

‎docs/dist/ratchet-theme-ios.css renamed to ‎docs/dist/css/ratchet-theme-ios.css

File renamed without changes.

‎docs/dist/ratchet-theme-ios.min.css renamed to ‎docs/dist/css/ratchet-theme-ios.min.css

File renamed without changes.

‎dist/ratchet.css renamed to ‎docs/dist/css/ratchet.css

File renamed without changes.

‎dist/ratchet.min.css renamed to ‎docs/dist/css/ratchet.min.css

File renamed without changes.

‎docs/dist/ratchet.js renamed to ‎docs/dist/js/ratchet.js

File renamed without changes.

‎docs/dist/ratchet.min.js renamed to ‎docs/dist/js/ratchet.min.js

File renamed without changes.

‎docs/dist/template.html

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎docs/dist/touch-icons/apple-touch-icon-114x114.png

-13.2 KB
Binary file not shown.

‎docs/dist/touch-icons/apple-touch-icon-57x57.png

-3.98 KB
Binary file not shown.

‎docs/dist/touch-icons/apple-touch-icon-72x72.png

-5.88 KB
Binary file not shown.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<!-- Roboto -->
1111
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:400,500,700">
1212

13-
<link rel="stylesheet" href="../../dist/ratchet.min.css">
14-
<link rel="stylesheet" href="../../dist/ratchet-theme-android.min.css">
13+
<link rel="stylesheet" href="../../dist/css/ratchet.min.css">
14+
<link rel="stylesheet" href="../../dist/css/ratchet-theme-android.min.css">
1515
<link rel="stylesheet" href="css/app.css">
16-
<script src="../../dist/ratchet.min.js"></script>
16+
<script src="../../dist/js/ratchet.min.js"></script>
1717
</head>
1818
<body>
1919
<header class="bar bar-nav">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="apple-mobile-web-app-capable" content="yes">
88
<meta name="apple-mobile-web-app-status-bar-style" content="black">
99

10-
<link rel="stylesheet" href="../../dist/ratchet.min.css">
11-
<link rel="stylesheet" href="../../dist/ratchet-theme-ios.min.css">
10+
<link rel="stylesheet" href="../../dist/css/ratchet.min.css">
11+
<link rel="stylesheet" href="../../dist/css/ratchet-theme-ios.min.css">
1212
<link rel="stylesheet" href="css/app.css">
13-
<script src="../../dist/ratchet.min.js"></script>
13+
<script src="../../dist/js/ratchet.min.js"></script>
1414
</head>
1515
<body>
1616
<header class="bar bar-nav">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="apple-mobile-web-app-capable" content="yes">
88
<meta name="apple-mobile-web-app-status-bar-style" content="black">
99

10-
<link rel="stylesheet" href="../../dist/ratchet.min.css">
11-
<link rel="stylesheet" href="../../dist/ratchet-theme-ios.min.css">
10+
<link rel="stylesheet" href="../../dist/css/ratchet.min.css">
11+
<link rel="stylesheet" href="../../dist/css/ratchet-theme-ios.min.css">
1212
<link rel="stylesheet" href="css/app.css">
13-
<script src="../../dist/ratchet.min.js"></script>
13+
<script src="../../dist/js/ratchet.min.js"></script>
1414
</head>
1515
<body>
1616
<header class="bar bar-nav">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<meta name="apple-mobile-web-app-capable" content="yes">
88
<meta name="apple-mobile-web-app-status-bar-style" content="black">
99

10-
<link rel="stylesheet" href="../../dist/ratchet.min.css">
10+
<link rel="stylesheet" href="../../dist/css/ratchet.min.css">
1111
<link rel="stylesheet" href="css/app.css">
12-
<script src="../../dist/ratchet.min.js"></script>
12+
<script src="../../dist/js/ratchet.min.js"></script>
1313
</head>
1414
<body>
1515
<header class="bar bar-nav">

‎docs/examples/app-movies/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<meta name="apple-mobile-web-app-capable" content="yes">
88
<meta name="apple-mobile-web-app-status-bar-style" content="black">
99

10-
<link rel="stylesheet" href="../../dist/ratchet.min.css">
10+
<link rel="stylesheet" href="../../dist/css/ratchet.min.css">
1111
<link rel="stylesheet" href="css/app.css">
12-
<script src="../../dist/ratchet.min.js"></script>
12+
<script src="../../dist/js/ratchet.min.js"></script>
1313
</head>
1414
<body>
1515
<header class="bar bar-nav">

‎docs/one.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="shortcut icon" href="favicon.ico">
1010
<meta name="apple-mobile-web-app-capable" content="yes">
1111
<meta name="apple-mobile-web-app-status-bar-style" content="black">
12-
<link rel="stylesheet" href="/dist/ratchet.css">
12+
<link rel="stylesheet" href="/dist/css/ratchet.min.css">
1313
<!--[if lt IE 9]><script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]-->
1414
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/img/apple-touch-icon-114x114.png">
1515
</head>

‎dist/template.html renamed to ‎docs/template.html

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,8 @@
1414
<!-- Set a shorter title for iOS6 devices when saved to home screen -->
1515
<meta name="apple-mobile-web-app-title" content="Ratchet">
1616

17-
<!-- Set Apple icons for when prototype is saved to home screen -->
18-
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="touch-icons/apple-touch-icon-114x114.png">
19-
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="touch-icons/apple-touch-icon-72x72.png">
20-
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="touch-icons/apple-touch-icon-57x57.png">
21-
2217
<!-- Include the compiled Ratchet CSS -->
23-
<link rel="stylesheet" href="ratchet.css">
24-
25-
<!-- Include the compiled Ratchet JS -->
26-
<script src="ratchet.js"></script>
18+
<link rel="stylesheet" href="/dist/css/ratchet.min.css">
2719

2820
<!-- Intro paragraph styles. Delete once you start using this page -->
2921
<style>
@@ -70,5 +62,7 @@ <h1 class="title">Ratchet</h1>
7062
</div>
7163
</div>
7264

65+
<!-- Include the compiled Ratchet JS -->
66+
<script src="/dist/js/ratchet.min.js"></script>
7367
</body>
7468
</html>

‎docs/two.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="shortcut icon" href="favicon.ico">
1010
<meta name="apple-mobile-web-app-capable" content="yes">
1111
<meta name="apple-mobile-web-app-status-bar-style" content="black">
12-
<link rel="stylesheet" href="/dist/ratchet.css">
12+
<link rel="stylesheet" href="/dist/css/ratchet.min.css">
1313
<!--[if lt IE 9]><script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]-->
1414
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/img/apple-touch-icon-114x114.png">
1515
</head>

‎sass/ratchicons.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
@font-face {
66
font-family: Ratchicons;
7-
src: url("fonts/ratchicons.eot");
8-
src: url("fonts/ratchicons.eot?#iefix") format("embedded-opentype"),
9-
url("fonts/ratchicons.woff") format("woff"),
10-
url("fonts/ratchicons.ttf") format("truetype"),
11-
url("fonts/ratchicons.svg#svgFontName") format("svg");
7+
src: url("../fonts/ratchicons.eot");
8+
src: url("../fonts/ratchicons.eot?#iefix") format("embedded-opentype"),
9+
url("../fonts/ratchicons.woff") format("woff"),
10+
url("../fonts/ratchicons.ttf") format("truetype"),
11+
url("../fonts/ratchicons.svg#svgFontName") format("svg");
1212
font-weight: normal;
1313
font-style: normal;
1414
}

0 commit comments

Comments
 (0)