Release v1.5.1

Ouxsoft · May 15, 2020 · ed46d16 · ed46d16
1 parent 56397ca
commit ed46d16
Show file tree

Hide file tree

Showing 21 changed files with 1,356 additions and 1,482 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,12 @@ All releases must adhere to [SemVer 2](https://semver.org/) naming convention an
 >PATCH version - when you make backwards compatible bug fixes.
 
 ## LivingMarkup [Unreleased]
+
+## LivingMarkup 1.5.1
 * Added: PNG image resize [#2b7b323](https://github.com/hxtree/LivingMarkup/commit/2b7b323bd882ff0ad5ae9a937d0f8a1449b862a1)
 * Fixed: JPG image resize [#2b7b323](https://github.com/hxtree/LivingMarkup/commit/2b7b323bd882ff0ad5ae9a937d0f8a1449b862a1)
+* Added: Image offset / focal point [#56397ca](https://github.com/hxtree/LivingMarkup/commit/56397ca7546b24291f63487ecb930e01398e66c3)
+* Added: Custom SCSS build [#56397ca](https://github.com/hxtree/LivingMarkup/commit/56397ca7546b24291f63487ecb930e01398e66c3)
 
 ## LivingMarkup 1.5.0
 Released: 2019-05-11. Notable changes:
@@ -25,4 +29,4 @@ Released: 2019-05-11. Notable changes:
 ## LivingMarkup 1.4.1
 Released: 2019-03-29. Notable changes:
 
-* Updated: Started following Semantic Versioning 2 properly [#74724ce](https://github.com/hxtree/LivingMarkup/commit/00c7ad18fe09465c864a6bb5a20618fbd7ce8e83)
+* Updated: Started following Semantic Versioning 2 properly [#74724ce](https://github.com/hxtree/LivingMarkup/commit/00c7ad18fe09465c864a6bb5a20618fbd7ce8e83)
diff --git a/app/modules/custom/Partials/Breadcrumb.php b/app/modules/custom/Partials/Breadcrumb.php
@@ -52,18 +52,18 @@ public function onRender()
         ];
 
         $out = '<!-- Breadcrumb -->' . PHP_EOL;
-        $out .= '<div class="breadcrumb">';
-        $out .= '<ul>';
+        $out .= '<nav aria-label="breadcrumb">';
+        $out .= '<ol class="breadcrumb mb-0">';
         foreach ($pages as $page) {
-            $out .= '<li>';
+            $out .= '<li class="breadcrumb-item active" aria-current="page">';
             $out .= '<span class="separator">' . $this->separator . '</span> ';
             $out .= '<a href="' . $page['href'] . '">';
             $out .= $page['title'];
             $out .= '</a>';
             $out .= '</li>';
         }
-        $out .= '</ul>';
-        $out .= '</div>';
+        $out .= '</ol>';
+        $out .= '</nav>';
         return $out;
     }
 }
diff --git a/app/modules/custom/Partials/HeaderDefault.php b/app/modules/custom/Partials/HeaderDefault.php
@@ -28,12 +28,6 @@ public function onRender()
                 LivingMarkup            
             </a>
         </nav>
-
-        <nav aria-label="breadcrumb">
-            <ol class="breadcrumb mb-0">
-                <li class="breadcrumb-item active" aria-current="page">Home</li>
-            </ol>
-        </nav>
 HTML;
     }
 }
diff --git a/assets/scss/_hero-image.scss b/assets/scss/_hero-image.scss
@@ -0,0 +1,26 @@
+/**
+ * This file is part of the LivingMarkup package.
+ *
+ * (c) Matthew Heroux <matthewheroux@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// crop at 1440x600
+.hero-image {
+  width: 100%;
+  height: 400px;
+  position: relative;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-position: center;
+}
+
+// crop at 1260x630
+.front-page {
+  .hero-image {
+    width: 100%;
+    min-height: 50vw;
+  }
+}
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -7,12 +7,6 @@
  * file that was distributed with this source code.
  */
 
-.hero-image {
-    height: 400px;
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: center center;
-    width: 100%;
-}
+@import "hero-image";
 
 @import "bootstrap.scss";
diff --git a/bin/SassCompiler.php b/bin/SassCompiler.php
@@ -19,14 +19,16 @@
 
 try {
     $scss = new Compiler();
-    $scss->setImportPaths('vendor/twbs/bootstrap/scss/');
-
     $scss->setFormatter("ScssPhp\ScssPhp\Formatter\Compressed");
 
-    // start out with bootstrap
-    $output = $scss->compile('@import "bootstrap.scss";');
+    // set root import path and add additional paths
+    $scss->setImportPaths('assets/scss/');
+    $scss->addImportPath('vendor/twbs/bootstrap/scss/');
+
+    // compile
+    $output = $scss->compile('@import "main.scss";');
 
-    // save file contents
+    // save
     file_put_contents($path, $output);
 
 } catch (\Exception $e) {

diff --git a/composer.json b/composer.json
@@ -70,13 +70,11 @@
       "php-cs-fixer fix --rules=@PSR2 --using-cache=no app/",
       "php-cs-fixer fix --rules=@PSR2 --using-cache=no src/",
       "php-cs-fixer fix --rules=@PSR2 --using-cache=no test/",
-      "rm -rf public/assets/css/bootstrap",
-      "cp -R vendor/twbs/bootstrap/dist/css/ public/assets/css/bootstrap",
+      "php bin/SassCompiler.php",
       "rm -rf public/assets/js/bootstrap",
       "cp -R vendor/twbs/bootstrap/dist/js/ public/assets/js/bootstrap",
       "rm -rf public/assets/js/jquery/*",
-      "cp vendor/components/jquery/jquery.min.js public/assets/js/jquery/jquery.min.js",
-      "php bin/SassCompiler.php"
+      "cp vendor/components/jquery/jquery.min.js public/assets/js/jquery/jquery.min.js"
     ],
     "test": [
       "phpunit --colors=always"