Skip to content

Commit

Permalink
Version 2.4.1 - Several css adjustments o WP 5.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@mateuswetah
mateuswetah committed Jul 29, 2021
1 parent a86f77e commit ea6aa13
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 93 deletions.
4 changes: 2 additions & 2 deletions src/README.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
=== Tainacan Interface ===
Contributors: andrebenedito, daltonmartins, fabianobn, jacsonp, leogermani, weryques, wetah, eduardohumberto, ravipassos, jessicafpx, marinagiolo, omarceloavila, r-guimaraes
Requires at least: WordPress 4.8
Tested up to: WordPress 5.7.2
Version: 2.4
Tested up to: WordPress 5.8
Version: 2.4.1
Requires PHP: 5.6
Stable tag: trunk
License: GNU General Public License v3
Expand Down
42 changes: 21 additions & 21 deletions src/assets/js/search-bar-redirect.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ function onTainacanSearchSubmit($event) {
selectedForm = child;
}
}

if (selectedForm.archive && tainacan_search_info !== undefined) {
switch (selectedForm.archive.value) {
case 'tainacan-items':
console.log(tainacan_search_info.theme_items_list_url)
selectedForm.action = tainacan_search_info.theme_items_list_url + (selectedForm.s ? '?search=' + selectedForm.s.value : '');
break;
case 'tainacan-collections':
selectedForm.action = tainacan_search_info.theme_collection_list_url + (selectedForm.s ? '?s=' + selectedForm.s.value : '');
break;
case 'posts':
selectedForm.action = '/' + (selectedForm.s ? '?onlyposts=true&s=' + selectedForm.s.value : '');
break;
case 'pages':
selectedForm.action = '/' + (selectedForm.s ? '?onlypages=true&s=' + selectedForm.s.value : '');
break;
case 'global':
default:
selectedForm.action = '/' + (selectedForm.s ? '?s=' + selectedForm.s.value : '');
if (tainacan_search_info !== undefined) {
if (selectedForm.archive) {
switch (selectedForm.archive.value) {
case 'tainacan-items':
selectedForm.action = tainacan_search_info.theme_items_list_url + (selectedForm.s ? '?search=' + selectedForm.s.value : '');
break;
case 'tainacan-collections':
selectedForm.action = tainacan_search_info.theme_collection_list_url + (selectedForm.s ? '?s=' + selectedForm.s.value : '');
break;
case 'posts':
selectedForm.action = tainacan_search_info.site_url + '/' + (selectedForm.s ? '?onlyposts=true&s=' + selectedForm.s.value : '');
break;
case 'pages':
selectedForm.action = tainacan_search_info.site_url + '/' + (selectedForm.s ? '?onlypages=true&s=' + selectedForm.s.value : '');
break;
case 'global':
default:
selectedForm.action = tainacan_search_info.site_url + '/' + (selectedForm.s ? '?s=' + selectedForm.s.value : '');
}
} else {
selectedForm.action = tainacan_search_info.site_url + '/' + (selectedForm.s ? '?s=' + selectedForm.s.value : '');
}
} else {
selectedForm.action = '/' + (selectedForm.s ? '?s=' + selectedForm.s.value : '');
}

if ($event)
Expand Down
16 changes: 10 additions & 6 deletions src/assets/scss/_post.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@
color: #338591;
margin-left: 4.16666666667%;
margin-right: 4.16666666667%;
margin-left: 4.16666666667vw;
margin-right: 4.16666666667vw;
margin-bottom: 2rem;
}
header.tainacan-content {
Expand Down Expand Up @@ -560,7 +562,7 @@
border-radius: 24px;
width: 36px;
height: 36px;
bottom: -18px;
bottom: 0px;
right: calc(50% - 18px);
cursor: pointer;
font-size: 0;
Expand Down Expand Up @@ -887,6 +889,8 @@
height: 100%;
.card {
box-shadow: none;
padding: 0;
margin: 0;
}
div {
-webkit-column-break-inside: avoid;
Expand Down Expand Up @@ -925,8 +929,8 @@
column-rule: none;
}
h3 {
color: #000;
font-size: 0.875rem;
color: #1d1d1d;
font-size: 0.875rem !important;
font-weight: 700;
padding-right: 1rem;
margin-bottom: 0.25rem;
Expand All @@ -938,7 +942,7 @@
h4,
label {
color: #454647;
font-size: 0.85rem;
font-size: 0.85rem !important;
font-weight: 500;
padding-right: 0.875rem;
width: 100%;
Expand Down Expand Up @@ -968,7 +972,7 @@
.multivalue-separator {
display: block;
max-height: 1px;
width: 35px;
width: 70px;
background: #cbcbcb;
content: none;
color: transparent;
Expand All @@ -977,7 +981,7 @@
}
.tainacan-compound-group {
padding-left: 1.5rem;
border-left: 1px solid #f2f2f2;
border-left: 1px solid #dbdbdb;
}
}
}
Expand Down
58 changes: 1 addition & 57 deletions src/assets/scss/editor-style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,62 +375,6 @@
}
}

/* Checkboxes and Radio Buttons*/
.components-modal__content input[type="checkbox"]:checked::before,
.components-popover input[type="checkbox"]:checked::before,
.editor-block-list__block input[type="checkbox"]:checked::before,
.components-modal__content input[type="radio"]:checked::before,
.components-popover input[type="radio"]:checked::before,
.editor-block-list__block input[type="radio"]:checked::before {
color: black;
}
.components-modal__content input[type="radio"]:checked::before,
.components-popover input[type="radio"]:checked::before,
.editor-block-list__block input[type="radio"]:checked::before {
background: black;
margin: 0;
border: none;
width: 8px;
height: 8px;

@media screen and (max-width: 782px) {
margin: 4px 0 0 4px;
width: 15px;
height: 15px;
}
}
.components-modal__content input[type="checkbox"]:checked,
.components-modal__content input[type="radio"]:checked,
.components-popover input[type="checkbox"]:checked,
.components-popover input[type="radio"]:checked,
.editor-block-list__block input[type="checkbox"]:checked,
.editor-block-list__block input[type="radio"]:checked {
background: white;
border: 1px solid #555758;
}
.components-modal__content input[type="checkbox"],
.components-modal__content input[type="radio"],
.components-popover input[type="checkbox"],
.components-popover input[type="radio"],
.editor-block-list__block input[type="checkbox"],
.editor-block-list__block input[type="radio"] {
border: 1px solid #555758;
}
.components-modal__content input[type="checkbox"]:checked:focus,
.components-modal__content input[type="radio"]:checked:focus,
.components-popover input[type="checkbox"]:checked:focus,
.components-popover input[type="radio"]:checked:focus,
.editor-block-list__block input[type="checkbox"]:checked:focus,
.editor-block-list__block input[type="radio"]:checked:focus,
.components-modal__content input[type="checkbox"]:focus,
.components-modal__content input[type="radio"]:focus,
.components-popover input[type="checkbox"]:focus,
.components-popover input[type="radio"]:focus,
.editor-block-list__block input[type="checkbox"]:focus,
.editor-block-list__block input[type="radio"]:focus {
box-shadow: none;
}

/* Blockquote */
.wp-block-quote {
margin: 3rem 8.33333%;
Expand Down Expand Up @@ -540,7 +484,7 @@
width: calc(100% + 64px);
height: calc(100% - 104px);
margin-left: -32px;
margin-bottom: -4px;
margin-bottom: 0px;
}

.modal-footer-area {
Expand Down
11 changes: 6 additions & 5 deletions src/assets/scss/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ 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 collections with a beautiful faceted search interface. Ideal for museums, galleries, libraries and anyone who have a digital repository.
Version: 2.4
Tested up to: 5.7.2
Version: 2.4.1
Tested up to: 5.8
Requires PHP: 5.6
License: GNU General Public License v3
License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
Expand Down Expand Up @@ -369,6 +369,7 @@ nav {

> li{
&.menu-item {
margin-bottom: 0;
@media screen and (min-width: 769px){
padding-left: 42px;
}
Expand Down Expand Up @@ -490,9 +491,9 @@ nav {
padding: 0;
margin-right: 0;
}
& > .container-fluid {
align-items: flex-end;
}
// & > .container-fluid {
// align-items: flex-end;
// }

&.tainacan-header-layout--left #topNavbar {
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion src/editor-style.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/functions.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/** Theme version */
const TAINACAN_INTERFACE_VERSION = '2.4';
const TAINACAN_INTERFACE_VERSION = '2.4.1';

/**
* Setup Theme
Expand Down
1 change: 1 addition & 0 deletions src/functions/enqueues.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ function tainacan_enqueues() {
$settings = array(
'theme_items_list_url' => esc_url_raw( get_site_url() ) . '/' . \Tainacan\Theme_Helper::get_instance()->get_items_list_slug(),
'theme_collection_list_url' => get_post_type_archive_link( 'tainacan-collection' ),
'site_url' => get_site_url()
);
wp_register_script( 'tainacan_searchBarRedirect', get_template_directory_uri() . '/assets/js/search-bar-redirect.js', '', TAINACAN_INTERFACE_VERSION, false );
wp_enqueue_script( 'tainacan_searchBarRedirect' );
Expand Down

0 comments on commit ea6aa13

Please sign in to comment.