Merge lp:~stephen-stewart/ulysses/button-text-color-in-navbar into lp:ulysses

Proposed by Stephen Stewart on 2014-10-17
Status: Merged
Approved by: James Westby on 2014-10-20
Approved revision: 51
Merged at revision: 51
Proposed branch: lp:~stephen-stewart/ulysses/button-text-color-in-navbar
Merge into: lp:ulysses
Diff against target: 63 lines (+8/-6)
4 files modified
public/buttons.css (+1/-1)
public/ulysses.css (+1/-1)
src/buttons.css (+1/-4)
test/index.html (+5/-0)
To merge this branch: bzr merge lp:~stephen-stewart/ulysses/button-text-color-in-navbar
Reviewer Review Type Date Requested Status
James Westby (community) 2014-10-17 Approve on 2014-10-20
Review via email: mp+238779@code.launchpad.net

Commit message

Text colour in anchor buttons was wrong when used in a context that didn't match what the button expected, so explicity set text color for buttons.

Description of the change

Text colour in anchor buttons was wrong when used in a context that didn't match what the button expected, so explicity set text color for buttons.

To post a comment you must log in.
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'public/buttons.css'
2--- public/buttons.css 2014-10-09 14:00:18 +0000
3+++ public/buttons.css 2014-10-18 00:08:20 +0000
4@@ -1,1 +1,1 @@
5-.ues-button{background-color:#dedede;border-radius:3px;display:inline-block;font-weight:300;font-size:13px;line-height:20px;padding:6px 19px;text-align:center;vertical-align:baseline;text-transform:uppercase;border:none}.ues-button:hover{background-color:#e6e6e6}.ues-button:focus{box-shadow:#f7f6f5 0 0 0 1px}.ues-button:focus,.ues-button:active{background-color:#e6e6e6}.ues-button-primary{background-color:#dd4814;color:#fff;border-color:#ad2e03}.ues-button-primary .ues-icon-caret{fill:#fff}.ues-button-primary:hover{background-color:#f28a45}.ues-button-primary:focus,.ues-button-primary:active{background-color:#dd4814;border-color:#333}.ues-button-tertiary{background-color:#fff;background-image:none;padding-top:5px;padding-bottom:5px;border:1px solid #c8c8c8}.ues-button-tertiary:hover{background-color:#e6e6e6;background-image:none;border-color:#cdcdcd}.ues-button-tertiary:focus,.ues-button-tertiary:active{background-color:#e6e6e6;background-image:none;border-color:#dd4814}.ues-button-search{background-color:transparent;background-image:none;border:none;border-left:1px solid #eee}.ues-button-search:hover{background-color:#f0f0f0;border-color:#dedede}.ues-button-search:focus,.ues-button-search:active{border-color:#c8c8c8;background-color:#dedede}a.ues-button{color:inherit}.ues-button-small{font-size:11px;padding:1px 10px;font-weight:400}.ues-button-large{font-size:16px;padding:14px 38px}.ues-button-block{margin:.5em 0;display:block;width:100%}.ues-button-icon{padding-left:7px;padding-right:7px}.ues-button-group{position:relative;display:inline-block;vertical-align:middle}.ues-button-group:before,.ues-button-group:after{content:' ';display:table}.ues-button-group:after{clear:both}.ues-button-group .ues-button,.ues-button-group input[type="search"]{float:left;border-left:1px solid rgba(0,0,0,.1)}.ues-button-group>input[type="search"]:first-child:not(:last-child):not(.ues-dropdown-toggle),.ues-button-group>.ues-button:first-child:not(:last-child):not(.ues-dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0;border-left:none}.ues-button-group>.ues-button:first-child:last-of-type{border-left:none}.ues-button-group>input[type="search"]:last-child:not(:first-child),.ues-button-group>.ues-button:last-child:not(:first-child),.ues-button-group>.ues-dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.ues-button-group>.ues-button:not(:first-child):not(:last-child):not(.ues-dropdown-toggle){border-radius:0;border-right:none}
6\ No newline at end of file
7+.ues-button{background-color:#dedede;color:#333;border-radius:3px;display:inline-block;font-weight:300;font-size:13px;line-height:20px;padding:6px 19px;text-align:center;vertical-align:baseline;text-transform:uppercase;border:none}.ues-button:hover{background-color:#e6e6e6}.ues-button:focus{box-shadow:#f7f6f5 0 0 0 1px}.ues-button:focus,.ues-button:active{background-color:#e6e6e6}.ues-button-primary{background-color:#dd4814;color:#fff;border-color:#ad2e03}.ues-button-primary .ues-icon-caret{fill:#fff}.ues-button-primary:hover{background-color:#f28a45}.ues-button-primary:focus,.ues-button-primary:active{background-color:#dd4814;border-color:#333}.ues-button-tertiary{background-color:#fff;background-image:none;padding-top:5px;padding-bottom:5px;border:1px solid #c8c8c8}.ues-button-tertiary:hover{background-color:#e6e6e6;background-image:none;border-color:#cdcdcd}.ues-button-tertiary:focus,.ues-button-tertiary:active{background-color:#e6e6e6;background-image:none;border-color:#dd4814}.ues-button-search{background-color:transparent;background-image:none;border:none;border-left:1px solid #eee}.ues-button-search:hover{background-color:#f0f0f0;border-color:#dedede}.ues-button-search:focus,.ues-button-search:active{border-color:#c8c8c8;background-color:#dedede}.ues-button-small{font-size:11px;padding:1px 10px;font-weight:400}.ues-button-large{font-size:16px;padding:14px 38px}.ues-button-block{margin:.5em 0;display:block;width:100%}.ues-button-icon{padding-left:7px;padding-right:7px}.ues-button-group{position:relative;display:inline-block;vertical-align:middle}.ues-button-group:before,.ues-button-group:after{content:' ';display:table}.ues-button-group:after{clear:both}.ues-button-group .ues-button,.ues-button-group input[type="search"]{float:left;border-left:1px solid rgba(0,0,0,.1)}.ues-button-group>input[type="search"]:first-child:not(:last-child):not(.ues-dropdown-toggle),.ues-button-group>.ues-button:first-child:not(:last-child):not(.ues-dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0;border-left:none}.ues-button-group>.ues-button:first-child:last-of-type{border-left:none}.ues-button-group>input[type="search"]:last-child:not(:first-child),.ues-button-group>.ues-button:last-child:not(:first-child),.ues-button-group>.ues-dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.ues-button-group>.ues-button:not(:first-child):not(:last-child):not(.ues-dropdown-toggle){border-radius:0;border-right:none}
8\ No newline at end of file
9
10=== modified file 'public/ulysses.css'
11--- public/ulysses.css 2014-10-17 17:52:49 +0000
12+++ public/ulysses.css 2014-10-18 00:08:20 +0000
13@@ -1,6 +1,6 @@
14 /*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
15 html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit}
16-.ues-button{background-color:#dedede;border-radius:3px;display:inline-block;font-weight:300;font-size:13px;line-height:20px;padding:6px 19px;text-align:center;vertical-align:baseline;text-transform:uppercase;border:none}.ues-button:hover{background-color:#e6e6e6}.ues-button:focus{box-shadow:#f7f6f5 0 0 0 1px}.ues-button:focus,.ues-button:active{background-color:#e6e6e6}.ues-button-primary{background-color:#dd4814;color:#fff;border-color:#ad2e03}.ues-button-primary .ues-icon-caret{fill:#fff}.ues-button-primary:hover{background-color:#f28a45}.ues-button-primary:focus,.ues-button-primary:active{background-color:#dd4814;border-color:#333}.ues-button-tertiary{background-color:#fff;background-image:none;padding-top:5px;padding-bottom:5px;border:1px solid #c8c8c8}.ues-button-tertiary:hover{background-color:#e6e6e6;background-image:none;border-color:#cdcdcd}.ues-button-tertiary:focus,.ues-button-tertiary:active{background-color:#e6e6e6;background-image:none;border-color:#dd4814}.ues-button-search{background-color:transparent;background-image:none;border:none;border-left:1px solid #eee}.ues-button-search:hover{background-color:#f0f0f0;border-color:#dedede}.ues-button-search:focus,.ues-button-search:active{border-color:#c8c8c8;background-color:#dedede}a.ues-button{color:inherit}.ues-button-small{font-size:11px;padding:1px 10px;font-weight:400}.ues-button-large{font-size:16px;padding:14px 38px}.ues-button-block{margin:.5em 0;display:block;width:100%}.ues-button-icon{padding-left:7px;padding-right:7px}.ues-button-group{position:relative;display:inline-block;vertical-align:middle}.ues-button-group:before,.ues-button-group:after{content:' ';display:table}.ues-button-group:after{clear:both}.ues-button-group .ues-button,.ues-button-group input[type="search"]{float:left;border-left:1px solid rgba(0,0,0,.1)}.ues-button-group>input[type="search"]:first-child:not(:last-child):not(.ues-dropdown-toggle),.ues-button-group>.ues-button:first-child:not(:last-child):not(.ues-dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0;border-left:none}.ues-button-group>.ues-button:first-child:last-of-type{border-left:none}.ues-button-group>input[type="search"]:last-child:not(:first-child),.ues-button-group>.ues-button:last-child:not(:first-child),.ues-button-group>.ues-dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.ues-button-group>.ues-button:not(:first-child):not(:last-child):not(.ues-dropdown-toggle){border-radius:0;border-right:none}
17+.ues-button{background-color:#dedede;color:#333;border-radius:3px;display:inline-block;font-weight:300;font-size:13px;line-height:20px;padding:6px 19px;text-align:center;vertical-align:baseline;text-transform:uppercase;border:none}.ues-button:hover{background-color:#e6e6e6}.ues-button:focus{box-shadow:#f7f6f5 0 0 0 1px}.ues-button:focus,.ues-button:active{background-color:#e6e6e6}.ues-button-primary{background-color:#dd4814;color:#fff;border-color:#ad2e03}.ues-button-primary .ues-icon-caret{fill:#fff}.ues-button-primary:hover{background-color:#f28a45}.ues-button-primary:focus,.ues-button-primary:active{background-color:#dd4814;border-color:#333}.ues-button-tertiary{background-color:#fff;background-image:none;padding-top:5px;padding-bottom:5px;border:1px solid #c8c8c8}.ues-button-tertiary:hover{background-color:#e6e6e6;background-image:none;border-color:#cdcdcd}.ues-button-tertiary:focus,.ues-button-tertiary:active{background-color:#e6e6e6;background-image:none;border-color:#dd4814}.ues-button-search{background-color:transparent;background-image:none;border:none;border-left:1px solid #eee}.ues-button-search:hover{background-color:#f0f0f0;border-color:#dedede}.ues-button-search:focus,.ues-button-search:active{border-color:#c8c8c8;background-color:#dedede}.ues-button-small{font-size:11px;padding:1px 10px;font-weight:400}.ues-button-large{font-size:16px;padding:14px 38px}.ues-button-block{margin:.5em 0;display:block;width:100%}.ues-button-icon{padding-left:7px;padding-right:7px}.ues-button-group{position:relative;display:inline-block;vertical-align:middle}.ues-button-group:before,.ues-button-group:after{content:' ';display:table}.ues-button-group:after{clear:both}.ues-button-group .ues-button,.ues-button-group input[type="search"]{float:left;border-left:1px solid rgba(0,0,0,.1)}.ues-button-group>input[type="search"]:first-child:not(:last-child):not(.ues-dropdown-toggle),.ues-button-group>.ues-button:first-child:not(:last-child):not(.ues-dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0;border-left:none}.ues-button-group>.ues-button:first-child:last-of-type{border-left:none}.ues-button-group>input[type="search"]:last-child:not(:first-child),.ues-button-group>.ues-button:last-child:not(:first-child),.ues-button-group>.ues-dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.ues-button-group>.ues-button:not(:first-child):not(:last-child):not(.ues-dropdown-toggle){border-radius:0;border-right:none}
18 .ues-dropdown{position:relative}.ues-dropdown-menu{font-size:13px;position:absolute;display:none;top:100%;left:0;z-index:10000000;float:left;min-width:160px;padding:5px 0;list-style:none;background-clip:padding-box;background-color:#fff;color:#333;box-shadow:0 1px 6px 0 rgba(0,0,0,.1);margin:2px 0 0;border:1px solid #ddd;border-radius:4px}.open .ues-dropdown-menu{display:block}.ues-dropdown-menu>li>a{display:block;white-space:nowrap;clear:both;padding:0 15px}.ues-dropdown-menu>li>a:hover{background-color:#dd4814;color:#fff}.ues-dropdown-divider{height:1px;margin:5px 0;overflow:hidden;background-color:#ddd}.ues-dropdown-header{display:block;padding:0 14px;color:#999}
19 .ues-message{padding:.5em .6em;border-radius:2px;background-color:#E6E4E2;border-color:#AEA79F;color:#555}.ues-message a:link{color:inherit;color:rgba(0,0,0,.75);text-decoration:underline}.ues-message a:hover{color:#000}.ues-message-inline{display:inline-block}.ues-message-bordered{border-width:1px;border-style:solid;box-shadow:1px 1px 3px 0 rgba(0,0,0,.25)}.ues-message-stack li{border-radius:0;border-top-width:0;border-bottom-color:#000;border-bottom-color:rgba(0,0,0,.25)}.ues-message-stack :first-child{border-radius:2px 2px 0 0;border-top-width:1px}.ues-message-stack :last-child{border-radius:0 0 2px 2px;border-bottom-width:1px}.ues-message-closeable{position:relative;cursor:pointer;-webkit-transition:.3s ease all;transition:.3s ease all;overflow:hidden;max-height:1000px}.ues-message-closeable:after{content:"✖";position:absolute;right:.6em;opacity:0}.ues-message-closeable:hover:after{opacity:1}.ues-message-closed{max-height:0;padding:0;border:none;box-shadow:none;margin:0;opacity:0}.ues-disabled{color:#999;border-color:#ccc}.ues-success{background-color:#AFE1B6;border-color:#38B44A;color:#114918}.ues-warning{background-color:#F8E2B1;border-color:#EFB73E;color:#68563F}.ues-error{background-color:#F5C2BF;border-color:#DF382C;color:#A11E1A}@-webkit-keyframes ues-error-pulsating{from{background:#FFE6E5}to{background:#FFA09B}}@keyframes ues-error-pulsating{from{background:#FFE6E5}to{background:#FFA09B}}.ues-error-pulsating{-webkit-animation:ues-error-pulsating .7s ease-in-out infinite alternate;animation:ues-error-pulsating .7s ease-in-out infinite alternate}.ues-information{background-color:#B9E9FA;border-color:#19B6EE;color:#40525C}
20 form{margin:15px 0}fieldset{padding:0}fieldset,legend{border:0;margin:0 0 15px}legend{display:block;width:100%;font-size:23px;line-height:inherit}label{display:block;margin:10px 0 5px}input[type="checkbox"],input[type="radio"]{margin-right:5px}.ues-form-help{font-size:14px;padding:0 15px;border-radius:3px;background-color:#eee;color:#555;position:relative;margin:10px 0}span.ues-form-help{display:inline-block;margin:0}.ues-inline{display:inline-block;margin-right:10px}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea{box-shadow:inset 0 1px 1px rgba(0,0,0,.075);border-radius:2px;width:100%;padding:8px;margin:0 0 8px;display:block;border:1px solid #ccc;line-height:14px;font-weight:inherit;-webkit-transition:.3s linear border;transition:.3s linear border}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,select:focus,textarea:focus{outline:0;outline:thin dotted \9;border-color:#129FEA}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:1px auto #129FEA}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled],select[disabled],textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}input[readonly],select[readonly],textarea[readonly]{background:#eee;color:#777;border-color:#ccc}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border:1px solid #ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#e9322d}select,.ues-form-inline label,.ues-form-inline input{display:inline-block;width:auto}.ues-form-inline label{margin-left:1em;margin-right:1em}.ues-site-search{position:relative}.ues-site-search .ues-site-search-input{box-shadow:none;height:44px;line-height:44px;margin-bottom:0;padding:0 15px;-webkit-transition:.2s ease border;transition:.2s ease border;box-sizing:border-box;border:1px solid #bbb;appearance:none;background-color:#fff}.ues-site-search .ues-site-search-input:focus{border:1px solid #ad2e03}.ues-icon-search+.ues-site-search-input{padding-left:40px;padding-right:0}.ues-site-search>.ues-icon-search{left:15px;position:absolute;top:15px}.ues-site-search .ues-button-search{border-radius:0 2px 2px 0;border-width:0 0 0 1px;bottom:1px;padding:0 20px;position:absolute;right:1px;top:1px}
21
22=== modified file 'src/buttons.css'
23--- src/buttons.css 2014-10-09 14:00:18 +0000
24+++ src/buttons.css 2014-10-18 00:08:20 +0000
25@@ -1,5 +1,6 @@
26 .ues-button {
27 background-color: #dedede;
28+ color:#333;
29 border-radius: 3px;
30 display:inline-block;
31 font-weight:300;
32@@ -81,10 +82,6 @@
33 background-color:#dedede;
34 }
35
36-a.ues-button {
37- color:inherit;
38-}
39-
40 .ues-button-small {
41 font-size:11px;
42 padding:1px 10px;
43
44=== modified file 'test/index.html'
45--- test/index.html 2014-10-09 14:00:18 +0000
46+++ test/index.html 2014-10-18 00:08:20 +0000
47@@ -307,6 +307,11 @@
48 <li><a href="">Music</a></li>
49 </ul>
50 </div>
51+ <div class="ues-navbar-secondary-nav">
52+ <div class="ues-navbar-text">
53+ <a class="ues-button ues-button-primary">Button</a>
54+ </div>
55+ </div>
56 </div>
57 </div>
58
59
60=== modified file 'test/visual/screenshots/large/invert_navbar.png'
61Binary files test/visual/screenshots/large/invert_navbar.png 2014-10-07 10:39:45 +0000 and test/visual/screenshots/large/invert_navbar.png 2014-10-18 00:08:20 +0000 differ
62=== modified file 'test/visual/screenshots/small/invert_navbar.png'
63Binary files test/visual/screenshots/small/invert_navbar.png 2014-10-07 10:39:45 +0000 and test/visual/screenshots/small/invert_navbar.png 2014-10-18 00:08:20 +0000 differ

Subscribers

People subscribed via source and target branches