github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 08:32:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

let's try to vertically align small logo

Browse Source
This commit is contained in:
Jeff Atwood 2015-02-18 23:55:04 -08:00
parent da036e7de3
commit bf03209f42
3 changed files with 12 additions and 8 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,15 +1,18 @@
<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>

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

@ -16,12 +16,13 @@
} }
.title { .title {
display: table;
float: left; float: left;
> a { }
display: table-cell;
vertical-align: middle; .valign-helper {
} display: inline-block;
height: 100%;
vertical-align: middle;
} }
#site-logo { #site-logo {

6
app/assets/stylesheets/mobile/header.scss
View File

@ -5,17 +5,17 @@
.d-header { .d-header {
#site-logo { #site-logo {
max-width: 122px; max-width: 135px;
} }
// some protection for text-only site titles // some protection for text-only site titles
.title { .title {
margin-left: 10px; margin-left: 10px;
max-width: 135px; max-width: 140px;
height: 39px;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
text-overflow: clip; text-overflow: clip;
display: block; // table causes clipping fail oddities here
} }
.icons { .icons {