Cleaned up stylesheet source directory structure

docs/reference/admonitions.md

@@ -24,7 +24,7 @@ markdown_extensions:
   - admonition
 ```
 
-  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/_admonition.scss
+  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/markdown/_admonition.scss
   [2]: https://python-markdown.github.io/extensions/admonition/
 
 ### Details
@@ -40,7 +40,7 @@ markdown_extensions:
   - pymdownx.details
 ```
 
-  [3]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/pymdown/_details.scss
+  [3]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/pymdownx/_details.scss
   [4]: https://facelessuser.github.io/pymdown-extensions/extensions/details/
   [5]: https://facelessuser.github.io/pymdown-extensions/
 
@@ -57,7 +57,7 @@ markdown_extensions:
   - pymdownx.superfences
 ```
 
-  [6]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/base/_typeset.scss
+  [6]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/_typeset.scss
   [7]: https://facelessuser.github.io/pymdown-extensions/extensions/superfences/
 
 ## Usage

docs/reference/code-blocks.md

@@ -106,7 +106,7 @@ _Material for MkDocs doesn't provide official support for the other options of
 this extension, so they may be supported but can also yield weird results. Use
 them at your own risk._
 
-  [2]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/pymdown/_highlight.scss
+  [2]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/pymdownx/_highlight.scss
   [3]: https://facelessuser.github.io/pymdown-extensions/extensions/highlight/
   [4]: https://python-markdown.github.io/extensions/code_hilite/
   [5]: https://facelessuser.github.io/pymdown-extensions/
@@ -148,7 +148,7 @@ markdown_extensions:
   - pymdownx.superfences
 ```
 
-  [13]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/base/_typeset.scss
+  [13]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/_typeset.scss
   [14]: https://facelessuser.github.io/pymdown-extensions/extensions/superfences/
 
 ### Keys
@@ -164,7 +164,7 @@ markdown_extensions:
   - pymdownx.keys
 ```
 
-  [15]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/pymdown/_keys.scss
+  [15]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/pymdownx/_keys.scss
   [16]: https://facelessuser.github.io/pymdown-extensions/extensions/keys/
 
 ## Usage

docs/reference/content-tabs.md

@@ -22,7 +22,7 @@ markdown_extensions:
   - pymdownx.tabbed
 ```
 
-  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/pymdown/_tabbed.scss
+  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss
   [2]: https://facelessuser.github.io/pymdown-extensions/extensions/tabbed/
   [3]: https://facelessuser.github.io/pymdown-extensions/
 
@@ -39,7 +39,7 @@ markdown_extensions:
   - pymdownx.superfences
 ```
 
-  [4]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/base/_typeset.scss
+  [4]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/_typeset.scss
   [5]: https://facelessuser.github.io/pymdown-extensions/extensions/superfences/
 
 ## Usage

docs/reference/footnotes.md

@@ -24,7 +24,7 @@ markdown_extensions:
   - footnotes
 ```
 
-  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/_footnotes.scss
+  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/markdown/_footnotes.scss
   [2]: https://python-markdown.github.io/extensions/footnotes/
 
 ## Usage

docs/reference/lists.md

@@ -24,7 +24,7 @@ markdown_extensions:
   - def_list
 ```
 
-  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/base/_typeset.scss
+  [1]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/_typeset.scss
   [2]: https://python-markdown.github.io/extensions/definition_lists/
 
 ### Tasklist
@@ -59,7 +59,7 @@ configuring the style:
           clickable_checkbox: true
     ```
 
-  [3]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/pymdown/_tasklist.scss
+  [3]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/pymdownx/_tasklist.scss
   [4]: https://facelessuser.github.io/pymdown-extensions/extensions/tasklist/
   [5]: https://facelessuser.github.io/pymdown-extensions/
 

docs/setup/changing-the-colors.md

@@ -250,7 +250,7 @@ colors or neutral colors:
 }
 ```
 
-  [6]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/base/_colors.scss
+  [6]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/_colors.scss
   [7]: https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_custom_properties
   [8]: ../customization.md#additional-stylesheets
   [9]: ../reference/code-blocks.md

docs/setup/changing-the-logo-and-icons.md

@@ -78,7 +78,7 @@ The following icon sets are bundled with Material for MkDocs:
 
 If you want to add [additional icons][1], read on.
 
-  [5]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/extensions/pymdown/_emoji.scss
+  [5]: https://github.com/squidfunk/mkdocs-material/blob/master/src/assets/stylesheets/main/extensions/pymdownx/_emoji.scss
   [6]: https://facelessuser.github.io/pymdown-extensions/extensions/emoji/
   [7]: https://facelessuser.github.io/pymdown-extensions/
   [8]: ../creating-your-site.md#building-your-site

material/assets/manifest.json

@@ -5,8 +5,8 @@
   "assets/javascripts/vendor.js.map": "assets/javascripts/vendor.877163d5.min.js.map",
   "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.a68abb33.min.js",
   "assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.a68abb33.min.js.map",
-  "assets/stylesheets/main.css": "assets/stylesheets/main.364d010a.min.css",
-  "assets/stylesheets/main.css.map": "assets/stylesheets/main.364d010a.min.css.map",
+  "assets/stylesheets/main.css": "assets/stylesheets/main.daf2a690.min.css",
+  "assets/stylesheets/main.css.map": "assets/stylesheets/main.daf2a690.min.css.map",
   "assets/stylesheets/overrides.css": "assets/stylesheets/overrides.823d2928.min.css",
   "assets/stylesheets/overrides.css.map": "assets/stylesheets/overrides.823d2928.min.css.map",
   "assets/stylesheets/palette.css": "assets/stylesheets/palette.a53427c9.min.css",

material/base.html

@@ -41,7 +41,7 @@
       {% endif %}
     {% endblock %}
     {% block styles %}
-      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.364d010a.min.css' | url }}">
+      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.daf2a690.min.css' | url }}">
       {% if palette.scheme or palette.primary or palette.accent %}
         <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.a53427c9.min.css' | url }}">
       {% endif %}

material/overrides/main.html

@@ -28,9 +28,7 @@
   <a href="https://twitter.com/squidfunk">
     For updates follow <strong>@squidfunk</strong> on
     <span class="twemoji twitter">
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-        <path d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path>
-      </svg>
+      {% include ".icons/fontawesome/brands/twitter.svg" %}
     </span>
     <strong>Twitter</strong>
   </a>
@@ -38,25 +36,16 @@
 {% block content %}
   {{ super() }}
   <aside class="tx-sponsor md-typeset">
-    <a href="{{ 'sponsorship' | url }}" title="Becoming a sponsor">
+    <a href="{{ 'sponsorship' | url }}" title="Become a sponsor">
       <hr>
       <span class="twemoji">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 89 89">
-          <path d="M3.136 17.387v42.932l42.932 21.467L3.136 17.387z"></path>
-          <path fill-opacity=".5" d="M21.91 8l42.933 64.398-18.775 9.388L3.136 17.387 21.91 8z"></path>
-          <path d="M67.535 17.387L40.273 35.543l21.878 32.818 5.384 2.691V17.387z"></path>
-          <path fill-opacity=".25" d="M67.535 17.387v53.666l18.774-9.388V8l-18.774 9.387z"></path>
-        </svg>
+        {% include ".icons/logo.svg" %}
       </span>
       <span class="twemoji">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-          <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
-        </svg>
+        {% include ".icons/material/plus.svg" %}
       </span>
       <span class="twemoji tx-sponsor__heart">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-          <path d="M14 20.408c-.492.308-.903.546-1.192.709-.153.086-.308.17-.463.252h-.002a.75.75 0 01-.686 0 16.709 16.709 0 01-.465-.252 31.147 31.147 0 01-4.803-3.34C3.8 15.572 1 12.331 1 8.513 1 5.052 3.829 2.5 6.736 2.5 9.03 2.5 10.881 3.726 12 5.605 13.12 3.726 14.97 2.5 17.264 2.5 20.17 2.5 23 5.052 23 8.514c0 3.818-2.801 7.06-5.389 9.262A31.146 31.146 0 0114 20.408z"></path>
-        </svg>
+        {% include ".icons/octicons/heart-fill-24.svg" %}
       </span>
       <hr>
     </a>

src/assets/stylesheets/main.scss

@@ -37,38 +37,38 @@
 
 @import "config";
 
-@import "base/reset";
-@import "base/colors";
-@import "base/icons";
-@import "base/typeset";
+@import "main/reset";
+@import "main/colors";
+@import "main/icons";
+@import "main/typeset";
 
-@import "layout/base";
-@import "layout/announce";
-@import "layout/button";
-@import "layout/clipboard";
-@import "layout/content";
-@import "layout/dialog";
-@import "layout/header";
-@import "layout/hero";
-@import "layout/footer";
-@import "layout/nav";
-@import "layout/search";
-@import "layout/sidebar";
-@import "layout/source";
-@import "layout/tabs";
+@import "main/layout/base";
+@import "main/layout/announce";
+@import "main/layout/button";
+@import "main/layout/clipboard";
+@import "main/layout/content";
+@import "main/layout/dialog";
+@import "main/layout/header";
+@import "main/layout/hero";
+@import "main/layout/footer";
+@import "main/layout/nav";
+@import "main/layout/search";
+@import "main/layout/sidebar";
+@import "main/layout/source";
+@import "main/layout/tabs";
 
-@import "extensions/admonition";
-@import "extensions/codehilite";
-@import "extensions/footnotes";
-@import "extensions/permalinks";
+@import "main/extensions/markdown/admonition";
+@import "main/extensions/markdown/codehilite";
+@import "main/extensions/markdown/footnotes";
+@import "main/extensions/markdown/toc";
 
-@import "extensions/pymdown/arithmatex";
-@import "extensions/pymdown/critic";
-@import "extensions/pymdown/details";
-@import "extensions/pymdown/emoji";
-@import "extensions/pymdown/highlight";
-@import "extensions/pymdown/keys";
-@import "extensions/pymdown/tabbed";
-@import "extensions/pymdown/tasklist";
+@import "main/extensions/pymdownx/arithmatex";
+@import "main/extensions/pymdownx/critic";
+@import "main/extensions/pymdownx/details";
+@import "main/extensions/pymdownx/emoji";
+@import "main/extensions/pymdownx/highlight";
+@import "main/extensions/pymdownx/keys";
+@import "main/extensions/pymdownx/tabbed";
+@import "main/extensions/pymdownx/tasklist";
 
-@import "shame";
+@import "main/shame";

src/overrides/main.html

@@ -64,9 +64,7 @@
   <a href="https://twitter.com/squidfunk">
     For updates follow <strong>@squidfunk</strong> on
     <span class="twemoji twitter">
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-        <path d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path>
-      </svg>
+      {% include ".icons/fontawesome/brands/twitter.svg" %}
     </span>
     <strong>Twitter</strong>
   </a>
@@ -78,25 +76,16 @@
 
   <!-- Sponsor banner -->
   <aside class="tx-sponsor md-typeset">
-    <a href="{{ 'sponsorship' | url }}" title="Becoming a sponsor">
+    <a href="{{ 'sponsorship' | url }}" title="Become a sponsor">
       <hr />
       <span class="twemoji">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 89 89">
-          <path d="M3.136 17.387v42.932l42.932 21.467L3.136 17.387z"></path>
-          <path fill-opacity=".5" d="M21.91 8l42.933 64.398-18.775 9.388L3.136 17.387 21.91 8z"></path>
-          <path d="M67.535 17.387L40.273 35.543l21.878 32.818 5.384 2.691V17.387z"></path>
-          <path fill-opacity=".25" d="M67.535 17.387v53.666l18.774-9.388V8l-18.774 9.387z"></path>
-        </svg>
+        {% include ".icons/logo.svg" %}
       </span>
       <span class="twemoji">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-          <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
-        </svg>
+        {% include ".icons/material/plus.svg" %}
       </span>
       <span class="twemoji tx-sponsor__heart">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-          <path d="M14 20.408c-.492.308-.903.546-1.192.709-.153.086-.308.17-.463.252h-.002a.75.75 0 01-.686 0 16.709 16.709 0 01-.465-.252 31.147 31.147 0 01-4.803-3.34C3.8 15.572 1 12.331 1 8.513 1 5.052 3.829 2.5 6.736 2.5 9.03 2.5 10.881 3.726 12 5.605 13.12 3.726 14.97 2.5 17.264 2.5 20.17 2.5 23 5.052 23 8.514c0 3.818-2.801 7.06-5.389 9.262A31.146 31.146 0 0114 20.408z"></path>
-        </svg>
+        {% include ".icons/octicons/heart-fill-24.svg" %}
       </span>
       <hr />
     </a>