Skip to content

Commit

Permalink
Fixed sizing of icons and images in nav and header
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed Feb 25, 2020
1 parent 43f2a71 commit 446e557
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 56 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions material/assets/manifest.json
@@ -1,8 +1,8 @@
{
"assets/javascripts/bundle.js": "assets/javascripts/bundle.95400cd1.min.js",
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.95400cd1.min.js.map",
"assets/javascripts/bundle.js": "assets/javascripts/bundle.af710b79.min.js",
"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.map": "assets/javascripts/worker/search.926ffd9e.min.js.map",
"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"
}
1 change: 1 addition & 0 deletions material/assets/stylesheets/app.d1c09be7.min.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion material/assets/stylesheets/app.d99d5cd5.min.css

This file was deleted.

4 changes: 2 additions & 2 deletions material/base.html
Expand Up @@ -43,7 +43,7 @@
{% endif %}
{% endblock %}
{% 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 %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/app-palette.8adb38b9.min.css' | url }}">
{% endif %}
Expand Down Expand Up @@ -195,7 +195,7 @@ <h1>{{ page.title | default(config.site_name, true)}}</h1>
{% endblock %}
</div>
{% block scripts %}
<script src="{{ 'assets/javascripts/bundle.95400cd1.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/bundle.af710b79.min.js' | url }}"></script>
{%- set translations = {} -%}
{%- for key in [
"clipboard.copy",
Expand Down
2 changes: 1 addition & 1 deletion material/partials/header.html
Expand Up @@ -7,7 +7,7 @@
{% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %}
<img src="{{ config.theme.logo | url }}" width="24" height="24" alt="logo">
<img src="{{ config.theme.logo | url }}" alt="logo">
{% endif %}
</a>
<label class="md-header-nav__button md-icon md-icon__button" for="__drawer">
Expand Down
2 changes: 1 addition & 1 deletion material/partials/nav.html
Expand Up @@ -7,7 +7,7 @@
{% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %}
<img src="{{ config.theme.logo | url }}" width="48" height="48" alt="logo">
<img src="{{ config.theme.logo | url }}" alt="logo">
{% endif %}
</a>
{{ config.site_name }}
Expand Down
6 changes: 5 additions & 1 deletion src/assets/javascripts/observables/agent/viewport/_/index.ts
Expand Up @@ -21,7 +21,11 @@
*/

import { Observable, combineLatest } from "rxjs"
import { distinctUntilKeyChanged, map, shareReplay } from "rxjs/operators"
import {
distinctUntilKeyChanged,
map,
shareReplay
} from "rxjs/operators"

import { Header } from "../../../header"
import {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/javascripts/workers/search/_/index.ts
Expand Up @@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/

import { Subject, from } from "rxjs"
import { Subject, Subscriber, from, fromEvent } from "rxjs"
import { ajax } from "rxjs/ajax"
import { map, pluck, shareReplay } from "rxjs/operators"

Expand Down
9 changes: 3 additions & 6 deletions src/assets/stylesheets/layout/_header.scss
Expand Up @@ -95,13 +95,10 @@
margin: px2rem(4px);
padding: px2rem(8px);

// Set correct display on image or icon
* {
display: block;
}

// Inherit current color
// Image or icon
img,
svg {
display: block;
width: px2rem(24px);
height: px2rem(24px);
fill: currentColor;
Expand Down
10 changes: 9 additions & 1 deletion src/assets/stylesheets/layout/_nav.scss
Expand Up @@ -49,7 +49,15 @@

// Logo
&.md-logo svg {
fill: currentColor;

// Image or icon
img,
svg {
display: block;
width: px2rem(24px);
height: px2rem(24px);
fill: currentColor;
}
}
}
}
Expand Down
7 changes: 1 addition & 6 deletions src/partials/header.html
Expand Up @@ -36,12 +36,7 @@
{% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %}
<img
src="{{ config.theme.logo | url }}"
width="24"
height="24"
alt="logo"
/>
<img src="{{ config.theme.logo | url }}" alt="logo" />
{% endif %}
</a>
<label
Expand Down
7 changes: 1 addition & 6 deletions src/partials/nav.html
Expand Up @@ -34,12 +34,7 @@
{% if config.theme.logo.icon %}
{% include ".icons/" ~ config.theme.logo.icon ~ ".svg" %}
{% else %}
<img
src="{{ config.theme.logo | url }}"
width="48"
height="48"
alt="logo"
/>
<img src="{{ config.theme.logo | url }}" alt="logo" />
{% endif %}
</a>
{{ config.site_name }}
Expand Down
25 changes: 0 additions & 25 deletions typings/dom.d.ts

This file was deleted.

0 comments on commit 446e557

Please sign in to comment.