Reverted 'extra_css with media' feature

This commit is contained in:
squidfunk 2020-02-27 10:32:42 +01:00
parent 2de1608079
commit 1e0b168570
11 changed files with 15 additions and 33 deletions

View File

@ -1,8 +1,8 @@
{
"assets/javascripts/bundle.js": "assets/javascripts/bundle.a7251a2a.min.js",
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.a7251a2a.min.js.map",
"assets/javascripts/bundle.js": "assets/javascripts/bundle.4333d4e1.min.js",
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.4333d4e1.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/main.scss": "assets/stylesheets/main.949e77d3.min.css",
"assets/stylesheets/main.scss": "assets/stylesheets/main.d780ead5.min.css",
"assets/stylesheets/palette.scss": "assets/stylesheets/palette.f5f04e6f.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 %}
{% endblock %}
{% block styles %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.949e77d3.min.css' | url }}">
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.d780ead5.min.css' | url }}">
{% if palette.primary or palette.accent %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.f5f04e6f.min.css' | url }}">
{% endif %}
@ -70,12 +70,7 @@
<link rel="manifest" href="{{ config.extra.manifest | url }}" crossorigin="use-credentials">
{% endif %}
{% for file in config["extra_css"] %}
{% set path,media = file.split(" ", 1) %}
{% if media %}
<link rel="stylesheet" href="{{ path | url }}" media="">
{% else %}
<link rel="stylesheet" href="{{ path | url }}">
{% endif %}
<link rel="stylesheet" href="{{ file | url }}">
{% endfor %}
{% block analytics %}
{% if config.google_analytics %}
@ -200,7 +195,7 @@
{% endblock %}
</div>
{% block scripts %}
<script src="{{ 'assets/javascripts/bundle.a7251a2a.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/bundle.4333d4e1.min.js' | url }}"></script>
{%- set translations = {} -%}
{%- for key in [
"clipboard.copy",

View File

@ -23,8 +23,8 @@
// TODO: remove this after we finished refactoring
// tslint:disable
import "../stylesheets/app.scss"
import "../stylesheets/app-palette.scss"
import "../stylesheets/main.scss"
import "../stylesheets/palette.scss"
import { values } from "ramda"
import {

View File

@ -63,7 +63,7 @@ export function renderSearchResult(
<a href={location} class={css.link} tabIndex={-1}>
<article class={"parent" in document ? css.section : css.article}>
{!("parent" in document)
? <div class="md-search-result__icon md-icon__button md-icon">
? <div class="md-search-result__icon md-icon">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path d={path}></path>
</svg>

View File

@ -584,7 +584,7 @@ $md-toggle__search--checked:
position: absolute;
left: 0;
margin: px2rem(2px);
transition: opacity 250ms;
padding: px2rem(8px);
color: var(--md-default-fg-color--light);
// Adjust for right-to-left languages

View File

@ -76,14 +76,6 @@
opacity: 0.7;
}
// Necessary for vertical alignment
&::after {
display: inline-block;
height: px2rem(48px);
content: "";
vertical-align: middle;
}
// Repository platform icon
&__icon {
display: inline-block;

View File

@ -154,12 +154,7 @@
<!-- Custom stylesheets, might contain media query after URL -->
{% for file in config["extra_css"] %}
{% set path,media = file.split(" ", 1) %}
{% if media %}
<link rel="stylesheet" href="{{ path | url }}" media="{{ media }}" />
{% else %}
<link rel="stylesheet" href="{{ path | url }}" />
{% endif %}
<link rel="stylesheet" href="{{ file | url }}" />
{% endfor %}
<!-- Analytics -->