Browse Source

Pulled from upstream-master, fixed merge conflicts.

pull/323/head
Achal Varma 11 years ago
parent
commit
691a617a11
  1. 8
      .gitattributes
  2. 4
      .gitignore
  3. 53
      Gruntfile.js
  4. 2
      _config.yml
  5. 6
      dist/ratchet-theme-android.css
  6. 4
      dist/ratchet-theme-ios.css
  7. 4
      dist/ratchet.css
  8. 4
      dist/ratchet.js
  9. 16
      dist/ratchet.min.css
  10. 5
      dist/ratchet.min.js
  11. 2
      docs/_includes/footer.html
  12. 2
      docs/_includes/header.html
  13. 24
      docs/assets/css/docs.css
  14. 14
      docs/components.html
  15. 6
      docs/dist/ratchet-theme-android.css
  16. 4
      docs/dist/ratchet-theme-ios.css
  17. 4
      docs/dist/ratchet.css
  18. 4
      docs/dist/ratchet.js
  19. 16
      docs/dist/ratchet.min.css
  20. 5
      docs/dist/ratchet.min.js
  21. 6
      docs/examples.html
  22. 24
      docs/examples/app-movies/index.html
  23. 10
      package.json
  24. 8
      sass/docs.scss
  25. 2
      sass/theme-android.scss

8
.gitattributes vendored

@ -0,0 +1,8 @@
# Enforce Unix newlines
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.md text eol=lf
*.scss text eol=lf
*.yml text eol=lf

4
.gitignore vendored

@ -32,3 +32,7 @@ nbproject
.idea .idea
node_modules node_modules
_site _site
# grunt-html-validation
validation-report.json
validation-status.json

53
Gruntfile.js

@ -25,9 +25,9 @@ module.exports = function(grunt) {
' * =====================================================\n' + ' * =====================================================\n' +
' * Ratchet v<%= pkg.version %>\n' + ' * Ratchet v<%= pkg.version %>\n' +
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' + ' * Licensed under <%= pkg.license %>.\n' +
' *\n' + ' *\n' +
' * V<%= pkg.version %> designed by @connors.\n' + ' * v<%= pkg.version %> designed by @connors.\n' +
' * =====================================================\n' + ' * =====================================================\n' +
' */\n', ' */\n',
@ -79,15 +79,21 @@ module.exports = function(grunt) {
}, },
cssmin: { cssmin: {
combine: { minify: {
options: {
banner: '', // set to empty ; see bellow
keepSpecialComments: '*', // set to '*' because we already add the banner in sass
report: 'min'
},
files: { files: {
'dist/<%= pkg.name %>.min.css': ['dist/<%= pkg.name %>.css'] 'dist/<%= pkg.name %>.min.css': 'dist/<%= pkg.name %>.css'
} }
} }
}, },
uglify: { uglify: {
options: { options: {
banner: '<%= banner %>',
report: 'min' report: 'min'
}, },
ratchet: { ratchet: {
@ -96,21 +102,6 @@ module.exports = function(grunt) {
} }
}, },
usebanner: {
dist: {
options: {
position: 'top',
banner: '<%= banner %>'
},
files: {
src: [
'dist/<%= pkg.name %>.min.js',
'dist/<%= pkg.name %>.min.css'
]
}
}
},
watch: { watch: {
scripts: { scripts: {
files: [ files: [
@ -118,6 +109,26 @@ module.exports = function(grunt) {
], ],
tasks: ['sass'] tasks: ['sass']
} }
},
jekyll: {
docs: {}
},
validation: {
options: {
charset: 'utf-8',
doctype: 'HTML5',
failHard: true,
reset: true,
relaxerror: [
'Bad value apple-mobile-web-app-title for attribute name on element meta: Keyword apple-mobile-web-app-title is not registered.',
'Attribute ontouchstart not allowed on element body at this point.'
]
},
files: {
src: '_site/**/*.html'
}
} }
}); });
@ -125,10 +136,10 @@ module.exports = function(grunt) {
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'}); require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
// Default task(s). // Default task(s).
grunt.registerTask('banner', ['usebanner']);
grunt.registerTask('dist-css', ['sass', 'cssmin']); grunt.registerTask('dist-css', ['sass', 'cssmin']);
grunt.registerTask('dist-js', ['concat', 'uglify']); grunt.registerTask('dist-js', ['concat', 'uglify']);
grunt.registerTask('dist', ['dist-css', 'dist-js', 'banner', 'copy']); grunt.registerTask('dist', ['dist-css', 'dist-js', 'copy']);
grunt.registerTask('validate-html', ['jekyll', 'validation']);
grunt.registerTask('default', ['dist']); grunt.registerTask('default', ['dist']);
grunt.registerTask('build', ['dist']); grunt.registerTask('build', ['dist']);
}; };

2
_config.yml

@ -12,5 +12,3 @@ permalink: pretty
# Server # Server
source: ./docs source: ./docs
port: 4000 port: 4000
baseurl: /
url: http://localhost:4000

6
dist/ratchet-theme-android.css vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */
@ -467,7 +467,7 @@ textarea,
} }
.backdrop { .backdrop {
background-color: none; background-color: transparent;
} }
.popover .bar { .popover .bar {

4
dist/ratchet-theme-ios.css vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */

4
dist/ratchet.css vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */

4
dist/ratchet.js vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */
/* ---------------------------------- /* ----------------------------------

16
dist/ratchet.min.css vendored

File diff suppressed because one or more lines are too long

5
dist/ratchet.min.js vendored

File diff suppressed because one or more lines are too long

2
docs/_includes/footer.html

@ -2,7 +2,7 @@
<!-- Social links --> <!-- Social links -->
<ul class="social"> <ul class="social">
<li> <li>
<iframe src="http://ghbtns.com/github-btn.html?user=twbs&repo=ratchet&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe> <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=ratchet&amp;type=watch&amp;count=true" width="100" height="20"></iframe>
</li> </li>
<li> <li>
<a data-ignore="push" href="https://twitter.com/share" class="twitter-share-button" data-url="http://goratchet.com" data-text="Ratchet &#8211; Build mobile apps with simple HTML, CSS, and JS components." data-via="GoRatchet">Tweet</a> <a data-ignore="push" href="https://twitter.com/share" class="twitter-share-button" data-url="http://goratchet.com" data-text="Ratchet &#8211; Build mobile apps with simple HTML, CSS, and JS components." data-via="GoRatchet">Tweet</a>

2
docs/_includes/header.html

@ -21,7 +21,7 @@
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/img/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/img/apple-touch-icon-114x114.png">
<script src="http://code.jquery.com/jquery-1.7.2.min.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../dist/ratchet.js"></script> <script src="../dist/ratchet.js"></script>
<script src="../assets/js/docs.js"></script> <script src="../assets/js/docs.js"></script>
<script src="../assets/js/fingerblast.js"></script> <script src="../assets/js/fingerblast.js"></script>

24
docs/assets/css/docs.css

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */
@ -76,13 +76,6 @@ body {
transform: translateX(-50%); transform: translateX(-50%);
} }
.version {
margin-top: 15px;
text-align: center;
margin-bottom: 0;
color: #777;
}
.docs-nav .docs-nav-trigger { .docs-nav .docs-nav-trigger {
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
@ -156,9 +149,6 @@ body {
-moz-transition: all 0.2s linear; -moz-transition: all 0.2s linear;
transition: all 0.2s linear; transition: all 0.2s linear;
} }
.docs-header-content .version {
color: #b983a6;
}
.docs-header-content .btn:hover { .docs-header-content .btn:hover {
background-color: #fff; background-color: #fff;
-webkit-box-shadow: 0 0 50px rgba(255, 255, 255, 0.3); -webkit-box-shadow: 0 0 50px rgba(255, 255, 255, 0.3);
@ -353,6 +343,11 @@ body {
color: rgba(255, 255, 255, 0.8); color: rgba(255, 255, 255, 0.8);
} }
.github-btn {
border: 0;
overflow: hidden;
}
.docs-component-toolbar { .docs-component-toolbar {
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
@ -405,7 +400,6 @@ body {
} }
.docs-example-group .example-wrap .example { .docs-example-group .example-wrap .example {
display: block; display: block;
padding: 4px;
overflow: hidden; overflow: hidden;
padding: 3px; padding: 3px;
width: 100%; width: 100%;
@ -796,7 +790,7 @@ hr {
} }
.docs-footer .social .twitter-follow-button { .docs-footer .social .twitter-follow-button {
margin-top: 0px; margin-top: 0;
} }
.step-title { .step-title {
@ -1971,7 +1965,7 @@ hr {
transform: scale(1); transform: scale(1);
} }
.platform-android .backdrop { .platform-android .backdrop {
background-color: none; background-color: transparent;
} }
.platform-android .popover .bar { .platform-android .popover .bar {
border-radius: 0; border-radius: 0;

14
docs/components.html

@ -508,7 +508,7 @@ title: Components &middot; Ratchet
<ul class="table-view"> <ul class="table-view">
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right"> <a class="push-right">
<img class="media-object pull-left" src="http://placehold.it/42x42"> <img class="media-object pull-left" src="http://placehold.it/42x42" alt="Placeholder image">
<div class="media-body"> <div class="media-body">
Item 1 Item 1
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore. Lorem ipsum dolor sit amet.</p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore. Lorem ipsum dolor sit amet.</p>
@ -517,7 +517,7 @@ title: Components &middot; Ratchet
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right"> <a class="push-right">
<img class="media-object pull-left" src="http://placehold.it/42x42"> <img class="media-object pull-left" src="http://placehold.it/42x42" alt="Placeholder image">
<div class="media-body"> <div class="media-body">
Item 1 Item 1
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore. Lorem ipsum dolor sit amet.</p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore. Lorem ipsum dolor sit amet.</p>
@ -526,7 +526,7 @@ title: Components &middot; Ratchet
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right"> <a class="push-right">
<img class="media-object pull-left" src="http://placehold.it/42x42"> <img class="media-object pull-left" src="http://placehold.it/42x42" alt="Placeholder image">
<div class="media-body"> <div class="media-body">
Item 1 Item 1
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore. Lorem ipsum dolor sit amet.</p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore. Lorem ipsum dolor sit amet.</p>
@ -772,7 +772,7 @@ title: Components &middot; Ratchet
</article> </article>
<!-- Buttons --> <!-- Buttons -->
<article class="component" id="buttons"> <article class="component" id="buttonsWithIcons">
<h3 class="component-title">Buttons with icons</h3> <h3 class="component-title">Buttons with icons</h3>
<p class="component-description">Ratchicons work inside buttons too.</p> <p class="component-description">Ratchicons work inside buttons too.</p>
@ -1149,17 +1149,17 @@ document
<div class="slider" id="mySlider"> <div class="slider" id="mySlider">
<div class="slide-group"> <div class="slide-group">
<div class="slide"> <div class="slide">
<img src="../assets/img/slide-1.png"> <img src="../assets/img/slide-1.png" alt="Mountain and sky">
<span class="slide-text"> <span class="slide-text">
<span class="icon icon-left-nav"></span> <span class="icon icon-left-nav"></span>
Slide me Slide me
</span> </span>
</div> </div>
<div class="slide"> <div class="slide">
<img src="../assets/img/slide-2.png"> <img src="../assets/img/slide-2.png" alt="Giant mecha">
</div> </div>
<div class="slide"> <div class="slide">
<img src="../assets/img/slide-3.png"> <img src="../assets/img/slide-3.png" alt="Big Ben">
</div> </div>
</div> </div>
</div> </div>

6
docs/dist/ratchet-theme-android.css vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */
@ -467,7 +467,7 @@ textarea,
} }
.backdrop { .backdrop {
background-color: none; background-color: transparent;
} }
.popover .bar { .popover .bar {

4
docs/dist/ratchet-theme-ios.css vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */

4
docs/dist/ratchet.css vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */

4
docs/dist/ratchet.js vendored

@ -2,9 +2,9 @@
* ===================================================== * =====================================================
* Ratchet v2.0.0 * Ratchet v2.0.0
* Copyright 2014 Connor Sears * Copyright 2014 Connor Sears
* Licensed under http://www.opensource.org/licenses/MIT * Licensed under MIT.
* *
* V2.0.0 designed by @connors. * v2.0.0 designed by @connors.
* ===================================================== * =====================================================
*/ */
/* ---------------------------------- /* ----------------------------------

16
docs/dist/ratchet.min.css vendored

File diff suppressed because one or more lines are too long

5
docs/dist/ratchet.min.js vendored

File diff suppressed because one or more lines are too long

6
docs/examples.html

@ -26,19 +26,19 @@ title: Examples &middot; Ratchet
<div class="docs-example-group"> <div class="docs-example-group">
<div class="example-wrap"> <div class="example-wrap">
<a class="example" href="../examples/app-movies" data-ignore="push"> <a class="example" href="../examples/app-movies" data-ignore="push">
<img src="../assets/img/example.png"> <img src="../assets/img/example.png" alt="Movie finder app example">
</a> </a>
<h5>Movie finder</h5> <h5>Movie finder</h5>
</div> </div>
<div class="example-wrap"> <div class="example-wrap">
<a class="example" href="../examples/app-ios-mail" data-ignore="push"> <a class="example" href="../examples/app-ios-mail" data-ignore="push">
<img src="../assets/img/example-ios.png"> <img src="../assets/img/example-ios.png" alt="iOS mail app example">
</a> </a>
<h5>iOS mail app</h5> <h5>iOS mail app</h5>
</div> </div>
<div class="example-wrap"> <div class="example-wrap">
<a class="example" href="../examples/app-android-notes" data-ignore="push"> <a class="example" href="../examples/app-android-notes" data-ignore="push">
<img src="../assets/img/example-android.png"> <img src="../assets/img/example-android.png" alt="Android notes app example">
</a> </a>
<h5>Android notes app</h5> <h5>Android notes app</h5>
</div> </div>

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

@ -28,13 +28,13 @@
<div class="slider"> <div class="slider">
<div class="slide-group"> <div class="slide-group">
<div class="slide"> <div class="slide">
<img src="img/argo.png"> <img src="img/argo.png" alt="Argo">
</div> </div>
<div class="slide"> <div class="slide">
<img src="img/skyfall.png"> <img src="img/skyfall.png" alt="Skyfall">
</div> </div>
<div class="slide"> <div class="slide">
<img src="img/ralph.png"> <img src="img/ralph.png" alt="Wreck-It Ralph">
</div> </div>
</div> </div>
</div> </div>
@ -43,7 +43,7 @@
<li class="table-view-cell table-view-divider">Recommended movies</li> <li class="table-view-cell table-view-divider">Recommended movies</li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Argo's poster">
<div class="media-body"> <div class="media-body">
Argo Argo
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -52,7 +52,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Skyfall's poster">
<div class="media-body"> <div class="media-body">
Skyfall: 007 Skyfall: 007
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -61,7 +61,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Wreck-it Ralph's poster">
<div class="media-body"> <div class="media-body">
Wreck-it Ralph Wreck-it Ralph
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -70,7 +70,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Argo's poster">
<div class="media-body"> <div class="media-body">
Argo Argo
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -79,7 +79,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Skyfall's poster">
<div class="media-body"> <div class="media-body">
Skyfall: 007 Skyfall: 007
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -88,7 +88,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Wreck-it Ralph's poster">
<div class="media-body"> <div class="media-body">
Wreck-it Ralph Wreck-it Ralph
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -97,7 +97,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Argo's poster">
<div class="media-body"> <div class="media-body">
Argo Argo
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -106,7 +106,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Skyfall's poster">
<div class="media-body"> <div class="media-body">
Skyfall: 007 Skyfall: 007
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>
@ -115,7 +115,7 @@
</li> </li>
<li class="table-view-cell media"> <li class="table-view-cell media">
<a class="push-right" href="choose-theater.html" data-transition="slide-in"> <a class="push-right" href="choose-theater.html" data-transition="slide-in">
<img class="media-object pull-left" src="http://placehold.it/64x64"> <img class="media-object pull-left" src="http://placehold.it/64x64" alt="Placeholder image for Wreck-it Ralph's poster">
<div class="media-body"> <div class="media-body">
Wreck-it Ralph Wreck-it Ralph
<p>Lorem ipsum dolor sit amet, consectetur.</p> <p>Lorem ipsum dolor sit amet, consectetur.</p>

10
package.json

@ -3,7 +3,6 @@
"description": "Build native apps with simple HTML, CSS, and JS components.", "description": "Build native apps with simple HTML, CSS, and JS components.",
"version": "2.0.0", "version": "2.0.0",
"keywords": [ "keywords": [
"ratchet",
"css", "css",
"ios", "ios",
"native", "native",
@ -20,15 +19,9 @@
"bugs": { "bugs": {
"url": "https://github.com/twbs/ratchet/issues" "url": "https://github.com/twbs/ratchet/issues"
}, },
"licenses": [ "license": "MIT",
{
"type": "MIT",
"url": "http://www.opensource.org/licenses/MIT"
}
],
"devDependencies": { "devDependencies": {
"grunt": "~0.4.2", "grunt": "~0.4.2",
"grunt-banner": "~0.2.0",
"grunt-contrib-concat": "~0.3.0", "grunt-contrib-concat": "~0.3.0",
"grunt-contrib-copy": "~0.5.0", "grunt-contrib-copy": "~0.5.0",
"grunt-contrib-cssmin": "~0.8.0", "grunt-contrib-cssmin": "~0.8.0",
@ -37,6 +30,7 @@
"grunt-contrib-sass": "~0.7.1", "grunt-contrib-sass": "~0.7.1",
"grunt-contrib-uglify": "~0.3.0", "grunt-contrib-uglify": "~0.3.0",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.5.3",
"grunt-html-validation": "~0.1.13",
"grunt-jekyll": "~0.4.1", "grunt-jekyll": "~0.4.1",
"load-grunt-tasks": "~0.4.0" "load-grunt-tasks": "~0.4.0"
} }

8
sass/docs.scss

@ -336,6 +336,11 @@ body {
} }
} }
// Style the GitHub buttons via CSS instead of inline attributes
.github-btn {
border: 0;
overflow: hidden;
}
// Platform toggle // Platform toggle
// -------------------------------------------------- // --------------------------------------------------
@ -391,7 +396,6 @@ body {
} }
.example { .example {
display: block; display: block;
padding: 4px;
overflow: hidden; overflow: hidden;
padding: 3px; padding: 3px;
width: 100%; width: 100%;
@ -798,7 +802,7 @@ hr {
// Social // Social
.docs-footer { .docs-footer {
.social .twitter-follow-button { .social .twitter-follow-button {
margin-top: 0px; margin-top: 0;
} }
} }

2
sass/theme-android.scss

@ -623,7 +623,7 @@ textarea,
// Remove the popover's backdrop // Remove the popover's backdrop
.backdrop { .backdrop {
background-color: none; background-color: transparent;
} }
// Popovers with bars // Popovers with bars

Loading…
Cancel
Save