Moved all overrides to common directory

MANIFEST.in

@@ -1,6 +1,5 @@
 recursive-include material *.js *.css *.map *.html *.svg *.png *.yml
 recursive-include material *.ttf *.woff *.woff2 LICENSE*
-recursive-exclude material/assets overrides*
 recursive-exclude material/overrides *
 recursive-exclude site *
 recursive-exclude src *

material/assets/manifest.json

@@ -7,8 +7,8 @@
   "assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.9c0e82ba.min.js.map",
   "assets/stylesheets/main.css": "assets/stylesheets/main.cb6bc1d0.min.css",
   "assets/stylesheets/main.css.map": "assets/stylesheets/main.cb6bc1d0.min.css.map",
-  "assets/stylesheets/overrides.css": "assets/stylesheets/overrides.c462ebf7.min.css",
+  "assets/stylesheets/palette.css": "assets/stylesheets/palette.5b7c1fa0.min.css",
-  "assets/stylesheets/overrides.css.map": "assets/stylesheets/overrides.c462ebf7.min.css.map",
+  "assets/stylesheets/palette.css.map": "assets/stylesheets/palette.5b7c1fa0.min.css.map",
-  "assets/stylesheets/palette.css": "assets/stylesheets/palette.39b8e14a.min.css",
+  "overrides/assets/stylesheets/main.css": "overrides/assets/stylesheets/main.b1224278.min.css",
-  "assets/stylesheets/palette.css.map": "assets/stylesheets/palette.39b8e14a.min.css.map"
+  "overrides/assets/stylesheets/main.css.map": "overrides/assets/stylesheets/main.b1224278.min.css.map"
 }

material/base.html

@@ -42,7 +42,7 @@
       <link rel="stylesheet" href="{{ 'assets/stylesheets/main.cb6bc1d0.min.css' | url }}">
       {% if config.theme.palette %}
         {% set palette = config.theme.palette %}
-        <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.39b8e14a.min.css' | url }}">
+        <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.5b7c1fa0.min.css' | url }}">
         {% if palette.primary %}
           {% import "partials/palette.html" as map %}
           {% set primary = map.primary(

material/overrides/assets/stylesheets/main.b1224278.min.css

@@ -1,3 +1,3 @@
 @-webkit-keyframes tx-heart{0%,40%,80%,100%{transform:scale(1)}20%,60%{transform:scale(1.15)}}@keyframes tx-heart{0%,40%,80%,100%{transform:scale(1)}20%,60%{transform:scale(1.15)}}.md-typeset figure>p+figcaption{margin-top:-1.2rem}.md-typeset .twitter{color:#00acee}.md-typeset .tx-video{width:auto}.md-typeset .tx-video__inner{position:relative;width:100%;height:0;padding-bottom:56.138%}.md-typeset .tx-video iframe{position:absolute;top:0;left:0;width:100%;height:100%;overflow:hidden;border:none}.md-typeset .tx-heart{-webkit-animation:tx-heart 1000ms infinite;animation:tx-heart 1000ms infinite}.md-typeset .tx-insiders{color:#e91e63}.md-typeset .tx-insiders-button{font-weight:400}.md-typeset .tx-insiders-count{font-weight:700}.md-typeset .tx-insiders-list{margin:2em 0;overflow:auto}.md-typeset .tx-insiders-list__item{display:block;float:left;width:3rem;height:3rem;margin:.2rem;overflow:hidden;border-radius:100%;transform:scale(1);transition:color 125ms,transform 125ms}.md-typeset .tx-insiders-list__item img{display:block;width:100%;height:auto;-webkit-filter:grayscale(100%);filter:grayscale(100%);transition:-webkit-filter 125ms;transition:filter 125ms;transition:filter 125ms, -webkit-filter 125ms}.md-typeset .tx-insiders-list__item:focus,.md-typeset .tx-insiders-list__item:hover{transform:scale(1.1)}.md-typeset .tx-insiders-list__item:focus img,.md-typeset .tx-insiders-list__item:hover img{-webkit-filter:grayscale(0%);filter:grayscale(0%)}.md-typeset .tx-insiders-list__item--private{color:var(--md-default-fg-color--lighter);font-weight:700;font-size:1.2rem;line-height:3rem;text-align:center;background:var(--md-default-fg-color--lightest)}.md-typeset .tx-switch button{cursor:pointer;transition:opacity 250ms}.md-typeset .tx-switch button:focus,.md-typeset .tx-switch button:hover{opacity:.75}.md-typeset .tx-switch button>code{display:block;color:var(--md-primary-bg-color);background-color:var(--md-primary-fg-color)}.md-typeset .tx-columns ol,.md-typeset .tx-columns ul{-moz-columns:2;columns:2}@media screen and (max-width: 29.9375em){.md-typeset .tx-columns ol,.md-typeset .tx-columns ul{-moz-columns:initial;columns:initial}}.md-typeset .tx-columns li{-moz-column-break-inside:avoid;break-inside:avoid}.md-announce a,.md-announce a:focus,.md-announce a:hover{color:currentColor}.md-announce strong{white-space:nowrap}.md-announce .twitter{margin-left:.2em}.tx-content__footer{margin-top:1rem;text-align:center}.tx-content__footer a{display:inline-block;color:#e91e63;transition:transform 250ms cubic-bezier(0.1, 0.7, 0.1, 1),color 125ms}.tx-content__footer a:focus,.tx-content__footer a:hover{transform:scale(1.2)}.tx-content__footer hr{display:inline-block;width:2rem;margin:1em;vertical-align:middle;background-color:currentColor;border:none}.tx-container{padding-top:1rem;background:url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1123 258'><path d='M1124,2c0,0 0,256 0,256l-1125,0l0,-48c0,0 16,5 55,5c116,0 197,-92 325,-92c121,0 114,46 254,46c140,0 214,-167 572,-166Z' style='fill: hsla(0, 0%, 100%, 1)' /></svg>") no-repeat bottom,linear-gradient(to bottom, var(--md-primary-fg-color), #a63fd9 99%, var(--md-default-bg-color) 99%)}[data-md-color-scheme=slate] .tx-container{background:url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1123 258'><path d='M1124,2c0,0 0,256 0,256l-1125,0l0,-48c0,0 16,5 55,5c116,0 197,-92 325,-92c121,0 114,46 254,46c140,0 214,-167 572,-166Z' style='fill: hsla(232, 15%, 21%, 1)' /></svg>") no-repeat bottom,linear-gradient(to bottom, var(--md-primary-fg-color), #a63fd9 99%, var(--md-default-bg-color) 99%)}.tx-hero{margin:0 .8rem;color:var(--md-primary-bg-color)}.tx-hero h1{margin-bottom:1rem;color:currentColor;font-weight:700}@media screen and (max-width: 29.9375em){.tx-hero h1{font-size:1.4rem}}.tx-hero__content{padding-bottom:6rem}@media screen and (min-width: 60em){.tx-hero{display:flex;align-items:stretch}.tx-hero__content{max-width:19rem;margin-top:3.5rem;padding-bottom:14vw}.tx-hero__image{order:1;width:38rem;transform:translateX(4rem)}}@media screen and (min-width: 76.25em){.tx-hero__image{transform:translateX(8rem)}}.tx-hero .md-button{margin-top:.5rem;margin-right:.5rem;color:var(--md-primary-bg-color)}.tx-hero .md-button:focus,.tx-hero .md-button:hover{color:var(--md-default-bg-color);background-color:var(--md-accent-fg-color);border-color:var(--md-accent-fg-color)}.tx-hero .md-button--primary{color:#894da8;background-color:var(--md-primary-bg-color);border-color:var(--md-primary-bg-color)}
 
-/*# sourceMappingURL=overrides.c462ebf7.min.css.map*/
+/*# sourceMappingURL=main.b1224278.min.css.map*/

material/overrides/main.html

@@ -22,7 +22,7 @@
   <meta name="twitter:title" content="{{ title }}">
   <meta name="twitter:description" content="{{ config.site_description }}">
   <meta name="twitter:image" content="{{ image }}">
-  <link rel="stylesheet" href="{{ 'assets/stylesheets/overrides.c462ebf7.min.css' | url }}">
+  <link rel="stylesheet" href="{{ 'overrides/assets/stylesheets/main.b1224278.min.css' | url }}">
 {% endblock %}
 {% block announce %}
   <a href="https://twitter.com/squidfunk">

src/overrides/assets/stylesheets/main.scss

@@ -25,6 +25,7 @@
 // ----------------------------------------------------------------------------
 
 @import "material-color";
+@import "material-shadows";
 
 // ----------------------------------------------------------------------------
 // Local imports
@@ -35,8 +36,8 @@
 
 @import "config";
 
-@import "overrides/typeset";
+@import "main/typeset";
 
-@import "overrides/layout/announce";
+@import "main/layout/announce";
-@import "overrides/layout/content";
+@import "main/layout/content";
-@import "overrides/layout/hero";
+@import "main/layout/hero";

src/overrides/main.html

@@ -55,7 +55,7 @@
   <!-- Extra stylesheets -->
   <link
     rel="stylesheet"
-    href="{{ 'assets/stylesheets/overrides.css' | url }}"
+    href="{{ 'overrides/assets/stylesheets/main.css' | url }}"
   />
 {% endblock %}
 

webpack.config.ts

@@ -116,6 +116,7 @@ function config(args: Configuration): Configuration {
                 implementation: require("sass"),
                 sassOptions: {
                   includePaths: [
+                    "src/assets/stylesheets",
                     "node_modules/modularscale-sass/stylesheets",
                     "node_modules/material-design-color",
                     "node_modules/material-shadows"
@@ -145,7 +146,7 @@ function config(args: Configuration): Configuration {
         __dirname,
         path.resolve(__dirname, "node_modules")
       ],
-      extensions: [".ts", ".tsx", ".js", ".json"],
+      extensions: [".scss", ".ts", ".tsx", ".js", ".json"],
       plugins: [
         new TsconfigPathsPlugin()
       ]
@@ -201,8 +202,9 @@ export default (_env: never, args: Configuration): Configuration[] => {
       entry: {
         "assets/javascripts/bundle":    "src/assets/javascripts",
         "assets/stylesheets/main":      "src/assets/stylesheets/main.scss",
-        "assets/stylesheets/overrides": "src/assets/stylesheets/overrides.scss",
+        "assets/stylesheets/palette":   "src/assets/stylesheets/palette.scss",
-        "assets/stylesheets/palette":   "src/assets/stylesheets/palette.scss"
+        "overrides/assets/stylesheets/main":
+          "src/overrides/assets/stylesheets/main.scss"
       },
       output: {
         path: path.resolve(__dirname, "material"),
@@ -334,9 +336,9 @@ export default (_env: never, args: Configuration): Configuration[] => {
                 "material/overrides/main.html"
               ]) {
                 const template = toPairs<string>(manifest)
-                  .reduce((content, [from, to]) => {
+                  .reduce((content, [from, to]) => (
-                    return content.replace(new RegExp(from, "g"), to)
+                    content.replace(new RegExp(`'${from}'`, "g"), `'${to}'`)
-                  }, fs.readFileSync(file, "utf8"))
+                  ), fs.readFileSync(file, "utf8"))
 
                 /* Save template with replaced assets */
                 fs.writeFileSync(file, template, "utf8")