Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Load fonts and images via source-relative URLs and requires #2460

Merged
merged 6 commits into from
Jan 18, 2019
Merged

Load fonts and images via source-relative URLs and requires #2460

merged 6 commits into from
Jan 18, 2019

Commits on Jan 18, 2019

  1. Use font-family from theme in all components

    @jryans
    jryans committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    9a7a8da View commit details
    Browse the repository at this point in the history

  2. Lift font SCSS partials to theme root 

    This means that themes which include `light/css/_base.scss` (currently Dark and
Status) won't be forced to have Light's font-faces included.  This only really
matters for Status, which uses different fonts throughout.
    @jryans
    jryans committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    7678b9c View commit details
    Browse the repository at this point in the history

  3. Define SCSS variable for resource dir 

    Adds a `$res` SCSS variable set to the path from the root SCSS file to the `res`
directory.

This is a different base path than previously used in CSS URLs (it goes up 3
directories instead of 2), because Webpack will now be resolving images relative
to the root SCSS file, so the path corresponds to a source tree location,
instead of a path in the build output tree.

Defining this variable has two main goals:

* URLs are a bit easier to read
* The path can be overridden, which is needed for external (riot-web) themes
    @jryans
    jryans committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    b2387f4 View commit details
    Browse the repository at this point in the history

  4. Fix line length lint warnings 

    I am about to run some code replacements that might make lines too long, so with
this change I know we're starting from 0 line length warnings.
    @jryans
    jryans committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    989227d View commit details
    Browse the repository at this point in the history

  5. Convert image URLs in React to require calls 

    This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
    @jryans
    jryans committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    20e296b View commit details
    Browse the repository at this point in the history

  6. Add file-loader to Karma so assets will resolve in tests

    @jryans
    jryans committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    8b05cca View commit details
    Browse the repository at this point in the history