1
0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-12-18 10:25:58 +01:00

Fixed sizing of icons and images in nav and header

This commit is contained in:
squidfunk 2020-02-25 15:02:54 +01:00
parent 43f2a71f03
commit 446e55767b
15 changed files with 30 additions and 56 deletions

View File

@ -1,8 +1,8 @@
{ {
"assets/javascripts/bundle.js": "assets/javascripts/bundle.95400cd1.min.js", "assets/javascripts/bundle.js": "assets/javascripts/bundle.af710b79.min.js",
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.95400cd1.min.js.map", "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.af710b79.min.js.map",
"assets/javascripts/worker/search.js": "assets/javascripts/worker/search.926ffd9e.min.js", "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.926ffd9e.min.js",
"assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.926ffd9e.min.js.map", "assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.926ffd9e.min.js.map",
"assets/stylesheets/app-palette.scss": "assets/stylesheets/app-palette.8adb38b9.min.css", "assets/stylesheets/app-palette.scss": "assets/stylesheets/app-palette.8adb38b9.min.css",
"assets/stylesheets/app.scss": "assets/stylesheets/app.d99d5cd5.min.css" "assets/stylesheets/app.scss": "assets/stylesheets/app.d1c09be7.min.css"
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -43,7 +43,7 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/app.d99d5cd5.min.css' | url }}"> <link rel="stylesheet" href="{{ 'assets/stylesheets/app.d1c09be7.min.css' | url }}">
{% if palette.primary or palette.accent %} {% if palette.primary or palette.accent %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/app-palette.8adb38b9.min.css' | url }}"> <link rel="stylesheet" href="{{ 'assets/stylesheets/app-palette.8adb38b9.min.css' | url }}">
{% endif %} {% endif %}
@ -195,7 +195,7 @@
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{{ 'assets/javascripts/bundle.95400cd1.min.js' | url }}"></script> <script src="{{ 'assets/javascripts/bundle.af710b79.min.js' | url }}"></script>
{%- set translations = {} -%} {%- set translations = {} -%}
{%- for key in [ {%- for key in [
"clipboard.copy", "clipboard.copy",

View File

@ -7,7 +7,7 @@
{% if config.theme.logo.icon %} {% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %} {% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %} {% else %}
<img src="{{ config.theme.logo | url }}" width="24" height="24" alt="logo"> <img src="{{ config.theme.logo | url }}" alt="logo">
{% endif %} {% endif %}
</a> </a>
<label class="md-header-nav__button md-icon md-icon__button" for="__drawer"> <label class="md-header-nav__button md-icon md-icon__button" for="__drawer">

View File

@ -7,7 +7,7 @@
{% if config.theme.logo.icon %} {% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %} {% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %} {% else %}
<img src="{{ config.theme.logo | url }}" width="48" height="48" alt="logo"> <img src="{{ config.theme.logo | url }}" alt="logo">
{% endif %} {% endif %}
</a> </a>
{{ config.site_name }} {{ config.site_name }}

View File

@ -21,7 +21,11 @@
*/ */
import { Observable, combineLatest } from "rxjs" import { Observable, combineLatest } from "rxjs"
import { distinctUntilKeyChanged, map, shareReplay } from "rxjs/operators" import {
distinctUntilKeyChanged,
map,
shareReplay
} from "rxjs/operators"
import { Header } from "../../../header" import { Header } from "../../../header"
import { import {

View File

@ -20,7 +20,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
import { Subject, from } from "rxjs" import { Subject, Subscriber, from, fromEvent } from "rxjs"
import { ajax } from "rxjs/ajax" import { ajax } from "rxjs/ajax"
import { map, pluck, shareReplay } from "rxjs/operators" import { map, pluck, shareReplay } from "rxjs/operators"

View File

@ -95,13 +95,10 @@
margin: px2rem(4px); margin: px2rem(4px);
padding: px2rem(8px); padding: px2rem(8px);
// Set correct display on image or icon // Image or icon
* { img,
display: block;
}
// Inherit current color
svg { svg {
display: block;
width: px2rem(24px); width: px2rem(24px);
height: px2rem(24px); height: px2rem(24px);
fill: currentColor; fill: currentColor;

View File

@ -49,7 +49,15 @@
// Logo // Logo
&.md-logo svg { &.md-logo svg {
fill: currentColor;
// Image or icon
img,
svg {
display: block;
width: px2rem(24px);
height: px2rem(24px);
fill: currentColor;
}
} }
} }
} }

View File

@ -36,12 +36,7 @@
{% if config.theme.logo.icon %} {% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %} {% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %} {% else %}
<img <img src="{{ config.theme.logo | url }}" alt="logo" />
src="{{ config.theme.logo | url }}"
width="24"
height="24"
alt="logo"
/>
{% endif %} {% endif %}
</a> </a>
<label <label

View File

@ -34,12 +34,7 @@
{% if config.theme.logo.icon %} {% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %} {% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %} {% else %}
<img <img src="{{ config.theme.logo | url }}" alt="logo" />
src="{{ config.theme.logo | url }}"
width="48"
height="48"
alt="logo"
/>
{% endif %} {% endif %}
</a> </a>
{{ config.site_name }} {{ config.site_name }}

25
typings/dom.d.ts vendored
View File

@ -1,25 +0,0 @@
/*
* Copyright (c) 2016-2020 Martin Donath <martin.donath@squidfunk.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
interface CSSStyleDeclaration {
webkitOverflowScrolling: "touch" | ""
}