From 114c641c650e501b597bcc7abff304c93963aa4b Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 18 Aug 2020 17:59:44 -0300 Subject: [PATCH] Several adjustments to fix errors found on Theme Checker. --- compile-sass.sh | 12 +++++++++--- src/assets/scss/style.scss | 3 +++ src/editor-style.css.map | 7 ------- src/functions.php | 6 +++--- src/functions/customizer.php | 2 +- src/header.php | 9 ++++++++- src/searchform.php | 10 +++++----- src/style.css.map | 7 ------- src/template-parts/headertaxonomy.php | 10 +++++----- src/template-parts/list-post.php | 4 ++-- src/template-parts/single-items-attachments.php | 4 ++-- src/template-parts/single-items-document.php | 2 +- src/template-parts/single-items-metadata.php | 8 ++++---- src/template-parts/single-items-navigation.php | 2 +- src/template-parts/single-post.php | 6 +++--- 15 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 src/editor-style.css.map delete mode 100644 src/style.css.map diff --git a/compile-sass.sh b/compile-sass.sh index 11a3334..6739715 100755 --- a/compile-sass.sh +++ b/compile-sass.sh @@ -20,19 +20,25 @@ echo "Compiling Sass..." cd src/assets/scss sass -E 'UTF-8' style.scss:../../style.css echo "Style of Tainacan Compiled"; + sass -E 'UTF-8' editor-style.scss:../../editor-style.css echo "Style of Tainacan for Gutenberg Editor Compiled"; + sass bootstrap_custom.scss:../vendor/bootstrap/scss/bootstrap.min.css --style compressed echo "Bootstrap Compiled"; + rm -rf .sass-cache cd ../vendor/slick sass slick.scss:slick.min.css --style compressed sass slick-theme.scss:slick-theme.min.css --style compressed echo "Slick for slider carousel Compiled"; + rm -rf slick-theme.min.css.map slick.min.css.map .sass-cache/ -cd ../../scss -rm -rf ../style.css.map -# rm -rf ../editor-style.css.map +cd ../../../ +rm -rf style.css.map +rm -rf editor-style.css.map +rm -rf assets/vendor/bootstrap/scss/bootstrap.min.css.map +echo "CSS map files removed"; echo "Sass compilation Completed!" exit 0 diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 0796c9f..1c3bd7c 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -2,8 +2,11 @@ Theme Name: Tainacan Interface Author: Tainacan Author URI: https://tainacan.org +Theme URI: https://tainacan.org/blog/category/tema/ Description: This is the default theme for the Tainacan project. Use this in conjunction with Tainacan plugin to easily manage and publish you digital collectinons with a beautiful faceted search interface. Ideal for museums, galleries, libraries and anyone who have a digital repository. Version: 2.1 +Tested up to: 5.5 +Requires PHP: 5.6 License: GNU General Public License v3 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html Tags: two-columns, right-sidebar, grid-layout, flexible-header, custom-colors, custom-header, custom-menu, custom-logo, featured-images, footer-widgets, theme-options, threaded-comments, translation-ready, photography, portfolio diff --git a/src/editor-style.css.map b/src/editor-style.css.map deleted file mode 100644 index 5b3023b..0000000 --- a/src/editor-style.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AAAA,sBAAuB;EACnB,UAAU,EAAE,KAAK;EACjB,OAAO,EAAE,2BAA2B;;AAExC,oCAAqC;EACjC,WAAW,EAAE,oBAAoB;;AAErC;iCACkC;EAC9B,WAAW,EAAE,+BAA+B;EA2C5C,uBAAuB;EAOvB,4BAA4B;EAW5B,4BAA4B;EAW5B,uEAAuE;EAMvE,gBAAgB;EA0BhB,mDAAmD;EAKnD,+CAA+C;EAO/C,aAAa;EA6Bb,aAAa;EAyDb,WAAW;EAQX,aAAa;EAmEb,gBAAgB;EA2ChB,YAAY;EAMZ,iBAAiB;EAejB,+BAA+B;EAM/B,qBAAqB;EAMrB,kBAAkB;EAelB,iCAAiC;EAuDjC,gBAAgB;EAuBhB,eAAe;EAgCf,eAAe;EAsBf,SAAS;EAQT,UAAU;EAMV,YAAY;EAWZ,8BAA8B;EA0C9B,6EAA6E;EApjB7E;sDAAmB;IAAE,KAAK,EAAE,OAAO;EACnC;iEAA8B;IAAE,gBAAgB,EAAE,OAAO;EACzD;qDAAkB;IAAE,KAAK,EAAE,OAAO;EAClC;gEAA6B;IAAE,gBAAgB,EAAE,OAAO;EACxD;sDAAmB;IAAE,KAAK,EAAE,OAAO;EACnC;iEAA8B;IAAE,gBAAgB,EAAE,OAAO;EACzD;wDAAqB;IAAE,KAAK,EAAE,OAAO;EACrC;mEAAgC;IAAE,gBAAgB,EAAE,OAAO;EAC3D;4DAAyB;IAAE,KAAK,EAAE,OAAO;EACzC;uEAAoC;IAAE,gBAAgB,EAAE,OAAO;EAC/D;wDAAqB;IAAE,KAAK,EAAE,OAAO;EACrC;mEAAgC;IAAE,gBAAgB,EAAE,OAAO;EAC3D;2DAAwB;IAAE,KAAK,EAAE,OAAO;EACxC;sEAAmC;IAAE,gBAAgB,EAAE,OAAO;EAC9D;qDAAkB;IAAE,KAAK,EAAE,OAAO;EAClC;gEAA6B;IAAE,gBAAgB,EAAE,OAAO;EACxD;qDAAkB;IAAE,KAAK,EAAE,OAAO;EAClC;gEAA6B;IAAE,gBAAgB,EAAE,OAAO;EAGxD;;;oEACiC;IAC7B,YAAY,EAAE,UAAU;IACxB,aAAa,EAAE,UAAU;EAE7B;wEAAqC;IACjC,KAAK,EAAE,IAAI;EAIf;;;;;;;;;;;iGAK6D;IACzD,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,CAAC;EAIpB;6CAAU;IACN,SAAS,EAAE,yBAAyB;IACpC,YAAY,EAAE,UAAU;IACxB,aAAa,EAAE,UAAU;EAI7B;gEAA6B;IACzB,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,CAAC;IAEhB;oFAAkB;MACd,YAAY,EAAE,CAAC;MACf,aAAa,EAAE,CAAC;EAKxB;;;gEAC6B;IACzB,SAAS,EAAE,MAAM;IACjB,KAAK,EAAE,MAAM;IACb,WAAW,EAAE,MAAM;IACnB,YAAY,EAAE,MAAM;IACpB,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,CAAC;EAIpB;mEAAgC;IAC5B,UAAU,EAAE,OAAO;IACnB,aAAa,EAAE,OAAO;EAI1B;;;2GACsE;IAClE,MAAM,EAAE,mBAAmB;IAC3B,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,yBAAyB;IACpC,KAAK,EAAE,qBAAqB;IAC5B,aAAa,EAAE,iBAAiB;IAChC,aAAa,EAAE,gDAAgD;IAE/D;;;yHAAY;MACR,MAAM,EAAE,YAAY;MACpB,OAAO,EAAE,GAAG;EAGpB;;;uFACmD;IAC/C,SAAS,EAAE,OAAO;IAClB,WAAW,EAAE,oBAAoB;IACjC;;;kGAAS;MACL,OAAO,EAAE,OAAO;MAChB,KAAK,EAAE,OAAO;MACd,KAAK,EAAE,sCAAsC;EAKrD;2EAAwC;IACpC,aAAa,EAAE,OAAO;EAI1B;yDAAsB;IAClB,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,CAAC;EAKpB;;;kKAC2H;IACvH,YAAY,EAAE,UAAU;EAE5B;;;mKAC4H;IACxH,WAAW,EAAE,UAAU;EAE3B;;;;;iGAE4D;IACxD,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;IACf,OAAO,EAAE,CAAC;EAEd;mHAA8E;IAC1E,YAAY,EAAE,UAAU;EAE5B;kHAA6E;IACzE,aAAa,EAAE,UAAU;EAE7B;6GAAsE;IAClE,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC;EAInB;;;;;yEAEsC;IAClC,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,sCAAsC;IAC7C,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,KAAK;EAExB;;;;;yEAEsC;IAClC,SAAS,EAAE,QAAQ;IACnB,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,KAAK;EAExB;;;;;yEAEsC;IAClC,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,KAAK;EAExB;;;;;yEAEsC;IAClC,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,MAAM;IAClB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,KAAK;EAExB;;;;;yEAEsC;IAClC,SAAS,EAAE,QAAQ;IACnB,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,KAAK;EAExB;;;;;yEAEsC;IAClC,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE,MAAM;IAClB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,KAAK;EAGxB;6EAA0C;IACtC,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,IAAI;EAIvB;qCAAE;IAAE,eAAe,EAAE,IAAI;EACzB;;;6DACwB;IACpB,KAAK,EAAE,OAAO;EAKlB;gEAA6B;IACzB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,GAAG;IAClB,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,QAAQ;IAEnB;0FAA0B;MACtB,KAAK,EAAE,KAAK;IAEhB;;wEACQ;MACJ,UAAU,EAAE,IAAI;EAGxB;+EAA4C;IACxC,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,MAAM;EAEvB;2EAAwC;IACpC,gBAAgB,EAAE,OAAO;IACzB,gBAAgB,EAAE,sCAAsC;EAE5D;2EAAwC;IACpC,UAAU,EAAE,KAAK;IACjB,MAAM,EAAE,iBAAiB;IACzB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,sCAAsC;EAEjD;;;;;mFAEgD;IAC5C,UAAU,EAAE,eAAe;IAC3B,UAAU,EAAE,eAAe;IAC3B,MAAM,EAAE,eAAe;EAE3B;;;;;6EAE0C;IACtC,UAAU,EAAE,eAAe;IAC3B,UAAU,EAAE,gBAAgB;IAC5B,MAAM,EAAE,4BAA4B;EAGxC;0DAAuB;IAKnB,aAAa,EAAE,GAAG;IAClB,SAAS,EAAE,QAAQ;IACnB,OAAO,EAAE,QAAQ;IANjB;iFAAuB;MACnB,gBAAgB,EAAE,OAAO;MACzB,gBAAgB,EAAE,sCAAsC;EAMhE;4EAAyC;IACrC,gBAAgB,EAAE,KAAK;IACvB,MAAM,EAAE,iBAAiB;IACzB;mGAAuB;MACnB,KAAK,EAAE,OAAO;MACd,KAAK,EAAE,sCAAsC;EAGrD;4EAAyC;IACrC,aAAa,EAAE,GAAG;EAItB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gEA+B6B;IACzB,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,OAAO;IACrB,OAAO,EAAE,OAAO;IAEhB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wEAAQ;MACJ,MAAM,EAAE,iBAAiB;MACzB,UAAU,EAAE,IAAI;EAKxB;mEAAgC;IAC5B,WAAW,EAAE,GAAG;IAChB,KAAK,EAAE,KAAK;EAIhB;wGAAmE;IAC/D,KAAK,EAAE,IAAI;EAEf;wFAAqD;IACjD,SAAS,EAAE,MAAM;IACjB,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,OAAO;IAEhB;sGAAY;MACR,SAAS,EAAE,IAAI;MACf,MAAM,EAAE,CAAC;EAKjB;;;8DAC2B;IACvB,KAAK,EAAE,OAAO;EAIlB;8DAA2B;IACvB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,MAAM;EAIpB;6DAA0B;IACtB,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,gBAAgB;IACxB,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,gDAAgD;IAE/D;;;kEACG;MACC,SAAS,EAAE,QAAQ;MACnB,WAAW,EAAE,GAAG;MAChB,KAAK,EAAE,OAAO;EAKtB;;;;;;;;;;;iGAK8D;IAC1D,KAAK,EAAE,KAAK;EAEhB;;;;;iGAE8D;IAC1D,UAAU,EAAE,KAAK;IACjB,MAAM,EAAE,WAAW;IACnB,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,oCAAqC;MARzC;;;;;qGAE8D;QAOtD,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;EAGpB;;;;;;;;;;;yFAKsD;IAClD,UAAU,EAAE,KAAK;IACjB,MAAM,EAAE,iBAAiB;EAE7B;;;;;;;;;;;iFAK8C;IAC1C,MAAM,EAAE,iBAAiB;EAE7B;;;;;;;;;;;;;;;;;;;;;;;uFAWoD;IAChD,UAAU,EAAE,IAAI;EAIpB;mDAAgB;IACZ,MAAM,EAAE,aAAa;IACrB,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;EAEnB;kEAA+B;IAC3B,SAAS,EAAE,QAAQ;IACnB,WAAW,EAAE,oBAAoB;EAErC;uFAAoD;IAChD,WAAW,EAAE,gDAAgD;EAEjE;6DAA0B;IACtB,WAAW,EAAE,GAAG;IAChB,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,KAAK;IACjB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,OAAO;EAIlB;uDAAoB;IAKhB,OAAO,EAAE,CAAC;IAJV;oFAA6B;MACzB,UAAU,EAAE,gDAAgD;MAC5D,aAAa,EAAE,gDAAgD;IAInE;oEAAW;MACP,MAAM,EAAE,CAAC;MACT,OAAO,EAAE,eAAe;IAG5B;;;uGAC8C;MAC1C,SAAS,EAAE,QAAQ;MACnB,WAAW,EAAE,GAAG;IAEpB;;;6HACoE;MAChE,KAAK,EAAE,OAAO;MACd,KAAK,EAAE,sCAAsC;IAEjD;uFAA8B;MAC1B,KAAK,EAAE,OAAO;MACd,SAAS,EAAE,IAAI;MACf,WAAW,EAAE,MAAM;MACnB,UAAU,EAAE,MAAM;MAClB,cAAc,EAAE,IAAI;EAK5B;uDAAoB;IAKhB,KAAK,EAAE,GAAG;IACV,SAAS,EAAE,KAAK;IALhB;oFAA6B;MACzB,YAAY,EAAE,OAAO;MACrB,YAAY,EAAE,sCAAsC;IAIxD;uEAAgB;MACZ,KAAK,EAAE,IAAI;IAGX;0GAAqC;MACjC,KAAK,EAAE,OAAO;MACd,KAAK,EAAE,sCAAsC;IAEjD;+EAAU;MACN,WAAW,EAAE,GAAG;EAM5B;8DAA2B;IACvB,KAAK,EAAE,OAAO;IACd,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,QAAQ;EAIzB;2DAAwB;IACpB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,sCAAsC;EAIjD;sDAAmB;IACf,aAAa,EAAE,iBAAiB;IAChC,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,OAAO;EAEtB;sDAAmB;IACf,MAAM,EAAE,iBAAiB;IACzB,SAAS,EAAE,QAAQ;EAMnB;iFAAO;IACH,KAAK,EAAE,iBAAiB;IACxB,MAAM,EAAE,kBAAkB;IAC1B,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,IAAI;EAGvB;6FAAmB;IACf,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,iBAAiB;IACxB,WAAW,EAAE,gBAAgB;IAC7B,aAAa,EAAE,gBAAgB;IAC/B,OAAO,EAAE,sBAAsB;IAC/B,UAAU,EAAE,iBAAiB;EAGrC;+EAA2C;IACvC,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,GAAG;EAEpB;+EAA4C;IACxC,OAAO,EAAE,MAAM;IAEf;0GAAyB;MACrB,KAAK,EAAE,IAAI;MAEX;4IAAgC;QAC5B,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,MAAM;QAEnB;oJAAK;UACD,WAAW,EAAE,CAAC;UACd,YAAY,EAAE,IAAI;EAQ9B;4FAAkB;IACd,KAAK,EAAE,kBAAkB;IACzB,KAAK,EAAE,iDAAiD;EAE5D;;;;;;;kGAGwB;IACpB,KAAK,EAAE,kBAAkB;IACzB,KAAK,EAAE,sCAAsC;EAEjD;;;gNACsI;IAClI,SAAS,EAAE,MAAM;EAErB;;;gNACsI;IAClI,SAAS,EAAE,MAAM;EAErB;;;gNACsI;IAClI,SAAS,EAAE,OAAO;EAEtB;;;gNACsI;IAClI,SAAS,EAAE,QAAQ;EAEvB;4EAAE;IACE,UAAU,EAAE,MAAM;EAEtB;iGAAuB;IACnB,KAAK,EAAE,OAAO;EAElB;oHAA0C;IACtC,WAAW,EAAE,CAAC;IACd,SAAS,EAAE,KAAK;IAChB,YAAY,EAAE,OAAO;IACrB,YAAY,EAAE,sCAAsC;EAExD;wIAA8D;IAC1D,YAAY,EAAE,GAAG;IACjB,MAAM,EAAE,GAAG;;AAKnB;;;4CAGG;EACC,aAAa,EAAE,cAAc;AAEjC,2CAAE;EACE,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,YAAY;AAE/B,mFAA0C;EACtC,WAAW,EAAE,CAAC;EACd,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,KAAK;AAEpB,uGAA8D;EAC1D,YAAY,EAAE,GAAG;EACjB,MAAM,EAAE,GAAG", -"sources": ["assets/scss/editor-style.scss"], -"names": [], -"file": "editor-style.css" -} diff --git a/src/functions.php b/src/functions.php index f7f8ffc..5e55c5f 100644 --- a/src/functions.php +++ b/src/functions.php @@ -192,7 +192,7 @@ add_action( 'admin_head', 'tainacan_customize_editor_css'); */ function tainacan_include_items_in_search_results( $query ) { - if ( defined ('TAINACAN_VERSION') && $query->get( 'post_type' ) !== 'tainacan-collection' && !$_GET['onlyposts'] && !$_GET['onlypages'] && $query->is_main_query() && $query->is_search() && ! is_admin()) { + if ( defined ('TAINACAN_VERSION') && $query->get( 'post_type' ) !== 'tainacan-collection' && (!isset($_GET['onlyposts']) || !$_GET['onlyposts']) && (!isset($_GET['onlypages']) || !$_GET['onlypages']) && $query->is_main_query() && $query->is_search() && ! is_admin()) { $collections_post_types = \Tainacan\Repositories\Repository::get_collections_db_identifiers(); $existing_post_types = $query->get( 'post_type' ); @@ -200,9 +200,9 @@ function tainacan_include_items_in_search_results( $query ) { $existing_post_types = [ $existing_post_types ]; $query->set( 'post_type', array_merge( $existing_post_types, ['post', 'page', 'tainacan-collection'], $collections_post_types ) ); - } else if ( $_GET['onlypages'] && $query->is_main_query() && $query->is_search() && ! is_admin() ) { + } else if ( isset($_GET['onlypages']) && $_GET['onlypages'] && $query->is_main_query() && $query->is_search() && ! is_admin() ) { $query->set( 'post_type', 'pages' ); - } else if ( $_GET['onlyposts'] && $query->is_main_query() && $query->is_search() && ! is_admin() ) { + } else if ( isset($_GET['onlyposts']) && $_GET['onlyposts'] && $query->is_main_query() && $query->is_search() && ! is_admin() ) { $query->set( 'post_type', 'post' ); } } diff --git a/src/functions/customizer.php b/src/functions/customizer.php index 6549090..85db68f 100644 --- a/src/functions/customizer.php +++ b/src/functions/customizer.php @@ -143,7 +143,7 @@ function tainacan_customize_register( $wp_customize ) { 'settings' => 'tainacan_search_global_label', 'section' => 'tainacan_header_search', 'label' => __( 'Label for "Global" search option', 'tainacan-interface' ), - 'description' => __( 'The Global search is the default. Its option will only be visible if at least one of the bellow are selected.') + 'description' => __( 'The Global search is the default. Its option will only be visible if at least one of the bellow are selected.', 'tainacan-interface') ) ); // Option to search directly on repository items list diff --git a/src/header.php b/src/header.php index 532bd07..ba407c7 100644 --- a/src/header.php +++ b/src/header.php @@ -10,7 +10,14 @@ > - + +