Merge branch 'release/1.2.4'

CHANGELOG.md

@@ -1,3 +1,16 @@
+# v1.2.4
+## 11/12/2018
+
+1. [](#improved)
+    * Updated [Spectre.css](https://picturepan2.github.io/spectre/) to latest `0.5.5` version
+    * Added link support to modular `features` [#39](https://github.com/getgrav/grav-theme-quark/pull/39/)
+    * Remove desktop menu when in mobile mode [#59](https://github.com/getgrav/grav-theme-quark/pull/59/)
+    * Support modular `text` full-width if no image [#70](https://github.com/getgrav/grav-theme-quark/issues/70)
+    * Shim for IE support of BrickLayer.js [#64](https://github.com/getgrav/grav-theme-quark/issues/64)
+1. [](#bugfix)
+    * Fixed `continue_link:` showing up as toggled [#65](https://github.com/getgrav/grav-theme-quark/issues/65)
+    * Fixed issue with modular pages not hidden in on-page menu with `visible: false` [#71](https://github.com/getgrav/grav-theme-quark/issues/71)
+
 # v1.2.3
 ## 11/05/2018
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Quark
-version: 1.2.3
+version: 1.2.4
 description: New Grav Default Theme
 icon:  microchip
 author:
@@ -13,7 +13,7 @@ bugs: https://github.com/getgrav/grav-theme-quark/issues
 license: MIT
 
 dependencies:
-    - { name: grav, version: '>=1.4.0' }
+    - { name: grav, version: '>=1.5.0' }
 
 form:
   validation: loose

blueprints/item.yaml

@@ -22,7 +22,6 @@ form:
               label: DF Style Link
               help: Daring Fireball style title link
               highlight: 1
-              default: 1
               options:
                 1: PLUGIN_ADMIN.ENABLED
                 0: PLUGIN_ADMIN.DISABLED

blueprints/modular/features.yaml

@@ -33,3 +33,6 @@ form:
                 .text:
                   type: text
                   label: Text
+                .url:
+                  type: text
+                  label: Link

js/scopedQuerySelectorShim.min.js

@@ -0,0 +1,9 @@
+/* scopeQuerySelectorShim.js
+*
+* Copyright (C) 2015 Larry Davis
+* All rights reserved.
+*
+* This software may be modified and distributed under the terms
+* of the BSD license.  See the LICENSE file for details.
+*/
+!function(){function a(a,c){var e=a[c];a[c]=function(a){var c,f=!1,g=!1;return a.match(d)?(a=a.replace(d,""),this.parentNode||(b.appendChild(this),g=!0),parentNode=this.parentNode,this.id||(this.id="rootedQuerySelector_id_"+(new Date).getTime(),f=!0),c=e.call(parentNode,"#"+this.id+" "+a),f&&(this.id=""),g&&b.removeChild(this),c):e.call(this,a)}}if(!HTMLElement.prototype.querySelectorAll)throw new Error("rootedQuerySelectorAll: This polyfill can only be used with browsers that support querySelectorAll");var b=document.createElement("div");try{b.querySelectorAll(":scope *")}catch(c){var d=/^\s*:scope/gi;a(HTMLElement.prototype,"querySelector"),a(HTMLElement.prototype,"querySelectorAll")}}();

scss/spectre/_asian.scss

@@ -1,24 +1,29 @@
 // Optimized for East Asian CJK
-:lang(zh),
-:lang(zh-Hans) {
+html:lang(zh),
+html:lang(zh-Hans),
+.lang-zh,
+.lang-zh-hans {
   font-family: $cjk-zh-hans-font-family;
 }
 
-:lang(zh-Hant) {
+html:lang(zh-Hant),
+.lang-zh-hant {
   font-family: $cjk-zh-hant-font-family;
 }
 
-:lang(ja) {
+html:lang(ja),
+.lang-ja {
   font-family: $cjk-jp-font-family;
 }
 
-:lang(ko) {
+html:lang(ko),
+.lang-ko {
   font-family: $cjk-ko-font-family;
 }
 
 :lang(zh),
 :lang(ja),
-.cjk {
+.lang-cjk {
   ins,
   u {
     border-bottom: $border-width solid;

scss/spectre/_breadcrumbs.scss

@@ -20,7 +20,7 @@
 
     &:not(:first-child) {
       &::before {
-        color: $gray-color-light;
+        color: $gray-color-dark;
         content: "/";
         padding-right: $unit-2;
       }

scss/spectre/_chips.scss

@@ -3,16 +3,18 @@
   align-items: center;
   background: $bg-color-dark;
   border-radius: 5rem;
-  color: $gray-color-dark;
   display: inline-flex;
   font-size: 90%;
   height: $unit-6;
   line-height: $unit-4;
   margin: $unit-h;
-  max-width: 100%;
+  max-width: $control-width-sm;
+  overflow: hidden;
   padding: $unit-1 $unit-2;
   text-decoration: none;
+  text-overflow: ellipsis;
   vertical-align: middle;
+  white-space: nowrap;
 
   &.active {
     background: $primary-color;

scss/spectre/_forms.scss

@@ -118,19 +118,7 @@ textarea.form-input {
   padding: $control-padding-y $control-padding-x;
   vertical-align: middle;
   width: 100%;
-
-  &[size],
-  &[multiple] {
-    height: auto;
-
-    option {
-      padding: $unit-h $unit-1;
-    }
-  }
-  &:not([multiple]):not([size]) {
-    background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%204%205'%3E%3Cpath%20fill='%23667189'%20d='M2%200L0%202h4zm0%205L0%203h4z'/%3E%3C/svg%3E") no-repeat right .35rem center/.4rem .5rem;
-    padding-right: $control-icon-size + $control-padding-x;
-  }
+  background: $bg-color-light; 
   &:focus {
     @include control-shadow();
     border-color: $primary-color;
@@ -151,6 +139,21 @@ textarea.form-input {
     height: $control-size-lg;
     padding: $control-padding-y-lg ($control-icon-size + $control-padding-x-lg) $control-padding-y-lg $control-padding-x-lg;
   }
+
+  // Multiple select
+  &[size],
+  &[multiple] {
+    height: auto;
+    padding: $control-padding-y $control-padding-x;
+
+    option {
+      padding: $unit-h $unit-1;
+    }
+  }
+  &:not([multiple]):not([size]) {
+    background: $bg-color-light url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%204%205'%3E%3Cpath%20fill='%23667189'%20d='M2%200L0%202h4zm0%205L0%203h4z'/%3E%3C/svg%3E") no-repeat right .35rem center / .4rem .5rem;
+    padding-right: $control-icon-size + $control-padding-x;
+  }
 }
 
 // Form Icons
@@ -266,14 +269,14 @@ textarea.form-input {
         border-left-width: 0;
         border-top-width: 0;
         content: "";
-        height: 12px;
+        height: 9px;
         left: 50%;
-        margin-left: -4px;
-        margin-top: -8px;
+        margin-left: -3px;
+        margin-top: -6px;
         position: absolute;
         top: 50%;
         transform: rotate(45deg);
-        width: 8px;
+        width: 6px;
       }
     }
     &:indeterminate + .form-icon {
@@ -304,12 +307,12 @@ textarea.form-input {
         background: $bg-color-light;
         border-radius: 50%;
         content: "";
-        height: 4px;
+        height: 6px;
         left: 50%;
         position: absolute;
         top: 50%;
         transform: translate(-50%, -50%);
-        width: 4px;
+        width: 6px;
       }
     }
   }
@@ -320,7 +323,7 @@ textarea.form-input {
   padding-left: ($unit-8 + $control-padding-x);
 
   .form-icon {
-    background: $gray-color-light;
+    background: $gray-color;
     background-clip: padding-box;
     border-radius: $unit-2 + $border-width;
     height: $unit-4 + $border-width * 2;
@@ -424,6 +427,7 @@ textarea.form-input {
 .form-select {
   .has-success &,
   &.is-success {
+    background: lighten($success-color, 53%);
     border-color: $success-color;
     &:focus {
       @include control-shadow($success-color);
@@ -432,6 +436,7 @@ textarea.form-input {
 
   .has-error &,
   &.is-error {
+    background: lighten($error-color, 53%);
     border-color: $error-color;
     &:focus {
       @include control-shadow($error-color);
@@ -447,7 +452,7 @@ textarea.form-input {
     .form-icon {
       border-color: $error-color;
     }
-    
+
     input {
       &:checked + .form-icon {
         background: $error-color;
@@ -481,6 +486,7 @@ textarea.form-input {
       border-color: $error-color;
       &:focus {
         @include control-shadow($error-color);
+        background: lighten($error-color, 10%);
       }
 
       & + .form-input-hint {
@@ -542,4 +548,4 @@ input {
 // Form inline
 .form-inline {
   display: inline-block;
-}
+}

scss/spectre/_navbar.scss

@@ -23,7 +23,6 @@
 
   .navbar-brand {
     font-size: $font-size-lg;
-    font-weight: 500;
     text-decoration: none;
   }
 }

scss/spectre/_pagination.scss

@@ -15,7 +15,6 @@
 
     a {
       border-radius: $border-radius;
-      color: $gray-color-dark;
       display: inline-block;
       padding: $unit-1 $unit-2;
       text-decoration: none;

scss/spectre/_popovers.scss

@@ -19,7 +19,7 @@
   &:hover .popover-container {
     display: block;
     opacity: 1;
-    transform: translate(-50%, -100%);
+    transform: translate(-50%, -100%) scale(1);
   }
 
   &.popover-right {
@@ -30,7 +30,7 @@
 
     *:focus + .popover-container,
     &:hover .popover-container {
-      transform: translate(0, -50%);
+      transform: translate(0, -50%) scale(1);
     }
   }
 
@@ -42,7 +42,7 @@
 
     *:focus + .popover-container,
     &:hover .popover-container {
-      transform: translate(-50%, 0);
+      transform: translate(-50%, 0) scale(1);
     }
   }
 
@@ -54,7 +54,7 @@
 
     *:focus + .popover-container,
     &:hover .popover-container {
-      transform: translate(-100%, -50%);
+      transform: translate(-100%, -50%) scale(1);
     }
   }
 

scss/spectre/_steps.scss

@@ -24,7 +24,7 @@
     }
 
     a {
-      color: $gray-color;
+      color: $primary-color;
       display: inline-block;
       padding: 20px 10px 0;
       text-decoration: none;
@@ -59,9 +59,10 @@
         }
 
         a {
+          color: $gray-color;
 
           &::before {
-            background: $gray-color-light;
+            background: $border-color;
           }
         }
       }

scss/spectre/_timelines.scss

@@ -24,10 +24,12 @@
     }
 
     .timeline-icon {
+      align-items: center;
       border-radius: 50%;
       color: $light-color;
-      display: block;
+      display: flex;
       height: $unit-6;
+      justify-content: center;
       text-align: center;
       width: $unit-6;
       &::before {

scss/spectre/_tooltips.scss

@@ -2,7 +2,7 @@
 .tooltip {
   position: relative;
   &::after {
-    background: rgba($dark-color, .9);
+    background: rgba($dark-color, .95);
     border-radius: $border-radius;
     bottom: 100%;
     color: $light-color;

scss/spectre/_variables.scss

@@ -1,5 +1,5 @@
 // Core variables
-$version: "0.5.3";
+$version: "0.5.5";
 
 // Core features
 $rtl: false !default;

scss/spectre/mixins/_color.scss

@@ -1,7 +1,7 @@
 // Background color utility mixin
 @mixin bg-color-variant($name: ".bg-primary", $color: $primary-color) {
   #{$name} {
-    background: $color;
+    background: $color !important;
 
     @if (lightness($color) < 60) {
       color: $light-color;
@@ -12,7 +12,7 @@
 // Text color utility mixin
 @mixin text-color-variant($name: ".text-primary", $color: $primary-color) {
   #{$name} {
-    color: $color;
+    color: $color !important;
   }
 
   a#{$name} {

scss/spectre/mixins/_toast.scss

@@ -1,5 +1,5 @@
 // Toast variant mixin
 @mixin toast-variant($color: $dark-color) {
-  background: rgba($color, .9);
+  background: rgba($color, .95);
   border-color: $color;
 }

scss/spectre/utilities/_cursors.scss

@@ -21,4 +21,4 @@
 
 .c-auto {
   cursor: auto;
-}
+}