Merge lp:~stephen-stewart/ulysses/import-grids into lp:ulysses

Proposed by Stephen Stewart
Status: Merged
Approved by: Stephen Stewart
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~stephen-stewart/ulysses/import-grids
Merge into: lp:ulysses
Diff against target: 118 lines (+36/-7)
5 files modified
.bzrignore (+1/-0)
Gruntfile.js (+23/-1)
bower.json (+6/-5)
package.json (+2/-1)
src/grids.css (+4/-0)
To merge this branch: bzr merge lp:~stephen-stewart/ulysses/import-grids
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
Review via email: mp+203568@code.launchpad.net

Commit message

import Pure grids

Description of the change

Import YUI Pure grids (which are also YUI3 grids) and replace pure- prefix with ues- prefix.
Retain Yahoo! copyright.

Additions to final grids.css can be added in src/grids.css

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2014-01-07 11:19:54 +0000
+++ .bzrignore 2014-01-28 15:20:49 +0000
@@ -4,3 +4,4 @@
4.sass-cache4.sass-cache
5public/*5public/*
6results/6results/
7tmp/
78
=== modified file 'Gruntfile.js'
--- Gruntfile.js 2014-01-07 11:56:26 +0000
+++ Gruntfile.js 2014-01-28 15:20:49 +0000
@@ -3,7 +3,7 @@
3 pkg: grunt.file.readJSON('package.json'),3 pkg: grunt.file.readJSON('package.json'),
44
5 clean: {5 clean: {
6 build: ['public/']6 build: ['tmp/', 'public/']
7 },7 },
88
9 csslint: {9 csslint: {
@@ -24,12 +24,17 @@
24 'bower_components/normalize-css/normalize.css',24 'bower_components/normalize-css/normalize.css',
25 'public/base.css'25 'public/base.css'
26 ]},26 ]},
27 {'public/grids.css': [
28 'tmp/grids-prefixed-*.css',
29 'public/grids.css'
30 ]},
27 // rollup31 // rollup
28 {'public/<%= pkg.name %>.css': [32 {'public/<%= pkg.name %>.css': [
29 'public/base.css',33 'public/base.css',
30 'public/buttons.css',34 'public/buttons.css',
31 'public/dropdowns.css',35 'public/dropdowns.css',
32 'public/forms.css',36 'public/forms.css',
37 'public/grids.css',
33 'public/layout.css',38 'public/layout.css',
34 'public/feedback.css',39 'public/feedback.css',
35 'public/navigation.css',40 'public/navigation.css',
@@ -90,6 +95,21 @@
90 }95 }
91 },96 },
9297
98 css_selectors: {
99 options: {
100 mutations: [
101 {search: /^\.pure/g, replace: '.ues'}
102 ]
103 },
104 pure_grids: {
105 files: [
106 {dest: 'tmp/grids-prefixed.css', src: 'bower_components/pure/grids.css'},
107 {dest: 'tmp/grids-prefixed-core.css', src: 'bower_components/pure/grids-core.css'},
108 {dest: 'tmp/grids-prefixed-units.css', src: 'bower_components/pure/grids-units.css'}
109 ]
110 }
111 },
112
93 phantomcss: {113 phantomcss: {
94 ulysses: {114 ulysses: {
95 src: [115 src: [
@@ -114,6 +134,7 @@
114 grunt.loadNpmTasks('grunt-contrib-watch');134 grunt.loadNpmTasks('grunt-contrib-watch');
115 grunt.loadNpmTasks('grunt-contrib-connect');135 grunt.loadNpmTasks('grunt-contrib-connect');
116 grunt.loadNpmTasks('grunt-rework');136 grunt.loadNpmTasks('grunt-rework');
137 grunt.loadNpmTasks('grunt-css-selectors');
117 grunt.loadNpmTasks('grunt-phantomcss');138 grunt.loadNpmTasks('grunt-phantomcss');
118139
119 grunt.registerTask('default',['run']);140 grunt.registerTask('default',['run']);
@@ -123,6 +144,7 @@
123 'clean',144 'clean',
124 'rework',145 'rework',
125 'csslint',146 'csslint',
147 'css_selectors',
126 'concat',148 'concat',
127 'cssmin'149 'cssmin'
128 ]);150 ]);
129151
=== modified file 'bower.json'
--- bower.json 2013-12-14 05:52:29 +0000
+++ bower.json 2014-01-28 15:20:49 +0000
@@ -1,7 +1,8 @@
1{1{
2 "name": "ulysses",2 "name": "ulysses",
3 "version": "0.0.1",3 "version": "0.0.1",
4 "devDependencies": {4 "dependencies": {
5 "normalize-css": "2.1.3"5 "pure": "~0.3.0",
6 }6 "normalize-css": "2.1.3"
7 }
7}8}
89
=== modified file 'package.json'
--- package.json 2014-01-07 11:19:54 +0000
+++ package.json 2014-01-28 15:20:49 +0000
@@ -30,6 +30,7 @@
30 "grunt-contrib-copy": "~0.4.1",30 "grunt-contrib-copy": "~0.4.1",
31 "bower": "~1.2.8",31 "bower": "~1.2.8",
32 "phantomjs": "~1.9.2-6",32 "phantomjs": "~1.9.2-6",
33 "grunt-phantomcss": "~0.2.0"33 "grunt-phantomcss": "~0.2.0",
34 "grunt-css-selectors": "~1.0.0"
34 }35 }
35}36}
3637
=== removed directory 'public'
=== added file 'src/grids.css'
--- src/grids.css 1970-01-01 00:00:00 +0000
+++ src/grids.css 2014-01-28 15:20:49 +0000
@@ -0,0 +1,4 @@
1/**
2 * Grids.css is an import of YUI Pure framework grids CSS which is prepended
3 * to this file, therefore anything to add to grids.css goes here.
4 */

Subscribers

People subscribed via source and target branches