Skip to content

Commit

Permalink
Reset font-size on body for correct inline spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed Feb 12, 2019
1 parent d088733 commit 946f4f1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion material/assets/stylesheets/application.0279f501.css

This file was deleted.

1 change: 1 addition & 0 deletions material/assets/stylesheets/application.18bd1ba2.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions material/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{% endif %}
{% endblock %}
{% block styles %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/application.0279f501.css' | url }}">
<link rel="stylesheet" href="{{ 'assets/stylesheets/application.18bd1ba2.css' | url }}">
{% if palette.primary or palette.accent %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/application-palette.224b79ff.css' | url }}">
{% endif %}
Expand Down Expand Up @@ -190,7 +190,7 @@ <h2 id="__source">{{ lang.t("meta.source") }}</h2>
{% endblock %}
</div>
{% block scripts %}
<script src="{{ 'assets/javascripts/application.daa9a053.js' | url }}"></script>
<script src="{{ 'assets/javascripts/application.c5c8ade4.js' | url }}"></script>
{% if lang.t("search.language") != "en" %}
{% set languages = lang.t("search.language").split(",") %}
{% if languages | length and languages[0] != "" %}
Expand Down
3 changes: 3 additions & 0 deletions src/assets/stylesheets/layout/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ html {
body {
position: relative;
height: 100%;
// Hack: reset font-size to 10px, so the spacing for all inline elements is
// correct again. Otherwise the spacing would be based on 20px.
font-size: 0.5rem;

// [tablet portrait -]: Lock body to disable scroll bubbling
@include break-to-device(tablet portrait) {
Expand Down

0 comments on commit 946f4f1

Please sign in to comment.