IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove valign-helper hack, let's go flexbox

Browse Source
This commit is contained in:
Jeff Atwood 2015-10-20 00:46:20 -07:00
parent 2fe70f6969
commit 5d341bef57
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/templates/components/home-logo.hbs
View File

@ -1,18 +1,15 @@
<a href="{{unbound linkUrl}}" data-auto-route="true"> <a href="{{unbound linkUrl}}" data-auto-route="true">
{{#if showSmallLogo}} {{#if showSmallLogo}}
{{#if smallLogoUrl}} {{#if smallLogoUrl}}
<span class="valign-helper"></span>
<img class="logo-small" src="{{unbound smallLogoUrl}}" width="33" height="33"> <img class="logo-small" src="{{unbound smallLogoUrl}}" width="33" height="33">
{{else}} {{else}}
<i class="fa fa-home"></i> <i class="fa fa-home"></i>
{{/if}} {{/if}}
{{else}} {{else}}
{{#if showMobileLogo}} {{#if showMobileLogo}}
<span class="valign-helper"></span>
<img id="site-logo" class="logo-big" src="{{unbound mobileBigLogoUrl}}" alt="{{unbound title}}"> <img id="site-logo" class="logo-big" src="{{unbound mobileBigLogoUrl}}" alt="{{unbound title}}">
{{else}} {{else}}
{{#if bigLogoUrl}} {{#if bigLogoUrl}}
<span class="valign-helper"></span>
<img id="site-logo" class="logo-big" src="{{unbound bigLogoUrl}}" alt="{{unbound title}}"> <img id="site-logo" class="logo-big" src="{{unbound bigLogoUrl}}" alt="{{unbound title}}">
{{else}} {{else}}
<h2 id="site-text-logo" class="text-logo">{{unbound title}}</h2> <h2 id="site-text-logo" class="text-logo">{{unbound title}}</h2>

6
app/assets/stylesheets/common/base/header.scss
View File

@ -19,12 +19,6 @@
float: left; float: left;
} }
.valign-helper {
display: inline-block;
height: 100%;
vertical-align: middle;
}
#site-logo { #site-logo {
max-height: 40px; max-height: 40px;
} }