Merge pull request #3 from BlueHuskyStudios/For/SubspaceTeaTi.me/1

Various improvements & additions
BlueHuskyStudios · Jul 13, 2021 · 91a99d5 · 91a99d5
2 parents b3d6792 + 9a66611
commit 91a99d5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 16 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -42,9 +42,9 @@ If you got this:
 
 
 1: DECLARATION OF COPYRIGHT
-   This Product is copyright Ben Leggiero (c) 2020 BH-1-PS
+   This Product is copyright Ben "Ky" Leggiero (c) 2021 BH-1-PS
 
-   Ben Leggiero may be reached at BenLeggiero@Gmail.com
+   Ben "Ky" Leggiero may be reached at KyLeggiero@Gmail.com
 
 
 2: DEFINITIONS

diff --git a/header-meta.html b/header-meta.html
@@ -22,29 +22,34 @@
 {% endif %}
 <meta property="og:site_name"                      content="{{ site.name }}" />
 <meta property="twitter:site"                      content="{{ site.name }}" />
-{% if site.social.twitter %}
-<meta name="twitter:creator"                       content="@{{ site.social.twitter }}" /><!-- Tell twitter that this was made by {{ site.author.name }} -->
+{% if site.social.twitter-username | default: site.social.twitter %}
+<meta name="twitter:creator"                       content="@{{ site.social.twitter-username | default: site.social.twitter }}" /><!-- Tell twitter that this was made by {{ site.author.name }} -->
 {% endif %}
-<meta property="og:type"                           content="{% if page.type | default: site.type %}{{ page.type | default: site.type }}{% else %}website{% endif %}" />
+<meta property="og:type"                           content="{{ page.type | default: site.type | default: 'website' }}" />
 <meta property="og:url"                            content="{{ site.url }}{{ page.url }}" />
+{%- if site.author -%}
 <meta name="author"                                content="{{ site.author.name }}" />
 <meta property="profile:first_name"                content="{{ site.author.first-name }}" />
 <meta property="profile:last_name"                 content="{{ site.author.last-name }}" />
+{%- endif %}
+{%- if site.social.default-username -%}
 <meta property="profile:username"                  content="{{ site.social.default-username }}" />
+{%- endif %}
 <meta name="twitter:card"                          content="summary_large_image" /><!-- Tell twitter that this link can be presented as a large image with a summary -->
 <meta name="msapplication-TileImage"               content="/images/MS-Tile-Image.png" /><!-- When pinned as a tile for Windows' Start, this is the image -->
-<meta property="og:image"                          content="{{ page.social-preview-image-url | default: page.hero-image | default: '/images/Social-Preview.png' }}" /><!-- Image for sharing on social networks -->
-<meta property="twitter:image"                     content="{{ page.social-preview-image-url | default: page.hero-image | default: '/images/Social-Preview.png' }}" />
-<meta name="twitter:image:src"                     content="{{ page.social-preview-image-url | default: page.hero-image | default: '/images/Social-Preview.png' }}" />
-{% if site.theme-color %}
-<meta name="msapplication-TileColor"               content="{{ site.theme-color }}" /><!-- When pinned as a tile for Windows' Start, this is the tile's BG color -->
-<meta name="theme-color"                           content="{{ site.theme-color }}"/><!-- Color in Chrome address bar -->
-<meta name="apple-mobile-web-app-status-bar-style" content="{{ site.theme-color }}" /><!-- Color in Safari status bar -->
+<meta property="og:image"                          content="{{ page.social-preview-image-url | default: page.hero-image | default: site.social-preview-image-url | default: '/images/Social-Preview.png' }}" /><!-- Image for sharing on social networks -->
+<meta property="twitter:image"                     content="{{ page.social-preview-image-url | default: page.hero-image | default: site.social-preview-image-url | default: '/images/Social-Preview.png' }}" />
+<meta name="twitter:image:src"                     content="{{ page.social-preview-image-url | default: page.hero-image | default: site.social-preview-image-url | default: '/images/Social-Preview.png' }}" />
+{%- assign theme-color = site.brand.primary-color | default: site.theme-color %}
+{%- if theme-color %}
+<meta name="msapplication-TileColor"               content="{{ theme-color }}" /><!-- When pinned as a tile for Windows' Start, this is the tile's BG color -->
+<meta name="theme-color"                           content="{{ theme-color }}"/><!-- Color in Chrome address bar -->
+<meta name="apple-mobile-web-app-status-bar-style" content="{{ theme-color }}" /><!-- Color in Safari status bar -->
 {% endif %}
 {% if page.date %}
 <meta property="article:published_time"            content="{{ page.date }}" />
-{% endif %}
-{% if page.date-modified %}
+{%- endif %}
+{%- if page.date-modified %}
 <meta property="article:modified_time"             content="{{ page.date-modified }}" />
 {% endif %}
 

diff --git a/header-scripts.html b/header-scripts.html
@@ -1,4 +1,14 @@
 
-<script src="https://shared.bhstudios.org/_js/jquery-bh-preferred.js">/* jQuery */</script>
+{%- assign jQuery = include.jQuery | default: layout.jQuery | default: site.jQuery | default: true %}
+
+{%- if jQuery %}
+<script src="{% if jQuery == true -%} https://code.jquery.com/jquery-3.x-git.slim.min.js {%- else -%} {{ jQuery }} {%- endif -%}">/* jQuery */</script>
+{%- endif %}
 <script src="https://scripts.bhstudios.org/assets/v2/general/js/lib/kotlin.js">/* Kotlin/JS for BHStudios General Script */</script>
 <script src="https://scripts.bhstudios.org/assets/v2/general/js/BHStudios%20General%20Scripts.js">/* BHStudios General Script */</script>
+
+<script>
+if (undefined === window.localStorage["org.bh.theme"]) {
+    window.localStorage["org.bh.theme"] = JSON.stringify({"color":"{{ site.default-theme.color | default: 'water' }}","brightness":"{{ site.default-theme.brightness | default: 'dark' }}"})
+}
+</script>
diff --git a/header-stylesheets.html b/header-stylesheets.html
@@ -3,7 +3,7 @@
 <link rel="stylesheet" type="text/css" id="stylesheet-print"     href="https://stylesheets.bhstudios.org/assets/v2/basics/print.css" />
 <link rel="stylesheet" type="text/css" id="framework-stylesheet" href="https://stylesheets.bhstudios.org/assets/v2/neon/neon-renderer.css" />
 <link rel="stylesheet" type="text/css" id="theme-stylesheet"     href="{{ site.default-neon-theme-url | default: 'https://stylesheets.bhstudios.org/assets/v2/neon/neon-water.css' }}" />
-<link rel="stylesheet" type="text/css" id="material-icons"       href="https://fonts.googleapis.com/icon?family=Material+Icons" />
+<link rel="stylesheet" type="text/css" id="material-icons"       href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Sharp|Material+Icons+Round|Material+Icons+Two+Tone" />
 <link rel="stylesheet" type="text/css" id="google-fonts"         href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700|Questrial|ZCOOL+QingKe+HuangYou|Oswald:600&amp;subset=chinese-simplified,korean,latin-ext,vietnamese,cyrillic,cyrillic-ext,greek,greek-ext">
 <link rel="stylesheet" type="text/css" id="site-styles"          href="{{ site.baseurl }}/site.css" />
 {%- for stylesheet in page.page-specific-stylesheets %}