Merge branch 'clean-config' into develop

rtorr · Jan 31, 2014 · 18d8565 · 18d8565
2 parents 55f0d82 + b2fccdf
commit 18d8565
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 99 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,18 +25,6 @@ module.exports = function (grunt) {
   grunt.initConfig({
     yeoman: yeomanConfig,
     watch: {
-      coffee: {
-        files: ['<%= yeoman.app %>/scripts/{,*/}*.coffee'],
-        tasks: ['coffee:dist']
-      },
-      coffeeTest: {
-        files: ['test/spec/{,*/}*.coffee'],
-        tasks: ['coffee:test']
-      },
-      compass: {
-        files: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
-        tasks: ['compass:server']
-      },
       livereload: {
         options: {
           livereload: LIVERELOAD_PORT
@@ -125,75 +113,6 @@ module.exports = function (grunt) {
         }
       }
     },
-    coffee: {
-      dist: {
-        files: [
-          {
-            expand: true,
-            cwd: '<%= yeoman.app %>/scripts',
-            src: '{,*/}*.coffee',
-            dest: '.tmp/scripts',
-            ext: '.js'
-          }
-        ]
-      },
-      test: {
-        files: [
-          {
-            expand: true,
-            cwd: 'test/spec',
-            src: '{,*/}*.coffee',
-            dest: '.tmp/spec',
-            ext: '.js'
-          }
-        ]
-      }
-    },
-    compass: {
-      options: {
-        sassDir: '<%= yeoman.app %>/styles',
-        cssDir: '.tmp/styles',
-        generatedImagesDir: '.tmp/images/generated',
-        imagesDir: '<%= yeoman.app %>/images',
-        javascriptsDir: '<%= yeoman.app %>/scripts',
-        fontsDir: '<%= yeoman.app %>/styles/fonts',
-        importPath: '<%= yeoman.app %>/bower_components',
-        httpImagesPath: '/images',
-        httpGeneratedImagesPath: '/images/generated',
-        httpFontsPath: '/styles/fonts',
-        relativeAssets: false
-      },
-      dist: {},
-      server: {
-        options: {
-          debugInfo: true
-        }
-      }
-    },
-    // not used since Uglify task does concat,
-    // but still available if needed
-    /*concat: {
-     dist: {}
-     },*/
-    requirejs: {
-      dist: {
-        // Options: https://github.com/jrburke/r.js/blob/master/build/example.build.js
-        options: {
-          // `name` and `out` is set by grunt-usemin
-          baseUrl: yeomanConfig.app + '/scripts',
-          optimize: 'none',
-          // TODO: Figure out how to make sourcemaps work with grunt-usemin
-          // https://github.com/yeoman/grunt-usemin/issues/30
-          //generateSourceMaps: true,
-          // required to support SourceMaps
-          // http://requirejs.org/docs/errors.html#sourcemapcomments
-          preserveLicenseComments: false,
-          useStrict: true,
-          wrap: true
-          //uglify2: {} // https://github.com/mishoo/UglifyJS2
-        }
-      }
-    },
     rev: {
       dist: {
         files: {
@@ -285,6 +204,15 @@ module.exports = function (grunt) {
     // Put files not handled in other tasks here
     copy: {
       dist: {
+        styles: {
+          expand: true,
+          cwd: '<%= yeoman.app %>',
+          dest: '.tmp/',
+          src: [
+            'styles/{,*/}*.css',
+            'bower_components/bootstrap/dist/css/bootstrap.min.css'
+          ]
+        },
         files: [
           {
             expand: true,
@@ -311,15 +239,11 @@ module.exports = function (grunt) {
     },
     concurrent: {
       server: [
-        'compass',
-        'coffee:dist'
+
       ],
       test: [
-        'coffee'
       ],
       dist: [
-        'coffee',
-        'compass',
         'imagemin',
         'svgmin',
         'htmlmin'

diff --git a/app/index.html b/app/index.html
@@ -6,8 +6,8 @@
   <title>Vim Cheat Sheet</title>
   <meta name="description" content="A mobile friendly VIM cheat sheet">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css">
   <!-- build:css({.tmp,app}) styles/main.css -->
+  <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
   <link rel="stylesheet" href="styles/main.css">
   <!-- endbuild -->
   <!-- build:js scripts/vendor/modernizr.js -->
@@ -19,12 +19,12 @@
   <div class="clearfix">
     <div class="container">
       <div class="row">
-        <div class="col-lg-12">
+        <div class="col-lg-12 col-md-12">
           <h1>VIM</h1>
         </div>
       </div> <!-- end row -->
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-4 col-md-4">
           <h2>Cursor movement</h2>
           <ul>
             <li><kbd>h</kbd> - move cursor left</li>
@@ -58,7 +58,7 @@ <h2>Insert mode - inserting/appending text</h2>
             <li><kbd>Esc</kbd> - exit insert mode</li>
           </ul>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-4 col-md-4">
           <h2>Editing</h2>
           <ul>
             <li><kbd>r</kbd> - replace a single character</li>
@@ -96,7 +96,7 @@ <h2>Visual commands</h2>
             <li><kbd>~</kbd> - switch case</li>
           </ul>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-4 col-md-4">
           <h2>Cut and paste</h2>
           <ul>
             <li><kbd>yy</kbd> - yank (copy) a line</li>
@@ -132,7 +132,7 @@ <h2>Search and replace</h2>
         </div>
       </div> <!-- end row -->
       <div class="row">
-        <div class="col-lg-4">
+        <div class="col-lg-4 col-md-4">
           <h2>Working with multiple files</h2>
           <ul>
             <li><kbd>:e</kbd> filename - edit a file in a new buffer</li>
@@ -147,7 +147,7 @@ <h2>Working with multiple files</h2>
             <li><kbd>Ctrl</kbd> + <kbd>wv</kbd> - split window vertically</li>
           </ul>
         </div>
-        <div class="col-lg-4">
+        <div class="col-lg-4 col-md-4">
           <h2>Tabs</h2>
           <ul>
             <li><kbd>:tabnew</kbd> filename or <kbd>:tabn</kbd> filename - open a file in a new tab</li>

diff --git a/app/styles/main.css b/app/styles/main.css
@@ -26,7 +26,6 @@ h2 {
 
 ul {
   padding: 0;
-  padding-left: 5px;
 }
 
 li {
@@ -38,9 +37,17 @@ li {
 }
 
 #footer {
+  margin-top: 15px;
   text-align: center;
 }
 
 kbd {
+  font-family: monospace,serif;
+  font-size: 1em;
+  color: #333;
+  background-color: #fafafa;
+  border-radius: 0;
+  box-shadow: none;
   font-weight: bold;
+  padding: 0;
 }
diff --git a/bower.json b/bower.json
@@ -2,9 +2,9 @@
   "name": "vim-cheat-sheet",
   "version": "0.0.0",
   "dependencies": {
-    "boostrap": "[email protected]:twbs/bootstrap.git#3.0.0-rc1",
     "modernizr": "~2.6.2",
-    "jquery": "~1.9.1"
+    "jquery": "~1.9.1",
+    "bootstrap": "~3.1.0"
   },
   "devDependencies": {}
 }
diff --git a/package.json b/package.json
@@ -6,16 +6,13 @@
     "grunt": "~0.4.1",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-concat": "~0.1.3",
-    "grunt-contrib-coffee": "~0.6.5",
     "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-compass": "~0.2.0",
     "grunt-contrib-jshint": "~0.4.1",
     "grunt-contrib-cssmin": "~0.6.0",
     "grunt-contrib-connect": "~0.2.0",
     "grunt-contrib-clean": "~0.4.0",
     "grunt-contrib-htmlmin": "~0.1.3",
     "grunt-bower-requirejs": "~0.4.1",
-    "grunt-contrib-requirejs": "~0.4.0",
     "grunt-contrib-imagemin": "~0.1.3",
     "grunt-contrib-watch": "~0.4.0",
     "grunt-rev": "~0.1.0",