ulysses

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

  1. import-grids
  2. Merge into trunk
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
1=== modified file '.bzrignore'
2--- .bzrignore 2014-01-07 11:19:54 +0000
3+++ .bzrignore 2014-01-28 15:20:49 +0000
4@@ -4,3 +4,4 @@
5 .sass-cache
6 public/*
7 results/
8+tmp/
9
10=== modified file 'Gruntfile.js'
11--- Gruntfile.js 2014-01-07 11:56:26 +0000
12+++ Gruntfile.js 2014-01-28 15:20:49 +0000
13@@ -3,7 +3,7 @@
14 pkg: grunt.file.readJSON('package.json'),
15
16 clean: {
17- build: ['public/']
18+ build: ['tmp/', 'public/']
19 },
20
21 csslint: {
22@@ -24,12 +24,17 @@
23 'bower_components/normalize-css/normalize.css',
24 'public/base.css'
25 ]},
26+ {'public/grids.css': [
27+ 'tmp/grids-prefixed-*.css',
28+ 'public/grids.css'
29+ ]},
30 // rollup
31 {'public/<%= pkg.name %>.css': [
32 'public/base.css',
33 'public/buttons.css',
34 'public/dropdowns.css',
35 'public/forms.css',
36+ 'public/grids.css',
37 'public/layout.css',
38 'public/feedback.css',
39 'public/navigation.css',
40@@ -90,6 +95,21 @@
41 }
42 },
43
44+ css_selectors: {
45+ options: {
46+ mutations: [
47+ {search: /^\.pure/g, replace: '.ues'}
48+ ]
49+ },
50+ pure_grids: {
51+ files: [
52+ {dest: 'tmp/grids-prefixed.css', src: 'bower_components/pure/grids.css'},
53+ {dest: 'tmp/grids-prefixed-core.css', src: 'bower_components/pure/grids-core.css'},
54+ {dest: 'tmp/grids-prefixed-units.css', src: 'bower_components/pure/grids-units.css'}
55+ ]
56+ }
57+ },
58+
59 phantomcss: {
60 ulysses: {
61 src: [
62@@ -114,6 +134,7 @@
63 grunt.loadNpmTasks('grunt-contrib-watch');
64 grunt.loadNpmTasks('grunt-contrib-connect');
65 grunt.loadNpmTasks('grunt-rework');
66+ grunt.loadNpmTasks('grunt-css-selectors');
67 grunt.loadNpmTasks('grunt-phantomcss');
68
69 grunt.registerTask('default',['run']);
70@@ -123,6 +144,7 @@
71 'clean',
72 'rework',
73 'csslint',
74+ 'css_selectors',
75 'concat',
76 'cssmin'
77 ]);
78
79=== modified file 'bower.json'
80--- bower.json 2013-12-14 05:52:29 +0000
81+++ bower.json 2014-01-28 15:20:49 +0000
82@@ -1,7 +1,8 @@
83 {
84- "name": "ulysses",
85- "version": "0.0.1",
86- "devDependencies": {
87- "normalize-css": "2.1.3"
88- }
89+ "name": "ulysses",
90+ "version": "0.0.1",
91+ "dependencies": {
92+ "pure": "~0.3.0",
93+ "normalize-css": "2.1.3"
94+ }
95 }
96
97=== modified file 'package.json'
98--- package.json 2014-01-07 11:19:54 +0000
99+++ package.json 2014-01-28 15:20:49 +0000
100@@ -30,6 +30,7 @@
101 "grunt-contrib-copy": "~0.4.1",
102 "bower": "~1.2.8",
103 "phantomjs": "~1.9.2-6",
104- "grunt-phantomcss": "~0.2.0"
105+ "grunt-phantomcss": "~0.2.0",
106+ "grunt-css-selectors": "~1.0.0"
107 }
108 }
109
110=== removed directory 'public'
111=== added file 'src/grids.css'
112--- src/grids.css 1970-01-01 00:00:00 +0000
113+++ src/grids.css 2014-01-28 15:20:49 +0000
114@@ -0,0 +1,4 @@
115+/**
116+ * Grids.css is an import of YUI Pure framework grids CSS which is prepended
117+ * to this file, therefore anything to add to grids.css goes here.
118+ */

Subscribers

People subscribed via source and target branches