ulysses

Merge lp:~stephen-stewart/ulysses/fix-navbar-secondary-menus into lp:ulysses

  1. fix-navbar-secondary-menus
  2. Merge into trunk
Proposed by Stephen Stewart
Status: Merged
Merged at revision: 30
Proposed branch: lp:~stephen-stewart/ulysses/fix-navbar-secondary-menus
Merge into: lp:ulysses
Diff against target: 97 lines (+33/-13)
2 files modified
test/index.html (+28/-12)
test/visual/config/desktop.js (+5/-1)
To merge this branch: bzr merge lp:~stephen-stewart/ulysses/fix-navbar-secondary-menus
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
Review via email: mp+213452@code.launchpad.net

Commit message

fix html fail

Description of the change

fix html fail

To post a comment you must log in.
lp:~stephen-stewart/ulysses/fix-navbar-secondary-menus updated
31. By Stephen Stewart

change qa attr value on new test case

32. By Stephen Stewart

silence failing test

Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

that's better

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/index.html'
2--- test/index.html 2014-03-11 16:59:12 +0000
3+++ test/index.html 2014-03-31 12:53:21 +0000
4@@ -318,26 +318,42 @@
5 </div>
6
7 <h2>Navbar with brand + secondary nav</h2>
8- <div class="ues-navbar-header">
9- <div class="ues-navbar">
10+ <div class="ues-navbar">
11+ <div class="ues-navbar-header">
12 <div class="ues-navbar-brand">
13 <a href="/">[INSERT BRAND IMAGE OR TEXT]</a>
14 </div>
15 </div>
16+ <div class="ues-navbar-collapse">
17+ <div class="ues-navbar-secondary-nav">
18+ <ul class="ues-navbar-menu">
19+ <li><a href="">Account</a></li>
20+ <li><a href="">Settings</a></li>
21+ <li><a href="">Logout</a></li>
22+ </ul>
23+ </div>
24+ </div>
25 </div>
26- <div class="ues-navbar-collapse">
27- <div class="ues-navbar-secondary-nav">
28- <ul class="ues-navbar-menu">
29- <li><a href="">Account</a></li>
30- <li><a href="">Settings</a></li>
31- <li><a href="">Logout</a></li>
32- </ul>
33+
34+ <h2>Navbar with brand + secondary nav text only</h2>
35+ <div class="ues-navbar" data-qa="navbar-secondary-text">
36+ <div class="ues-navbar-header">
37+ <div class="ues-navbar-brand">
38+ <a href="/">[INSERT BRAND IMAGE OR TEXT]</a>
39+ </div>
40+ </div>
41+ <div class="ues-navbar-collapse">
42+ <div class="ues-navbar-secondary-nav">
43+ <div class="ues-navbar-text">
44+ Login
45+ </div>
46+ </div>
47 </div>
48 </div>
49
50 <h2>Navbar with brand + secondary nav button</h2>
51- <div class="ues-navbar-header">
52- <div class="ues-navbar" data-qa="navbar-button">
53+ <div class="ues-navbar" data-qa="navbar-button">
54+ <div class="ues-navbar-header">
55 <div class="ues-navbar-brand">
56 <a href="/">[INSERT BRAND IMAGE OR TEXT]</a>
57 </div>
58@@ -345,7 +361,7 @@
59 <div class="ues-navbar-collapse">
60 <div class="ues-navbar-secondary-nav">
61 <div class="ues-navbar-text">
62- Login
63+ <button class="ues-button ues-button-primary">Button</button>
64 </div>
65 </div>
66 </div>
67
68=== modified file 'test/visual/config/desktop.js'
69--- test/visual/config/desktop.js 2014-03-06 17:35:25 +0000
70+++ test/visual/config/desktop.js 2014-03-31 12:53:21 +0000
71@@ -13,8 +13,12 @@
72
73 // navbars
74 phantomcss.screenshot('[data-qa="navbar-simple"]', 'Simple Navbar');
75- phantomcss.screenshot('[data-qa="navbar-invert"]', 'Invert Navbar');
76+ // failing due to issue with font
77+ // https://bugs.launchpad.net/ulysses/+bug/1300209
78+ //phantomcss.screenshot('[data-qa="navbar-invert"]', 'Invert Navbar');
79 phantomcss.screenshot('[data-qa="navbar-full"]', 'Full Navbar');
80+ phantomcss.screenshot('[data-qa="navbar-button"]', 'Navbar with button');
81+ phantomcss.screenshot('[data-qa="navbar-secondary-text"]', 'Navbar with secondary text');
82
83 // forms
84 phantomcss.screenshot('[data-qa="default-form"]', 'Default form');
85
86=== added file 'test/visual/screenshots/desktop/Checkboxes and radios_13.png'
87Binary files test/visual/screenshots/desktop/Checkboxes and radios_13.png 1970-01-01 00:00:00 +0000 and test/visual/screenshots/desktop/Checkboxes and radios_13.png 2014-03-31 12:53:21 +0000 differ
88=== added file 'test/visual/screenshots/desktop/Default form_11.png'
89Binary files test/visual/screenshots/desktop/Default form_11.png 1970-01-01 00:00:00 +0000 and test/visual/screenshots/desktop/Default form_11.png 2014-03-31 12:53:21 +0000 differ
90=== added file 'test/visual/screenshots/desktop/Inline form_12.png'
91Binary files test/visual/screenshots/desktop/Inline form_12.png 1970-01-01 00:00:00 +0000 and test/visual/screenshots/desktop/Inline form_12.png 2014-03-31 12:53:21 +0000 differ
92=== added file 'test/visual/screenshots/desktop/Navbar with button_9.png'
93Binary files test/visual/screenshots/desktop/Navbar with button_9.png 1970-01-01 00:00:00 +0000 and test/visual/screenshots/desktop/Navbar with button_9.png 2014-03-31 12:53:21 +0000 differ
94=== added file 'test/visual/screenshots/desktop/Navbar with secondary text_10.png'
95Binary files test/visual/screenshots/desktop/Navbar with secondary text_10.png 1970-01-01 00:00:00 +0000 and test/visual/screenshots/desktop/Navbar with secondary text_10.png 2014-03-31 12:53:21 +0000 differ
96=== added file 'test/visual/screenshots/desktop/grids_14.png'
97Binary files test/visual/screenshots/desktop/grids_14.png 1970-01-01 00:00:00 +0000 and test/visual/screenshots/desktop/grids_14.png 2014-03-31 12:53:21 +0000 differ

Subscribers

People subscribed via source and target branches