Merge lp:~quam-plures-core/quam-plures/qp-validate_toolbar into lp:quam-plures

Proposed by Yabs
Status: Merged
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/qp-validate_toolbar
Merge into: lp:quam-plures
Diff against target: 46 lines (+3/-4)
3 files modified
inc/_core/ui/_menu.class.php (+1/-1)
rsc/css/basic.css (+2/-2)
templates/_toolbar.inc.php (+0/-1)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/qp-validate_toolbar
Reviewer Review Type Date Requested Status
EdB Approve
Review via email: mp+21127@code.launchpad.net

Description of the change

Validated toolbar

To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

Tested and found to be awesome. Will merge immediately given that waiting for any other core team members to do their code review is not a good idea.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'inc/_core/ui/_menu.class.php'
2--- inc/_core/ui/_menu.class.php 2009-12-19 19:51:52 +0000
3+++ inc/_core/ui/_menu.class.php 2010-03-11 09:45:27 +0000
4@@ -332,7 +332,7 @@
5 'afterEach' => '</li>',
6 'beforeEachSel' => '<li class="current">',
7 'afterEachSel' => '</li>',
8- 'separator' => '<li class="separator"><a><hr /></a></li>',
9+ 'separator' => '<li class="separator"><a href="#"><span>&nbsp;</span></a></li>',
10 'disabled_class' => 'disabled',
11 '_props' => array(
12 'recurse' => 'always', // options are: 'no' 'always' or 'intoselected'
13
14=== modified file 'rsc/css/basic.css'
15--- rsc/css/basic.css 2010-03-06 16:19:45 +0000
16+++ rsc/css/basic.css 2010-03-11 09:45:27 +0000
17@@ -240,7 +240,7 @@
18 .sf-menu li.separator a:hover {
19 background-color: ThreeDFace;
20 }
21-.sf-menu hr {
22+.sf-menu .separator span {
23 height: 0px;
24 display: block;
25 padding: 0;
26@@ -250,7 +250,7 @@
27 border-bottom: 1px solid ThreeDHighlight;
28 width: 100%;
29 }
30-.toolbar_msie hr {
31+.toolbar_msie .separator span {
32 position: relative;
33 top: -6px;
34 margin: 6px 0 0;
35
36=== modified file 'templates/_toolbar.inc.php'
37--- templates/_toolbar.inc.php 2010-03-06 16:19:45 +0000
38+++ templates/_toolbar.inc.php 2010-03-11 09:45:27 +0000
39@@ -79,7 +79,6 @@
40 }
41 }
42 ?>
43-</ul>
44 </div>
45
46 </div>

Subscribers

People subscribed via source and target branches