Merge branch 'develop' into 3.x

octobercms · Feb 1, 2022 · 456f860 · 456f860
2 parents 5e85b5e + 9945b02
commit 456f860
Show file tree

Hide file tree

Showing 23 changed files with 924 additions and 526 deletions.
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
@@ -11,6 +11,11 @@ class UpdateManager
 {
     use \October\Rain\Support\Traits\Singleton;
 
+    /**
+     * @var string WANT_VERSION is the default composer version string to use.
+     */
+    const WANT_VERSION = 'dev-develop';
+
     /**
      * Requests details about a project based on its identifier.
      * @param  string $projectId

diff --git a/modules/system/traits/SetupHelper.php b/modules/system/traits/SetupHelper.php
@@ -55,11 +55,9 @@ protected function composerInstalled()
      */
     protected function composerRequireString($want = null)
     {
-        if ($want !== null) {
-            return 'october/all:' . $want;
-        }
+        $version = $want ?: UpdateManager::WANT_VERSION;
 
-        return 'october/all';
+        return '"october/all:'.$version.'"';
     }
 
     /**

diff --git a/themes/demo/assets/less/elements/footer.less b/themes/demo/assets/less/elements/footer.less
@@ -18,4 +18,4 @@
     p {
         font-size: 14px;
     }
-}
+}
diff --git a/themes/demo/assets/less/layouts/blog.less b/themes/demo/assets/less/layouts/blog.less
@@ -0,0 +1,111 @@
+@import "../theme/boot";
+
+//
+// Blog Layout Stylesheet
+//
+
+.blog-header {
+    line-height: 1;
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.blog-header-logo {
+    font-family: "Playfair Display", Georgia, "Times New Roman", serif;
+    font-size: 2.25rem;
+}
+
+.blog-header-logo:hover {
+    text-decoration: none;
+}
+
+.blog-featured {
+    line-height: 1.5;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-family: "Playfair Display", Georgia, "Times New Roman", serif;
+}
+
+.display-4 {
+    font-size: 2.5rem;
+}
+@media (min-width: 768px) {
+    .display-4 {
+        font-size: 3rem;
+    }
+}
+
+.nav-scroller {
+    position: relative;
+    z-index: 2;
+    height: 2.75rem;
+    overflow-y: hidden;
+}
+
+.nav-scroller .nav {
+    display: flex;
+    flex-wrap: nowrap;
+    padding-bottom: 1rem;
+    margin-top: -1px;
+    overflow-x: auto;
+    text-align: center;
+    white-space: nowrap;
+    -webkit-overflow-scrolling: touch;
+}
+
+.nav-scroller .nav-link {
+    padding-top: .75rem;
+    padding-bottom: .75rem;
+    font-size: .875rem;
+}
+
+.card-img-right {
+    height: 100%;
+    border-radius: 0 3px 3px 0;
+}
+
+.flex-auto {
+    flex: 0 0 auto;
+}
+
+.h-250 { height: 250px; }
+@media (min-width: 768px) {
+    .h-md-250 { height: 250px; }
+}
+
+/* Pagination */
+.blog-pagination {
+    margin-bottom: 4rem;
+}
+.blog-pagination > .btn {
+    border-radius: 2rem;
+}
+
+/*
+ * Blog posts
+ */
+.blog-post {
+    margin-bottom: 4rem;
+}
+.blog-post-title {
+    margin-bottom: .25rem;
+    font-size: 2.5rem;
+}
+.blog-post-meta {
+    margin-bottom: 1.25rem;
+    color: #727272;
+}
+
+/*
+ * Footer
+ */
+.blog-footer {
+    padding: 2.5rem 0;
+    color: #727272;
+    text-align: center;
+    background-color: #f9f9f9;
+    border-top: .05rem solid #e5e5e5;
+}
+.blog-footer p:last-child {
+    margin-bottom: 0;
+}
diff --git a/themes/demo/assets/less/layouts/default.less b/themes/demo/assets/less/layouts/default.less
@@ -1,16 +1,109 @@
+@import "../theme/boot";
+
 //
-// Layouts
-//
-// Styles specific to different page layouts.
+// Default Layout Stylesheet
 //
 
-// BS vars
-:root {
-    --bs-body-line-height: 1.7;
-    --bs-body-color: #586667;
+code {
+    padding: 2px 4px;
+    font-size: 90%;
+    color: #D35400;
+    background-color: #ECF0F1;
+    border-radius: 4px;
+}
+
+h1, .h1 {
+    font-size: 41px;
+}
+h2, .h2 {
+    font-size: 34px;
+}
+h3, .h3 {
+    font-size: 18px;
+}
+h4, .h4 {
+    font-size: 20px;
+}
+h5, .h5 {
+    font-size: 16px;
+}
+h6, .h6 {
+    font-size: 14px;
+}
+
+h1, .h1, h2, .h2, h3, .h3 {
+    margin-top: 27px;
+    margin-bottom: 13.5px;
+}
+
+h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
+    line-height: 1.1;
+    font-weight: bold;
+    color: #2C3E4F;
 }
 
-// Used by the fixed navbar
-body {
-    padding-top: 70px;
+h3 {
+    font-weight: normal;
+
+    &.header-icon {
+        position: relative;
+        padding: 0 0 10px 43px;
+
+        &:before {
+            content: '';
+            display: block;
+            width: 30px;
+            height: 30px;
+            background-size: 30px 30px!important;
+            position: absolute;
+            left: 0;
+            top: -5px;
+        }
+
+        &.cms-layout:before {
+            background: url('@{assets-url}/images/icon-layouts.png') no-repeat 0 0;
+        }
+
+        &.cms-page:before {
+            background: url('@{assets-url}/images/icon-pages.png') no-repeat 0 0;
+        }
+
+        &.cms-partial:before {
+            background: url('@{assets-url}/images/icon-partials.png') no-repeat 0 0;
+        }
+
+        &.cms-content-block:before {
+            background: url('@{assets-url}/images/icon-contentblocks.png') no-repeat 0 0;
+        }
+
+        &.cms-asset:before {
+            background: url('@{assets-url}/images/icon-assets.png') no-repeat 0 0;
+        }
+
+        &.cms-placeholder:before {
+            background: url('@{assets-url}/images/icon-placeholders.png') no-repeat 0 0;
+        }
+    }
+}
+
+ul.list-with-ticks {
+    padding: 0;
+
+    li {
+        list-style: none;
+        position: relative;
+        padding-left: 23px;
+
+        &:before {
+            content: '';
+            display: block;
+            width: 15px;
+            height: 15px;
+            background: url('@{assets-url}/images/icon-tick.png') no-repeat 0 0;
+            background-size: 15px 15px;
+            position: absolute;
+            left: 0;
+            top: 6px;
+        }
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,4 @@ @@
         p {
             font-size: 14px;
         }
-    }
+    }