Merge "Logo scales with font-size"
This commit is contained in:
commit
ba00180eed
|
@ -12,7 +12,7 @@
|
||||||
<span class="mw-logo-container">
|
<span class="mw-logo-container">
|
||||||
{{#wordmark}}
|
{{#wordmark}}
|
||||||
<img class="mw-logo-wordmark" alt="{{msg-sitetitle}}"
|
<img class="mw-logo-wordmark" alt="{{msg-sitetitle}}"
|
||||||
src="{{src}}" width="{{width}}" height="{{height}}">
|
src="{{src}}" style="{{style}}">
|
||||||
{{/wordmark}}
|
{{/wordmark}}
|
||||||
{{^wordmark}}
|
{{^wordmark}}
|
||||||
<strong class="mw-logo-wordmark">{{msg-sitetitle}}</strong>
|
<strong class="mw-logo-wordmark">{{msg-sitetitle}}</strong>
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
{{#tagline}}
|
{{#tagline}}
|
||||||
<img class="mw-logo-tagline"
|
<img class="mw-logo-tagline"
|
||||||
alt="{{msg-sitesubtitle}}"
|
alt="{{msg-sitesubtitle}}"
|
||||||
src="{{src}}" width="{{width}}" height="{{height}}">
|
src="{{src}}" width="{{width}}" height="{{height}}" style="{{style}}">
|
||||||
{{/tagline}}
|
{{/tagline}}
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -17,6 +17,9 @@
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
// Hide mobile icon at lower resolutions and defer to wordmark
|
// Hide mobile icon at lower resolutions and defer to wordmark
|
||||||
display: none;
|
display: none;
|
||||||
|
@size-mw-logo-icon: unit( 50 / @font-size-browser, em );
|
||||||
|
width: @size-mw-logo-icon;
|
||||||
|
height: @size-mw-logo-icon;
|
||||||
|
|
||||||
@media ( min-width: @width-breakpoint-tablet ) {
|
@media ( min-width: @width-breakpoint-tablet ) {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -54,12 +57,10 @@
|
||||||
.mw-logo-wordmark {
|
.mw-logo-wordmark {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
font-size: 1.4em;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.mw-logo-tagline {
|
.mw-logo-tagline {
|
||||||
// For browsers which do not support flexbox.
|
// For browsers which do not support flexbox.
|
||||||
display: block;
|
display: block;
|
||||||
margin: 5px auto 0;
|
margin: 5px auto 0;
|
||||||
font-size: 0.7em;
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue