ulysses

Merge lp:~stephen-stewart/ulysses/grid-bugfix into lp:ulysses

  1. grid-bugfix
  2. Merge into trunk
Proposed by Stephen Stewart
Status: Merged
Approved by: Stephen Stewart
Approved revision: 21
Merged at revision: 20
Proposed branch: lp:~stephen-stewart/ulysses/grid-bugfix
Merge into: lp:ulysses
Diff against target: 67 lines (+17/-11)
3 files modified
.bzrignore (+1/-1)
Gruntfile.js (+2/-4)
test/index.html (+14/-6)
To merge this branch: bzr merge lp:~stephen-stewart/ulysses/grid-bugfix
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
Review via email: mp+206157@code.launchpad.net

Commit message

fix grids

Description of the change

fix grids

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) :
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-28 11:19:19 +0000
3+++ .bzrignore 2014-02-13 11:38:47 +0000
4@@ -2,6 +2,6 @@
5 bower_components/
6 node_modules/
7 .sass-cache
8-public/*
9+public/
10 results/
11 tmp/
12
13=== modified file 'Gruntfile.js'
14--- Gruntfile.js 2014-01-28 11:19:19 +0000
15+++ Gruntfile.js 2014-02-13 11:38:47 +0000
16@@ -25,7 +25,7 @@
17 'public/base.css'
18 ]},
19 {'public/grids.css': [
20- 'tmp/grids-prefixed-*.css',
21+ 'tmp/grids-prefixed.css',
22 'public/grids.css'
23 ]},
24 // rollup
25@@ -103,9 +103,7 @@
26 },
27 pure_grids: {
28 files: [
29- {dest: 'tmp/grids-prefixed.css', src: 'bower_components/pure/grids.css'},
30- {dest: 'tmp/grids-prefixed-core.css', src: 'bower_components/pure/grids-core.css'},
31- {dest: 'tmp/grids-prefixed-units.css', src: 'bower_components/pure/grids-units.css'}
32+ {dest: 'tmp/grids-prefixed.css', src: 'bower_components/pure/grids.css'}
33 ]
34 }
35 },
36
37=== modified file 'test/index.html'
38--- test/index.html 2014-02-13 10:33:57 +0000
39+++ test/index.html 2014-02-13 11:38:47 +0000
40@@ -422,13 +422,21 @@
41
42
43 <section>
44-<h1>Layout</h1>
45+<h1>Layout, including Pure (ues-) Grids</h1>
46
47-<div class="ues-box ues-box-solid" style="width:320px">
48- <h3>A Headline</h3>
49- <p>lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore</p>
50- <h3>A Headline</h3>
51- <p>lorem ipsum dolor sit amet consectetur adipisicing elit</p>
52+<div class="ues-g-r">
53+ <div class="ues-u-1-5">
54+ <div class="ues-box ues-box-solid">
55+ <h3>A Headline</h3>
56+ <p>lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore</p>
57+ </div>
58+ </div>
59+ <div class="ues-u-4-5">
60+ <div class="ues-box">
61+ <h3>A Headline</h3>
62+ <p>lorem ipsum dolor sit amet consectetur adipisicing elit</p>
63+ </div>
64+ </div>
65 </div>
66
67 <h1>Feedback</h1>

Subscribers

People subscribed via source and target branches