Merge branch 'master' into ember

Conflicts: .gitignore .npmignore Gemfile.lock Gruntfile.js bower.json core/clientold/assets/fonts/icons.dev.svg core/clientold/assets/fonts/icons.eot core/clientold/assets/fonts/icons.svg core/clientold/assets/fonts/icons.ttf core/clientold/assets/fonts/icons.woff core/clientold/assets/sass/ie.scss core/clientold/assets/sass/layouts/auth.scss core/clientold/assets/sass/layouts/editor.scss core/clientold/assets/sass/layouts/errors.scss core/clientold/assets/sass/layouts/manage.scss core/clientold/assets/sass/layouts/plugins.scss core/clientold/assets/sass/layouts/settings.scss core/clientold/assets/sass/layouts/users.scss core/clientold/assets/sass/modules/animations.scss core/clientold/assets/sass/modules/breakpoint.scss core/clientold/assets/sass/modules/breakpoint/_context.scss core/clientold/assets/sass/modules/breakpoint/_helpers.scss core/clientold/assets/sass/modules/breakpoint/_no-query.scss core/clientold/assets/sass/modules/breakpoint/_parsers.scss core/clientold/assets/sass/modules/breakpoint/_respond-to.scss core/clientold/assets/sass/modules/breakpoint/parsers/_double.scss core/clientold/assets/sass/modules/breakpoint/parsers/_query.scss core/clientold/assets/sass/modules/breakpoint/parsers/_resolution.scss core/clientold/assets/sass/modules/breakpoint/parsers/_single.scss core/clientold/assets/sass/modules/breakpoint/parsers/_triple.scss core/clientold/assets/sass/modules/breakpoint/parsers/double/_default-pair.scss core/clientold/assets/sass/modules/breakpoint/parsers/double/_default.scss core/clientold/assets/sass/modules/breakpoint/parsers/double/_double-string.scss core/clientold/assets/sass/modules/breakpoint/parsers/resolution/_resolution.scss core/clientold/assets/sass/modules/breakpoint/parsers/single/_default.scss core/clientold/assets/sass/modules/breakpoint/parsers/triple/_default.scss core/clientold/assets/sass/modules/forms.scss core/clientold/assets/sass/modules/global.scss core/clientold/assets/sass/modules/icons.scss core/clientold/assets/sass/modules/mixins.scss core/clientold/assets/sass/modules/normalize.scss core/clientold/assets/sass/screen.scss
goodjobjohn · Mar 9, 2014 · 9415a23 · 9415a23
2 parents 18c4d3e + c4d4f66
commit 9415a23
Show file tree

Hide file tree

Showing 106 changed files with 109 additions and 8,912 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,20 +33,12 @@ projectFilesBackup
 .tmp
 
 
-.sass-cache/
 /core/clientold/tpl/hbs-tpl.js
 /core/clientold/assets/css
-/core/clientold/assets/sass/config.rb
-/core/clientold/assets/sass/layouts/config.rb
-/core/clientold/assets/sass/modules/config.rb
-/core/clientold/assets/sass/modules/bourbon
-/core/clientold/assets/sass/modules/bourbon/*
+/core/clientold/assets/fonts
+/core/clientold/assets/vendor
 /core/client/assets/css
-/core/client/assets/sass/config.rb
-/core/client/assets/sass/layouts/config.rb
-/core/client/assets/sass/modules/config.rb
-/core/client/assets/sass/modules/bourbon
-/core/client/assets/sass/modules/bourbon/*
+/core/client/assets/fonts
 /core/server/data/export/exported*
 /docs
 /_site

diff --git a/.npmignore b/.npmignore
@@ -12,7 +12,6 @@ content/apps/**
 !content/apps/README.md
 node_modules/**
 core/test/**
-core/clientold/assets/sass/**
 core/server/data/export/exported*
 **/*.db*
 *.db*
@@ -25,6 +24,5 @@ config.js
 CONTRIBUTING.md
 SECURITY.md
 .travis.yml
-Gemfile*
 *.html
 bower_components/**
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,6 @@ matrix:
   allow_failures:
     - env: DB=pg
 before_install:
-  - gem install bundler
   - git clone git://github.com/n1k0/casperjs.git ~/casperjs
   - cd ~/casperjs
   - git checkout tags/1.1-beta3

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -180,8 +180,6 @@ developing Ghost.
 **Pre-requisites:**
 
 * Node 0.10.x
-* Ruby >= 1.9.3
-* Bundler Ruby Gem (`gem install bundler`)
 * for running functional tests: phantomjs 1.9.x and casperjs 1.1.x
 ([instructions](https://github.com/TryGhost/Ghost/wiki/Functional-testing-with-PhantomJS-and-CasperJS))
 * for building docs: python and pygments
@@ -197,7 +195,7 @@ developing Ghost.
 	* If the install fails with errors to do with "node-gyp rebuild" or "SQLite3", follow the SQLite3 install
 instructions below this list
     * Usually if you're within vagrant, and have installed the guest plugins and updated that, this will not happen
-1. Run `grunt init` from the root - this runs bundler, generates the Bourbon directory, compiles SASS and compiles Handlebars templates
+1. Run `grunt init` from the root - copies assets and compiles Handlebars templates
 1. Run `npm start` from the root to start the server.
 
 If something goes wrong, please see the
@@ -207,7 +205,7 @@ If something goes wrong, please see the
 Whilst developing, you can take advantage of the [Grunt toolkit](https://github.com/TryGhost/Ghost/wiki/Grunt-Toolkit) to automatically compile assets, such as handlebar templates, stylesheets and javascripts. Some useful commands include:
 - `grunt dev` => Automatically compile assets in development environment
 - `grunt prod` => Automatically compile assets in production environment
-- `grunt watch` => Automatically compile sass and handlebars
+- `grunt watch` => Automatically compile handlebars
 
 Addresses for development:
 - Front-end => <http://localhost:2368>
@@ -220,8 +218,8 @@ or more of the following:
 
  * `npm install` - fetch any new dependencies
  * `git submodule update` - fetch the latest changes to Casper (the default theme)
- * `grunt` - will recompile handlebars templates and sass for the admin (as long as you have previously
-run `grunt init` to install bourbon)
+ * `grunt` - will recompile handlebars templates for the admin (as long as you have previously
+run `grunt init` to install bower dependencies)
  * delete content/data/*.db - delete the database and allow Ghost to recreate the fixtures
 
 ### Key Branches & Tags
@@ -230,12 +228,6 @@ run `grunt init` to install bourbon)
 release is here.
 - **[gh-pages](http://tryghost.github.io/Ghost)** is The Ghost Guide documentation for Getting Started with Ghost.
 
-### Compiling CSS & JavaScript
-
-A SASS compiler is required to work with the CSS in this project. You can either do this by running `grunt` from
-the command line - or by using a 3rd party app. We recommend [CodeKit](http://incident57.com/codekit/) (Paid/Mac)
-& [Scout](http://mhs.github.io/scout-app/) (Free/Mac/PC).
-You will need to have Ruby installed, as well as having run `gem install sass && gem install bourbon`.
 
 ## Grunt Toolkit
 
@@ -251,11 +243,6 @@ contributor.
 Sounds like you don't have our default theme - Casper, your content/themes/casper folder is probably empty.
 When cloning from GitHub be sure to use SSH and to run `git submodule update --init`.
 
-### I get "Syntax error: File to import not found or unreadable: bourbon/_bourbon."
-
-Sounds like you don't have the Ruby gem "bourbon" installed. Make sure you have Ruby, and then
-run `gem install bourbon`, and `grunt init`.
-
 ### Ghost doesn't do anything - I get a blank screen
 
 Sounds like you probably didn't run the right grunt command for building assets

diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -54,20 +54,6 @@ var path           = require('path'),
                     files: ['core/clientold/tpl/**/*.hbs'],
                     tasks: ['handlebars']
                 },
-                emberTemplates: {
-                    files: 'core/client/templates/**/*.hbs',
-                    tasks: ['emberTemplates']
-                },
-                ember: {
-                    files: [
-                        'core/client/**/*.js'
-                    ],
-                    tasks: ['transpile', 'concat_sourcemap']
-                },
-                sass: {
-                    files: ['<%= paths.adminOldAssets %>/sass/**/*'],
-                    tasks: ['sass:admin']
-                },
                 concat: {
                     files: [
                         'core/clientold/*.js',
@@ -84,8 +70,6 @@ var path           = require('path'),
                         'content/themes/casper/css/*.css',
                         // Theme JS
                         'content/themes/casper/js/*.js',
-                        // Admin CSS
-                        '<%= paths.adminOldAssets %>/css/*.css',
                         // Admin JS
                         'core/built/scripts/*.js'
                     ],
@@ -313,35 +297,10 @@ var path           = require('path'),
                 }
             },
 
-            // ### Config for grunt-contrib-sass
-            // Compile all the SASS!
-            sass: {
-                admin: {
-                    files: {
-                        '<%= paths.adminOldAssets %>/css/screen.css': '<%= paths.adminOldAssets %>/sass/screen.scss'
-                    }
-                },
-                compress: {
-                    options: {
-                        style: 'compressed'
-                    },
-                    files: {
-                        '<%= paths.adminOldAssets %>/css/screen.css': '<%= paths.adminOldAssets %>/sass/screen.scss'
-                    }
-                }
-            },
 
             // ### config for grunt-shell
             // command line tools
             shell: {
-                // run bundle
-                bundle: {
-                    command: 'bundle install'
-                },
-                // install bourbon
-                bourbon: {
-                    command: 'bourbon install --path <%= paths.adminOldAssets %>/sass/modules/'
-                },
                 bower: {
                     command: path.resolve(__dirname + '/node_modules/.bin/bower install'),
                     options: {
@@ -470,6 +429,16 @@ var path           = require('path'),
                         src: 'jquery.js',
                         dest: 'core/built/public/',
                         expand: true
+                    }, {
+                        cwd: 'bower_components/ghost-ui/dist/',
+                        src: ['**'],
+                        dest: 'core/client/assets/',
+                        expand: true
+                    }, {
+                        cwd: 'bower_components/ghost-ui/dist/',
+                        src: ['**'],
+                        dest: 'core/clientold/assets/',
+                        expand: true
                     }]
                 },
                 prod: {
@@ -478,6 +447,16 @@ var path           = require('path'),
                         src: 'jquery.js',
                         dest: 'core/built/public/',
                         expand: true
+                    }, {
+                        cwd: 'bower_components/ghost-ui/dist/',
+                        src: ['**'],
+                        dest: 'core/client/assets/',
+                        expand: true
+                    }, {
+                        cwd: 'bower_components/ghost-ui/dist/',
+                        src: ['**'],
+                        dest: 'core/clientold/assets/',
+                        expand: true
                     }]
                 },
                 release: {
@@ -486,6 +465,16 @@ var path           = require('path'),
                         src: 'jquery.js',
                         dest: 'core/built/public/',
                         expand: true
+                    }, {
+                        cwd: 'bower_components/ghost-ui/dist/',
+                        src: ['**'],
+                        dest: 'core/client/assets/',
+                        expand: true
+                    }, {
+                        cwd: 'bower_components/ghost-ui/dist/',
+                        src: ['**'],
+                        dest: 'core/clientold/assets/',
+                        expand: true
                     }, {
                         expand: true,
                         src: buildGlob,
@@ -947,15 +936,13 @@ var path           = require('path'),
 
         grunt.registerTask('release',
             'Release task - creates a final built zip\n' +
-            ' - Do our standard build steps (sass, handlebars, etc)\n' +
+            ' - Do our standard build steps (handlebars, etc)\n' +
             ' - Generate changelog for the past 14 releases\n' +
             ' - Copy files to release-folder/#/#{version} directory\n' +
             ' - Clean out unnecessary files (travis, .git*, .af*, .groc*)\n' +
             ' - Zip files in release-folder to dist-folder/#{version} directory',
             [
-                'shell:bourbon',
                 'shell:bower',
-                'sass:compress',
                 'handlebars',
                 'concat',
                 'uglify',
@@ -967,7 +954,6 @@ var path           = require('path'),
         grunt.registerTask('dev',
             'Dev Mode; watch files and restart server on changes',
             [
-                'sass:admin',
                 'handlebars',
                 'concat',
                 'emberBuild',
@@ -1012,16 +998,16 @@ var path           = require('path'),
 
         // ### Tools for building assets
 
-        grunt.registerTask('init', 'Prepare the project for development', ['shell:bundle', 'shell:bourbon', 'shell:bower', 'default']);
+        grunt.registerTask('init', 'Prepare the project for development', ['shell:bower', 'default']);
 
         // Before running in production mode
-        grunt.registerTask('prod', 'Build CSS, JS & templates for production', ['sass:compress', 'handlebars', 'concat', 'uglify', 'copy:prod']);
+        grunt.registerTask('prod', 'Build JS & templates for production', ['handlebars', 'concat', 'uglify', 'copy:prod']);
 
         // All tasks related to building the Ember client code
         grunt.registerTask('emberBuild', 'Build Ember JS & templates for development', ['emberTemplates:dev', 'transpile', 'concat_sourcemap']);
 
         // When you just say 'grunt'
-        grunt.registerTask('default', 'Build CSS, JS & templates for development', ['update_submodules', 'sass:compress', 'handlebars', 'concat', 'copy:dev', 'emberBuild']);
+        grunt.registerTask('default', 'Build JS & templates for development', ['update_submodules', 'handlebars', 'concat', 'copy:dev', 'emberBuild']);
     };
 
 module.exports = configureGrunt;
diff --git a/bower.json b/bower.json
@@ -7,6 +7,7 @@
         "ember": "~1.4.0",
         "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#9805033c178e7f857f801359664adb599444b430",
         "fastclick": "1.0.0",
+        "ghost-ui": "0.1.0",
         "handlebars": "~1.1.2",
         "ic-ajax": "1.0.1",
         "iCheck": "1.0.1",