Side by Side Diff: includes/sidebar.tmpl
Issue 29401619:
Issue 4963 - Wrong size used for text logo on acceptableads.com (Closed)
Base URL: https://hg.adblockplus.org/web.acceptableads.com
Patch Set: Addressed comments
Created May 22, 2017, 7:08 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« includes/navbar.tmpl ('K')
|
« includes/navbar.tmpl ('k')
|
static/css/main.css » ('j')
|
static/scss/layout/_navbar.scss » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 {# | 1 {# |
| 2 # This file is part of acceptableads.org. | 2 # This file is part of acceptableads.org. |
| 3 # Copyright (C) 2016 Eyeo GmbH | 3 # Copyright (C) 2016 Eyeo GmbH |
| 4 # | 4 # |
| 5 # acceptableads.org is free software: you can redistribute it and/or modify | 5 # acceptableads.org is free software: you can redistribute it and/or modify |
| 6 # it under the terms of the GNU General Public License as published by | 6 # it under the terms of the GNU General Public License as published by |
| 7 # the Free Software Foundation, either version 3 of the License, or | 7 # the Free Software Foundation, either version 3 of the License, or |
| 8 # (at your option) any later version. | 8 # (at your option) any later version. |
| 9 # | 9 # |
| 10 # acceptableads.org is distributed in the hope that it will be useful, | 10 # acceptableads.org is distributed in the hope that it will be useful, |
| 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 13 # GNU General Public License for more details. | 13 # GNU General Public License for more details. |
| 14 # | 14 # |
| 15 # You should have received a copy of the GNU General Public License | 15 # You should have received a copy of the GNU General Public License |
| 16 # along with acceptableads.org. If not, see <http://www.gnu.org/licenses/>. | 16 # along with acceptableads.org. If not, see <http://www.gnu.org/licenses/>. |
| 17 #} | 17 #} |
| 18 | 18 |
| 19 <aside id="sidebar"> | 19 <aside id="sidebar"> |
| 20 <div id="sidebar-brand"> | 20 <div id="sidebar-brand"> |
| 21 <button id="sidebar-open" type="button" data-toggle="collapse" data-target=" #primary-navigation" aria-controls="primary-navigation" aria-expanded="false" ar ia-label="{{ 'Open primary navigation' | translate('sidebar-toggle-open-label', 'Primary navigation open label') }}"><img src="/img/png/icon-menu.png" srcset="/ img/png/icon-menu.png, /img/png2x/icon-menu.png 2x" aria-hidden="true"></button> | 21 <button id="sidebar-open" type="button" data-toggle="collapse" data-target=" #primary-navigation" aria-controls="primary-navigation" aria-expanded="false" ar ia-label="{{ 'Open primary navigation' | translate('sidebar-toggle-open-label', 'Primary navigation open label') }}"><img src="/img/png/icon-menu.png" srcset="/ img/png/icon-menu.png, /img/png2x/icon-menu.png 2x" aria-hidden="true"></button> |
| 22 <button id="sidebar-close" type="button" data-toggle="collapse" data-target= "#primary-navigation" aria-controls="primary-navigation" aria-expanded="true" ar ia-label="{{ 'Close primary navigation' | translate('sidebar-toggle-close-label' , 'Primary navigation close label') }}"><img src="/img/png/icon-menu-x.png" srcs et="/img/png/icon-menu-x.png, /img/png2x/icon-menu-x.png 2x" aria-hidden="true"> </button> | 22 <button id="sidebar-close" type="button" data-toggle="collapse" data-target= "#primary-navigation" aria-controls="primary-navigation" aria-expanded="true" ar ia-label="{{ 'Close primary navigation' | translate('sidebar-toggle-close-label' , 'Primary navigation close label') }}"><img src="/img/png/icon-menu-x.png" srcs et="/img/png/icon-menu-x.png, /img/png2x/icon-menu-x.png 2x" aria-hidden="true"> </button> |
| 23 {{ "index" | linkify(id="sidebar-logo") }} | 23 {{ "index" | linkify(id="sidebar-logo") }} |
| 24 <img src="/img/png/logo-white.png" srcset="/img/png/logo-white.png, /img/s vg/logo-white.svg 2x" aria-hidden="true"> | 24 <img src="/img/png/logo-white.png" srcset="/img/png/logo-white.png, /img/s vg/logo-white.svg 2x" aria-hidden="true"> |
| 25 </a> | 25 </a> |
| 26 {{ "index" | linkify(id="sidebar-title") }} | 26 <h1 id="sidebar-title" class="site-title">{{ "index" | linkify(id="navbar-lo go") }}Acceptable<span class="non-space"> </span><strong>Ads</strong></a></h1> |
| 27 <img src="/img/png/logo-black.png" srcset="/img/png/logo-black.png, /img/s vg/logo-black.svg 2x" aria-hidden="true"> | |
| 28 </a> | |
| 29 </div> | 27 </div> |
| 30 <nav id="primary-navigation" role="navigation"> | 28 <div id="sidebar-menus"> |
| 31 <? include sidebar/primary-navigation ?> | 29 <nav id="primary-navigation" role="navigation"> |
| 32 </nav> | 30 <? include sidebar/primary-navigation ?> |
| 33 <nav id="secondary-navigation" role="navigation"> | 31 </nav> |
| 34 <? include sidebar/secondary-navigation ?> | 32 <nav id="secondary-navigation" role="navigation"> |
| 35 </nav> | 33 <? include sidebar/secondary-navigation ?> |
| 34 </nav> | |
| 35 </div> | |
| 36 </aside> | 36 </aside> |
| OLD | NEW |
« includes/navbar.tmpl ('K')
|
« includes/navbar.tmpl ('k')
|
static/css/main.css » ('j')
|
static/scss/layout/_navbar.scss » ('J')
