From 2149c31536bb132586de0ed13ebea4eb0ccf22ce Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 20 May 2022 17:26:23 -0500 Subject: [PATCH] Changes for v1.3.7 --- build | 2 +- njk/assets/lib/admin-customization.php | 24 +++--- njk/assets/theme.scss | 104 +++++++++++++++++++++++++ njk/templates/_globals-defaults.html | 27 +++---- 4 files changed, 132 insertions(+), 25 deletions(-) create mode 100644 njk/assets/theme.scss diff --git a/build b/build index 1f9acc6..996b065 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 1f9acc6f96a797a7a9fc35d036090d0df5a7000a +Subproject commit 996b065b6b62fefdf26547e55c0fdfcf6cc7871a diff --git a/njk/assets/lib/admin-customization.php b/njk/assets/lib/admin-customization.php index ca4b745..8d1a552 100644 --- a/njk/assets/lib/admin-customization.php +++ b/njk/assets/lib/admin-customization.php @@ -25,20 +25,22 @@ function {{globals.code_prefix}}admin_footer_function() { }); -
-

Format tags allow you to safely format text for certain options that don\'t support HTML formatting, such as headlines. Below is a listing of currently-available tags:

-
-
[strong]...[/strong]
-

This tag allows you to bold portions of text by wrapping the desired text in [strong]...[/strong].
(Ex: "I want [strong]this[/strong] to be bold.")

-
-
[em]...[/em]
-

Similiar to the [strong] tag, this tag allows you to italicize portions of text by wrapping the desired text in [em]...[/em].
(Ex: "I want [em]this[/em] to be italic.")

-
-
[br]
-

This tags allows you to insert a line break. Use [br] for the line break to appear on all devices, [mbr] for the line break to only appear on mobile, and [dbr] for the break to only appear on desktop.
(Ex: "I want this text on line 1,[br]and this text on line 2.")

+
+
+

Format tags allow you to safely format text for certain options that don\'t support HTML formatting, such as headlines. Below is a listing of currently-available tags:

+
+
[strong]...[/strong]
+

This tag allows you to bold portions of text by wrapping the desired text in [strong]...[/strong].
(Ex: "I want [strong]this[/strong] to be bold.")

+
+
[em]...[/em]
+

Similiar to the [strong] tag, this tag allows you to italicize portions of text by wrapping the desired text in [em]...[/em].
(Ex: "I want [em]this[/em] to be italic.")

+
+
[br]
+

This tags allows you to insert a line break. Use [br] for the line break to appear on all devices, [mbr] for the line break to only appear on mobile, and [dbr] for the break to only appear on desktop.
(Ex: "I want this text on line 1,[br]and this text on line 2.")

'; do_action( 'method_after_tags_dialog_html' ); echo ' +
'; } diff --git a/njk/assets/theme.scss b/njk/assets/theme.scss new file mode 100644 index 0000000..7921a1a --- /dev/null +++ b/njk/assets/theme.scss @@ -0,0 +1,104 @@ +{% import '_globals.html' as globals %}{% extends "_barebones.html" %}{% block content %}/* +THEME STYLES +*/ + +// Import Bootstrap. Place any overrides before the import. + +$green: #4BFD9F; +$primary: $green; + +@import "inc/bootstrap/scss/bootstrap.scss"; + + +// Jarallax CSS + +.jarallax { + position: relative; + z-index: 0; +} +.jarallax > .jarallax-img { + position: absolute; + object-fit: cover; + /* support for plugin https://github.com/bfred-it/object-fit-images */ + font-family: 'object-fit: cover;'; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; +} + +// Error 404 Styles + +.error404 { + height: 100%; + min-height: 100%; + //background-image: url('assets/images/error404-bg.png'); + background-size: cover; + background-position: center center; + background-repeat: no-repeat; + background-color: $gray-100; + + @include media-breakpoint-down(xs) { + background: transparent; + } + .row { + height: 100vh; + } + .error404-content { + padding: 2rem 0 2.75rem 0; + background-color: #fff; + border-radius: 4px; + border: 3px solid #CDCDCD; + box-shadow: 0 5px 15px rgba(0,0,0,0.15); + + @include media-breakpoint-down(xs) { + background: transparent; + border: none; + box-shadow: none; + } + + h1 { + font-size: 8rem; + font-family: $font-family-sans-serif; + color: $primary; + font-weight: 900; + line-height: 0.9; + margin: 0 0 0.25rem 0; + + @include media-breakpoint-down(sm) { + font-size: 6rem; + } + } + h2 { + font-size: 1.75rem; + font-family: $font-family-sans-serif; + color: $gray-600; + line-height: 1; + margin: 0 0 2rem 0; + font-weight: 900; + + @include media-breakpoint-down(sm) { + font-size: 1.5rem; + } + } + + p { + font-family: $font-family-sans-serif; + font-style: italic; + font-size: 0.95rem; + color: #595959; + font-weight: 500; + padding: 0 1.75rem; + margin: 0 0 2rem 0; + } + + .btn-primary { + font-weight: 700; + } + } +} + +.{{globals.css_prefix}}-full-width-container { + max-width: 1300px; +}{% endblock %} \ No newline at end of file diff --git a/njk/templates/_globals-defaults.html b/njk/templates/_globals-defaults.html index c63cf99..046cf2a 100644 --- a/njk/templates/_globals-defaults.html +++ b/njk/templates/_globals-defaults.html @@ -10,7 +10,7 @@ {% set theme_name = "Method" %} {% set theme_uri = "https://github.com/pixelwatt/method" %} {% set theme_description = "A barebones foundation for custom theme development." %} -{% set theme_version = "1.3.6" %} +{% set theme_version = "1.3.7" %} {% set theme_license = "GNU General Public License v2 or later" %} {% set theme_author = "Rob Clark" %} {% set theme_author_uri = "https://robclark.io/" %} @@ -18,6 +18,16 @@ {% set github_theme_uri = false %} +{# ---------------------------------------------------------------- #} +{# Code #} +{# ---------------------------------------------------------------- #} + +{% set code_textdomain = "method" %} +{% set code_prefix = "method_" %} +{% set code_layoutclass = "MethodThemeLayout" %} +{% set css_prefix = "method" %} + + {# ---------------------------------------------------------------- #} {# Theme Support #} {# ---------------------------------------------------------------- #} @@ -41,7 +51,7 @@ {# ---------------------------------------------------------------- #} {% set image_sizes = [ - { name: "method_1400_600", width: 1400, height: 600, cropped: true } + { name: [ code_prefix, "1400_600" ] | join, width: 1400, height: 600, cropped: true } ] %} @@ -58,15 +68,6 @@ {% set require_elliston = false %} -{# ---------------------------------------------------------------- #} -{# Code #} -{# ---------------------------------------------------------------- #} - -{% set code_textdomain = "method" %} -{% set code_prefix = "method_" %} -{% set code_layoutclass = "MethodThemeLayout" %} - - {# ---------------------------------------------------------------- #} {# Javascript Libraries #} {# ---------------------------------------------------------------- #} @@ -80,8 +81,8 @@ {# ---------------------------------------------------------------- #} {% set css_classes = [ - { id: "full_width_outer_col", class: "full-width-outer-col col-12 col-sm-11" }, - { id: "full_width_container", class: "full-width-container" } + { id: "full_width_outer_col", class: [ css_prefix, "-full-width-outer-col col-12 col-sm-11" ] | join }, + { id: "full_width_container", class: [ css_prefix, "-full-width-container" ] | join } ] %}