tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts from develop

This commit is contained in:
mateuswetah 2020-03-25 18:42:44 -03:00
parent 30c75dfb81 801fa8f481
commit 171f007798
75 changed files with 169 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/assets/css/tainacan-gutenberg-block-search-bar.css
View File

@ -359,23 +359,23 @@
.wp-block-tainacan-search-bar.is-style-stylish #tainacan-search-bar-block button:hover {
background: transparent !important; }
.wp-block-tainacan-search-bar.is-style-stylish .search-bar-collection-header-container:not(.is-aligned-right):not(.is-aligned-left) .tainacan-search-container {
width: calc(100% - 4.1667% - 53px);
width: calc(100% - var(--tainacan-one-column) - 53px);
width: calc(100% - 4.1667vw - 53px);
bottom: calc(-50% + 38px);
position: absolute; }
.wp-block-tainacan-search-bar.is-style-stylish .search-bar-collection-header-container:not(.is-aligned-right):not(.is-aligned-left) .search-bar-collection-header-title {
margin-bottom: 26px; }
.wp-block-tainacan-search-bar.is-style-stylish .search-bar-collection-header-container.is-aligned-right .tainacan-search-container {
width: calc(100% - 4.1667% - 26px);
width: calc(100% - var(--tainacan-one-column) - 26px);
width: calc(100% - 4.1667vw - 26px);
top: calc(-50% + 26px);
right: calc(4.1667% + 26px);
right: calc(var(--tainacan-one-column) + 26px);
right: calc(4.1667vw + 26px);
position: absolute; }
.wp-block-tainacan-search-bar.is-style-stylish .search-bar-collection-header-container.is-aligned-left .tainacan-search-container {
width: calc(100% - 1em - 26px);
top: calc(-50% + 26px);
left: calc(4.1667% + 26px);
left: calc(var(--tainacan-one-column) + 26px);
left: calc(4.1667vw + 26px);
position: absolute; }
.wp-block-tainacan-search-bar.is-style-stylish .search-bar-collection-header-container .tainacan-search-container #tainacan-search-bar-block input#tainacan-search-bar-block_input {
@ -389,7 +389,7 @@
border-width: 3px !important; }
@media only screen and (max-width: 768px) {
.wp-block-tainacan-search-bar.is-style-stylish .search-bar-collection-header-container .tainacan-search-container {
width: calc(100% - 4.1667% - 53px) !important;
width: calc(100% - var(--tainacan-one-column) - 53px) !important;
width: calc(100% - 4.1667vw - 53px) !important;
bottom: calc(-50% + 38px) !important;
position: absolute !important; }
@ -410,7 +410,7 @@
flex-wrap: wrap;
align-items: center;
flex-grow: 2;
padding: 0.5em 4.1667%;
padding: 0.5em var(--tainacan-one-column);
padding: 0.5em 4.1667vw;
text-align: center;
text-decoration: none !important; }

2
src/assets/css/tainacan-gutenberg-block-search-bar.css.map
View File

File diff suppressed because one or more lines are too long

2
src/classes/class-tainacan-search-engine.php
View File

@ -152,7 +152,7 @@ class Search_Engine {
$fields = implode(", ' || ', ", $search_query_fields);
foreach ( $terms as $term ) {
$esc_term = $wpdb->prepare("%s", $not_exact ? "%".$term."%" : $term);
$searchQuery .= "{$seperator}CONCAT( $fields ) LIKE $esc_term";
$searchQuery .= "{$seperator}CONCAT_WS( $fields ) LIKE $esc_term";
$seperator = ' OR ';
}
$searchQuery .= ')';

2
src/readme.txt
View File

@ -4,7 +4,7 @@ Tags: museums, libraries, archives, GLAM, collections, repository
Requires at least: 4.8
Tested up to: 5.3
Requires PHP: 5.6
Stable tag: 0.15.1
Stable tag: 0.15.2
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html

2
src/tainacan.php
View File

@ -4,7 +4,7 @@ Plugin Name: Tainacan
Plugin URI: https://tainacan.org/
Description: Open source, powerfull and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional respository platform.
Author: Tainacan.org
Version: 0.15.1
Version: 0.15.2
Text Domain: tainacan
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html

2
src/views/admin/admin.vue
View File

@ -82,8 +82,6 @@
<style lang="scss">
@import "./scss/_variables.scss";
.is-fullheight {
height: 100%;
margin-bottom: 0px;

4
src/views/admin/components/edition/collection-edition-form.vue
View File

@ -940,11 +940,9 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
@media screen and (min-width: 1024px) {
.column:last-of-type {
padding-left: $page-side-padding !important;
padding-left: var(--tainacan-one-column) !important;
}
}

4
src/views/admin/components/edition/exporter-edition-form.vue
View File

@ -21,7 +21,7 @@
</form>
</div>
<div
style="max-width: 4.6666667%;"
style="max-width: var(--tainacan-one-column);"
class="column is-gapless"/>
<div class="column is-gapless">
<b-field
@ -237,7 +237,7 @@
<style scoped>
.tainacan-form>.columns {
padding: 0 4.6666667%;
padding: 0 var(--tainacan-one-column);
}
</style>

4
src/views/admin/components/edition/filter-edition-form.vue
View File

@ -308,10 +308,8 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
form#filterEditForm {
padding: 1.5em $page-side-padding 0.5em $page-side-padding;
padding: 1.5em var(--tainacan-one-column) 0.5em var(--tainacan-one-column);
border-top: 1px solid var(--tainacan-gray2);
border-bottom: 1px solid var(--tainacan-gray2);
margin-top: 1.0em;

6
src/views/admin/components/edition/importer-edition-form.vue
View File

@ -437,11 +437,11 @@ export default {
@import "../../scss/_variables.scss";
.columns.is-gapless {
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
.column:not(:first-child) {
margin-left: $page-side-padding;
margin-left: var(--tainacan-one-column);
}
}

4
src/views/admin/components/edition/importer-mapping-form.vue
View File

@ -612,8 +612,6 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.tainacan-page-title {
margin-bottom: 40px;
@ -716,7 +714,7 @@ export default {
.metadata-type {
border-bottom: 1px solid var(--tainacan-gray2);
padding: 15px 8.3333333%;
padding: 15px calc(2 * var(--tainacan-one-column));
cursor: pointer;
&:first-child {

9
src/views/admin/components/edition/item-bulk-edition-form.vue
View File

@ -332,7 +332,7 @@ export default {
objectType: this.$i18n.get('items'),
collectionID: this.collectionId
},
width: 'calc(100% - 8.333333333%)',
width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true
});
},
@ -365,7 +365,6 @@ export default {
@import "../../scss/_variables.scss";
.page-container {
&>.tainacan-form {
@ -401,13 +400,13 @@ export default {
}
.source-file-upload {
width: 100%;
padding: 0.75em $page-side-padding;
padding: 0.75em var(--tainacan-one-column);
@include display-grid;
}
.document-list {
display: inline-block;
width: 100%;
padding: 1em 8.333333%;
padding: 1em calc(2 * var(--tainacan-one-column));
.document-item {
display: flex;
@ -502,7 +501,7 @@ export default {
}
.footer {
padding: 18px $page-side-padding;
padding: 18px var(--tainacan-one-column);
position: absolute;
bottom: 0;
z-index: 999999;

24
src/views/admin/components/edition/item-edition-form.vue
View File

@ -517,7 +517,7 @@
<div v-if="item != undefined && item.id != undefined">
<br>
<button
style="margin-left: calc(4.666667% + 12px)"
style="margin-left: calc(var(--tainacan-one-column) + 12px)"
type="button"
class="button is-secondary"
@click.prevent="attachmentMediaFrame.openFrame($event)"
@ -1419,10 +1419,8 @@ export default {
<style lang="scss" scoped>
@import '../../scss/_variables.scss';
.page-container {
padding: 25px 0px;
padding: var(--tainacan-container-padding) 0px;
&>.tainacan-form {
margin-bottom: 110px;
@ -1433,7 +1431,7 @@ export default {
}
.tainacan-page-title {
padding: 0 $page-side-padding;
padding: 0 var(--tainacan-one-column);
margin-bottom: 32px;
display: flex;
flex-wrap: wrap;
@ -1477,13 +1475,13 @@ export default {
}
.tainacan-form > .columns {
margin-left: $page-side-padding;
margin-right: $page-side-padding;
margin-left: var(--tainacan-one-column);
margin-right: var(--tainacan-one-column);
}
.column.is-5 {
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
@media screen and (max-width: 769px) {
max-width: 100%;
@ -1491,7 +1489,7 @@ export default {
}
.column.is-7 {
padding-left: 0;
padding-right: $page-side-padding;
padding-right: var(--tainacan-one-column);
.columns {
flex-wrap: wrap;
@ -1507,7 +1505,7 @@ export default {
}
@media screen and (max-width: 769px) {
padding-left: $page-side-padding;
padding-left: var(--tainacan-one-column);
max-width: 100%;
}
}
@ -1535,7 +1533,7 @@ export default {
.section-box {
background-color: var(--tainacan-background-color);
padding: 0 $page-side-padding 0 0;
padding: 0 var(--tainacan-one-column) 0 0;
margin-top: 14px;
margin-bottom: 32px;
@ -1641,7 +1639,7 @@ export default {
}
.footer {
padding: 18px $page-side-padding;
padding: 18px var(--tainacan-one-column);
position: absolute;
bottom: 0;
z-index: 999999;

4
src/views/admin/components/edition/metadatum-edition-form.vue
View File

@ -386,10 +386,8 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
form#metadatumEditForm.inCollapse {
padding: 1.5em $page-side-padding 0.5em $page-side-padding;
padding: 1.5em var(--tainacan-one-column) 0.5em var(--tainacan-one-column);
border-top: 1px solid var(--tainacan-gray2);
border-bottom: 1px solid var(--tainacan-gray2);
margin-top: 1.0em;

4
src/views/admin/components/edition/taxonomy-edition-form.vue
View File

@ -520,8 +520,6 @@
</script>
<style lang="scss" scoped>
@import '../../scss/_variables.scss';
.tab-content {
overflow: visible !important;
}
@ -536,7 +534,7 @@
margin-bottom: 76px;
}
.tainacan-form .column {
padding: 1em $page-side-padding;
padding: 1em var(--tainacan-one-column);
}
.tainacan-form .column:last-of-type {
padding-left: 0;

2
src/views/admin/components/edition/term-edition-form.vue
View File

@ -457,8 +457,6 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.column {
padding: 0;
&.is-narrow {

3
src/views/admin/components/filter-types/numeric-list-interval/FormNumericListInterval.vue
View File

@ -169,8 +169,7 @@
</script>
<style scoped lang="scss">
@import '../../scss/_variables.scss';
.options-input {
display: flex;
flex-wrap: wrap;

1
src/views/admin/components/filter-types/tainacan-filter-item.vue
View File

@ -91,7 +91,6 @@
</script>
<style lang="scss">
@import "../../scss/_variables.scss";
.filter-item-forms {

2
src/views/admin/components/filter-types/taxonomy/Checkbox.vue
View File

@ -288,7 +288,7 @@
this.loadOptions();
}
},
width: 'calc(100% - 16.6666%)',
width: 'calc(100% - (4 * var(--tainacan-one-column)))',
trapFocus: true
});
},

1
src/views/admin/components/lists/basic-term-item.vue
View File

@ -144,7 +144,6 @@ export default {
</script>
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
// Term Item
.term-item {

1
src/views/admin/components/lists/collections-home-list.vue
View File

@ -270,7 +270,6 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
@import "../../scss/_collection-home-cards.scss";
.new-collection-menu {

2
src/views/admin/components/lists/collections-list.vue
View File

@ -485,8 +485,6 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.selection-control {
padding: 6px 0px 0px 12px;

2
src/views/admin/components/lists/items-list.vue
View File

@ -1042,7 +1042,7 @@ export default {
objectType: this.$i18n.get('items'),
collectionID: this.$route.params.collectionId,
},
width: 'calc(100% - 8.333333333%)',
width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true
});
},

14
src/views/admin/components/lists/processes-list.vue
View File

@ -494,8 +494,6 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.selection-control {
padding: 6px 0px 0px 12px;
@ -522,7 +520,7 @@
background-color: var(--tainacan-blue1);
}
to {
background-color: $white;
background-color: var(--tainacan-white);
}
}
@ -574,11 +572,11 @@
font-size: 0.875em !important;
}
width: 20.833333%;
margin-right: $page-side-padding !important;
margin-right: var(--tainacan-one-column) !important;
}
.process-progress {
width: auto;
margin-right: $page-side-padding !important;
margin-right: var(--tainacan-one-column) !important;
flex-grow: 2;
.occluding-content {
@ -603,7 +601,7 @@
.process-queued-on {
width: 16.6666667%;
margin-right: $page-side-padding !important;
margin-right: var(--tainacan-one-column) !important;
}
}
&>.process-collapse {
@ -623,7 +621,7 @@
.process-output {
margin-left: 1.75em !important;
margin-right: $page-side-padding !important;
margin-right: var(--tainacan-one-column) !important;
width: 20.83%;
ul {
@ -645,7 +643,7 @@
.process-last-processed-on {
margin-left: auto !important;
margin-right: calc(4.6666667% + 72px) !important;
margin-right: calc(var(--tainacan-one-column) + 72px) !important;
}
}
}

1
src/views/admin/components/lists/recursive-term-item.vue
View File

@ -323,7 +323,6 @@ export default {
</script>
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
// Term Item
.term-item {

2
src/views/admin/components/lists/taxonomies-list.vue
View File

@ -348,8 +348,6 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.selection-control {
padding: 6px 0px 0px 12px;

1
src/views/admin/components/lists/terms-list.vue
View File

@ -470,7 +470,6 @@ export default {
</script>
<style lang="scss">
@import "../../scss/_variables.scss";
.columns {
position: relative;

4
src/views/admin/components/metadata-types/tainacan-form-item.vue
View File

@ -225,8 +225,6 @@
<style lang="scss" scoped>
@import '../../scss/_variables.scss';
.multiple-inputs {
display: flex;
margin: 0.75em 0;
@ -236,7 +234,7 @@
.field {
border-bottom: 1px solid var(--tainacan-gray2);
padding: 10px 25px;
padding: 10px var(--tainacan-container-padding);
.label {
font-size: 0.875em;

2
src/views/admin/components/metadata-types/taxonomy/AddNewTerm.vue
View File

@ -268,7 +268,7 @@
<style scoped>
.add-new-term {
margin-top: 15px;
margin-bottom: 25px;
margin-bottom: var(--tainacan-container-padding);
font-size: 0.75em;
}
.add-new-term-form {

2
src/views/admin/components/metadata-types/taxonomy/TaxonomyCheckbox.vue
View File

@ -205,7 +205,7 @@
this.$emit('input', this.value);
}
},
width: 'calc(100% - 8.333333333%)',
width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true
});
}

2
src/views/admin/components/metadata-types/taxonomy/TaxonomyRadio.vue
View File

@ -215,7 +215,7 @@
this.$emit('input', this.value);
}
},
width: 'calc(100% - 8.333333333%)',
width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true
});
}

4
src/views/admin/components/modals/activity-details-modal.vue
View File

@ -721,8 +721,6 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.tainacan-modal-title {
align-self: baseline;
display: flex;
@ -747,7 +745,7 @@
min-height: 300px;
padding: 0;
.columns {
margin: 6px $page-side-padding 0 $page-side-padding;
margin: 6px var(--tainacan-one-column) 0 var(--tainacan-one-column);
}
}

4
src/views/admin/components/modals/available-exporters-modal.vue
View File

@ -93,13 +93,11 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.exporter-types-container {
.exporter-type {
border-bottom: 1px solid var(--tainacan-gray2);
padding: 15px 8.3333333%;
padding: 15px calc(2 * var(--tainacan-one-column));
cursor: pointer;
transition: background-color 0.3s ease;

4
src/views/admin/components/modals/available-importers-modal.vue
View File

@ -95,14 +95,12 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.importer-types-container {
position: relative;
.importer-type {
border-bottom: 1px solid var(--tainacan-gray2);
padding: 15px 8.3333333%;
padding: 15px calc(2 * var(--tainacan-one-column));
cursor: pointer;
transition: background-color 0.3s ease;

2
src/views/admin/components/modals/bulk-edition-modal.vue
View File

@ -558,8 +558,6 @@
<style lang="scss">
@import '../../scss/_variables.scss';
@media screen and (max-width: 768px) {
.tainacan-bulk-edition-inline-fields {
flex-direction: column !important;

3
src/views/admin/components/modals/capability-edition-modal.vue
View File

@ -124,8 +124,7 @@ export default {
</script>
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.capabilities-edit-form {
min-height: 120px;
vertical-align: top;

18
src/views/admin/components/modals/checkbox-radio-modal.vue
View File

@ -721,8 +721,6 @@
<style lang="scss" scoped>
@import "../../scss/variables.scss";
.breadcrumb {
background-color: var(--tainacan-white) !important;
@ -748,11 +746,11 @@
}
.tainacan-li-search-results {
max-width: calc(100% - 8.3333333%) !important;
max-width: calc(100% - (2 * var(--tainacan-one-column))) !important;
}
.tainacan-li-checkbox-list {
max-width: calc(100% - 8.3333333%) !important;
max-width: calc(100% - (2 * var(--tainacan-one-column))) !important;
}
}
@ -762,7 +760,7 @@
.b-tabs {
margin-bottom: 0 !important;
.tab-content {
padding: 0.5em;
}
@ -806,7 +804,7 @@
.tainacan-li-search-results {
flex-grow: 0;
flex-shrink: 1;
max-width: calc(50% - 8.3333333%);
max-width: calc(50% - (2 * var(--tainacan-one-column)));
.b-checkbox, .b-radio {
max-width: 81%;
@ -839,7 +837,7 @@
.tainacan-li-checkbox-list {
flex-grow: 0;
flex-shrink: 1;
max-width: calc(50% - 8.3333333%);
max-width: calc(50% - (2 * var(--tainacan-one-column)));
padding-left: 0.5em;
.b-checkbox, .b-radio {
@ -895,7 +893,7 @@
}
.tainacan-checkbox-search-section {
margin-bottom: 25px;
margin-bottom: var(--tainacan-container-padding);
display: flex;
align-items: center;
position: relative;
@ -946,11 +944,11 @@
}
.tainacan-modal-checkbox-list-body-dynamic-m-l {
margin-left: $page-side-padding !important;
margin-left: var(--tainacan-one-column) !important;
}
.tainacan-modal-checkbox-list-body-dynamic-m-r {
margin-right: $page-side-padding !important;
margin-right: var(--tainacan-one-column) !important;
}
.tainacan-search-results-container {

4
src/views/admin/components/modals/collections-modal.vue
View File

@ -97,14 +97,12 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.collection-types-container {
position: relative;
.collection-type {
border-bottom: 1px solid var(--tainacan-gray2);
padding: 15px 8.3333333%;
padding: 15px calc(2 * var(--tainacan-one-column));
cursor: pointer;
&:first-child {

2
src/views/admin/components/modals/exposers-modal.vue
View File

@ -471,8 +471,6 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.tainacan-modal-title {
margin-bottom: 24px;

4
src/views/admin/components/navigation/primary-menu.vue
View File

@ -222,14 +222,12 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
#primary-menu {
background-color: var(--tainacan-blue4);
padding: 52px 0px 0px 0px;
-webkit-transition: max-width 0.2s linear; /* Safari */
transition: max-width 0.2s linear;
max-width: $side-menu-width;
max-width: 160px;
z-index: 101;
a:hover {

6
src/views/admin/components/navigation/tainacan-collection-subheader.vue
View File

@ -237,7 +237,7 @@ export default {
width: 100%;
padding-top: 18px;
padding-bottom: 18px;
padding-right: $page-side-padding;
padding-right: var(--tainacan-one-column);
padding-left: 0;
margin: 0px;
vertical-align: middle;
@ -264,8 +264,8 @@ export default {
padding: 0;
margin: 0;
height: 42px;
width: $page-side-padding;
min-width: $page-side-padding;
width: var(--tainacan-one-column);
min-width: var(--tainacan-one-column);
color: var(--tainacan-white);
display: flex;

2
src/views/admin/components/navigation/tainacan-header.vue
View File

@ -227,7 +227,7 @@
}
.logo-area {
height: $header-height;
width: $side-menu-width;
width: 160px;
cursor: pointer;
&:focus {

10
src/views/admin/components/navigation/tainacan-repository-subheader.vue
View File

@ -158,7 +158,7 @@ export default {
padding-top: 10px;
padding-bottom: 10px;
padding-right: 0;
padding-left: calc((4.166666667% - 6.666666667px) + 160px);
padding-left: calc((var(--tainacan-one-column) - 6.666666667px) + 160px);
margin: 0px;
display: flex;
vertical-align: middle;
@ -171,7 +171,7 @@ export default {
&.is-repository-level {
background-color: var(--tainacan-blue5);
padding-right: $page-side-padding;
padding-right: var(--tainacan-one-column);
.repository-subheader-icons {
margin-right: -1em !important;
@ -179,7 +179,7 @@ export default {
}
&.is-menu-compressed {
padding-left: calc((4.166666667% - 2.083333333px) + 50px);
padding-left: calc((var(--tainacan-one-column) - 2.083333333px) + 50px);
}
h1 {
@ -196,7 +196,7 @@ export default {
.repository-subheader-icons {
display: flex;
flex-wrap: nowrap;
margin-right: calc(4.6666667% - 2.083333333px);
margin-right: calc(var(--tainacan-one-column) - 2.083333333px);
#view-collection-button,
#exporter-collection-button {
@ -228,7 +228,7 @@ export default {
@media screen and (max-width: 769px) {
top: 102px;
padding-left: $page-side-padding !important;
padding-left: var(--tainacan-one-column) !important;
}
}
</style>

2
src/views/admin/components/navigation/tainacan-title.vue
View File

@ -119,8 +119,6 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.tainacan-page-title {
margin-bottom: 32px;
display: flex;

2
src/views/admin/components/other/document-item.vue
View File

@ -52,8 +52,6 @@ export default {
<style lang="scss">
@import "../../scss/_variables.scss";
.document-item {
&:hover {

2
src/views/admin/components/other/file-item.vue
View File

@ -119,8 +119,6 @@ export default {
<style lang="scss">
@import "../../scss/_variables.scss";
.file-item {
display: inline-block;

2
src/views/admin/components/other/help-button.vue
View File

@ -31,8 +31,6 @@ export default {
<style lang="scss">
@import "../../scss/_variables.scss";
.help-wrapper {
position: absolute;
margin-top: -4px;

2
src/views/admin/components/other/item-copy-dialog.vue
View File

@ -186,7 +186,7 @@
objectType: this.$i18n.get('items'),
collectionID: this.collectionId
},
width: 'calc(100% - 8.333333333%)',
width: 'calc(100% - (2 * var(--tainacan-one-column)))',
trapFocus: true
});

1
src/views/admin/components/other/processes-popup.vue
View File

@ -252,7 +252,6 @@ export default {
</script>
<style lang="scss">
@import "../../scss/_variables.scss";
.control.is-loading::after {
border: 2px solid var(--tainacan-success);

6
src/views/admin/components/search/advanced-search.vue
View File

@ -594,8 +594,6 @@
<style lang="scss">
@import '../../scss/_variables.scss';
.loading-overlay {
min-height: 200px;
}
@ -605,8 +603,8 @@
}
.padding-regular {
padding-right: $page-side-padding;
padding-left: $page-side-padding;
padding-right: var(--tainacan-one-column);
padding-left: var(--tainacan-one-column);
}
.tnc-advanced-search-container {

4
src/views/admin/components/search/filters-tags-list.vue
View File

@ -67,11 +67,9 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.filter-tags-list {
width: 100%;
padding: 1em $page-side-padding 1em $page-side-padding;
padding: 1em var(--tainacan-one-column) 1em var(--tainacan-one-column);
font-size: 0.75em;
@media only screen and (max-width: 768px) {

2
src/views/admin/pages/home-page.vue
View File

@ -216,7 +216,7 @@ export default {
margin-top: $header-height;
background-color: var(--tainacan-white);
height: calc(100% - 52px);
padding: 25px 8.333333333% !important;
padding: var(--tainacan-container-padding) calc(2 * var(--tainacan-one-column)) !important;
width: 100vw;
.home-section {

2
src/views/admin/pages/lists/available-exporters-page.vue
View File

@ -58,8 +58,6 @@
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.exporter-types-container {
display: flex;
flex-wrap: wrap;

2
src/views/admin/pages/lists/available-importers-page.vue
View File

@ -58,8 +58,6 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.importer-types-container {
display: flex;
flex-wrap: wrap;

4
src/views/admin/pages/lists/collections-page.vue
View File

@ -571,8 +571,8 @@ export default {
.tabs {
padding-top: 20px;
margin-bottom: 20px;
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
}
.above-subheader {
margin-bottom: 0;

37
src/views/admin/pages/lists/items-page.vue
View File

@ -1217,7 +1217,7 @@
@import '../../scss/_variables.scss';
.tainacan-page-title {
padding: 25px $page-side-padding;
padding: var(--tainacan-container-padding) var(--tainacan-one-column);
margin: 0;
}
@ -1253,7 +1253,7 @@
.advanced-search-results-title {
margin-bottom: 40px;
margin: 0 $page-side-padding 42px $page-side-padding;
margin: 0 var(--tainacan-one-column) 42px var(--tainacan-one-column);
h1, h2 {
font-size: 1.25em;
@ -1280,17 +1280,17 @@
.advanced-search-form-submit {
display: flex;
justify-content: flex-end;
padding-right: $page-side-padding;
padding-left: $page-side-padding;
padding-right: var(--tainacan-one-column);
padding-left: var(--tainacan-one-column);
margin-bottom: 1em;
p { margin-left: 0.75em; }
}
.tnc-advanced-search-close {
padding-top: 25px;
padding-right: $page-side-padding;
padding-left: $page-side-padding;
padding-top: var(--tainacan-container-padding);
padding-right: var(--tainacan-one-column);
padding-left: var(--tainacan-one-column);
.column {
padding: 0 0.3em 0.3em !important;
@ -1319,7 +1319,7 @@
padding: 0;
#filters-items-list {
padding: $page-small-side-padding;
padding: var(--tainacan-container-padding);
}
}
@media screen and (min-width: 769px) {
@ -1371,13 +1371,10 @@
}
.search-control {
min-height: $subheader-height;
min-height: 42px;
height: auto;
position: relative;
padding-top: $page-small-top-padding;
padding-bottom: $page-small-top-padding;
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding: var(--tainacan-container-padding) var(--tainacan-one-column);
display: flex;
justify-content: space-between;
flex-wrap: wrap;
@ -1515,8 +1512,8 @@
.tabs {
padding-top: 6px;
margin-bottom: 20px;
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
@media screen and (min-width: 1024px) {
overflow: visible;
@ -1531,7 +1528,7 @@
display: flex;
justify-content: space-between;
align-items: center;
margin: 6px $page-side-padding;
margin: 6px var(--tainacan-one-column);
border-radius: 3px;
padding: 4px 12px;
color: var(--tainacan-yellow2);
@ -1568,14 +1565,14 @@
}
.table-container {
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
min-height: 50vh;
}
.pagination-area {
margin-left: $page-side-padding;
margin-right: $page-side-padding;
margin-left: var(--tainacan-one-column);
margin-right: var(--tainacan-one-column);
}

4
src/views/admin/pages/lists/taxonomies-page.vue
View File

@ -463,8 +463,8 @@
.tabs {
padding-top: 20px;
margin-bottom: 20px;
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
}
.above-subheader {
margin-bottom: 0;

24
src/views/admin/pages/singles/item-page.vue
View File

@ -422,10 +422,8 @@
<style lang="scss" scoped>
@import '../../scss/_variables.scss';
.page-container {
padding: 25px 0;
padding: var(--tainacan-container-padding) 0;
& > .tainacan-form {
margin-bottom: 110px;
@ -436,7 +434,7 @@
}
.tainacan-page-title {
padding: 0 $page-side-padding;
padding: 0 var(--tainacan-one-column);
margin-bottom: 32px;
display: flex;
flex-wrap: wrap;
@ -481,13 +479,13 @@
.tainacan-form > .columns {
margin-bottom: 70px;
margin-left: $page-side-padding;
margin-right: $page-side-padding;
margin-left: var(--tainacan-one-column);
margin-right: var(--tainacan-one-column);
}
.column.is-5 {
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
@media screen and (max-width: 769px) {
width: 100%;
@ -495,7 +493,7 @@
}
.column.is-7 {
padding-left: 0;
padding-right: $page-side-padding;
padding-right: var(--tainacan-one-column);
.columns {
flex-wrap: wrap;
@ -511,7 +509,7 @@
}
@media screen and (max-width: 769px) {
padding-left: $page-side-padding;
padding-left: var(--tainacan-one-column);
width: 100%;
}
}
@ -525,7 +523,7 @@
.metadata-area {
.field {
border-bottom: 1px solid var(--tainacan-gray2);
padding: 10px 25px;
padding: 10px var(--tainacan-container-padding);
margin-left: 0px !important;
.label {
@ -555,7 +553,7 @@
.section-box {
background-color: var(--tainacan-white);
padding: 0 $page-side-padding 0 0;
padding: 0 var(--tainacan-one-column) 0 0;
margin-top: 18px;
margin-bottom: 32px;
@ -637,7 +635,7 @@
}
.footer {
padding: 18px $page-side-padding;
padding: 18px var(--tainacan-one-column);
position: absolute;
bottom: 0;
z-index: 999999;

2
src/views/admin/scss/_collection-home-cards.scss
View File

@ -11,7 +11,7 @@
animation-duration: 0.5s;
&>div {
width: calc(100% + 25px) !important;
width: calc(100% + var(--tainacan-container-padding)) !important;
&>div>.tainacan-card:nth-child(3),
&>div>.tainacan-card:nth-child(4),

6
src/views/admin/scss/_custom_variables.scss
View File

@ -70,6 +70,12 @@
// Filter Menu Width when not a modal
--tainacan-filter-menu-width-theme: #{$filter-menu-width-theme};
// One column is 1/24% and it is used a lot in the horizontal space distribution
--tainacan-one-column: #{$one-column};
// Not really used in EVERY container, but a rather frequent value
--tainacan-container-padding: #{$container-padding};
}
// Some Bulma classes will work with SASS but not with CSS variables

6
src/views/admin/scss/_filters-menu-modal.scss
View File

@ -6,7 +6,7 @@
}
.modal-content {
padding: 24px 18px $page-side-padding;
padding: 24px 18px var(--tainacan-one-column);
padding: 24px 18px 24px 4.1666667vw;
margin: 0;
height: 100%;
@ -24,7 +24,7 @@
.modal-close {
top: 32px;
right: calc(8.3333333% + 28px);
right: calc((2 * var(--tainacan-one-column)) + 28px);
background-color: var(--tainacan-background-color);
&::before, &::after {
@ -38,7 +38,7 @@
background-color: var(--tainacan-background-color);
margin: 0 12% 0 0;
margin: 0 12vw 0 0;
padding: $page-small-side-padding;
padding: var(--tainacan-container-padding);
}
}
}

7
src/views/admin/scss/_modals.scss
View File

@ -1,7 +1,7 @@
// Tainacan modals
.modal .animation-content {
background: none;
width: 91.6666667%;
width: calc(100% - (2 * var(--tainacan-one-column)));
width: 91.6666667vw;
max-height: 86%;
max-height: 86vh;
@ -59,14 +59,14 @@
font-family: var(--tainacan-font-family, inherit);
border-radius: 0px;
background-color: var(--tainacan-background-color);
padding: 40px $page-side-padding;
padding: 40px var(--tainacan-one-column);
padding: 40px 4.166666667vw;
position: relative;
overflow-y: auto;
overflow-x: hidden;
@media only screen and (max-width: 768px) {
padding: 40px 8.333333%;
padding: 40px calc(2 * var(--tainacan-one-column));
padding: 40px 8.333333vw;
}
@ -76,6 +76,7 @@
nav {
border: none !important;
margin-bottom: 0 !important;
}
figure {

4
src/views/admin/scss/_pagination.scss
View File

@ -7,8 +7,8 @@
border-top: 1px solid var(--tainacan-input-border-color);
padding-top: 0;
padding-bottom: 0;
margin-left: $page-side-padding;
margin-right: $page-side-padding;
margin-left: var(--tainacan-one-column);
margin-right: var(--tainacan-one-column);
margin-bottom: 12px;
padding-left: 0.75em;
padding-right: 0.75em;

2
src/views/admin/scss/_tables.scss
View File

@ -1,7 +1,7 @@
// Tables
.table-container {
padding: 0 $table-side-padding;
padding: 0 var(--tainacan-one-column);
position: relative;
margin-bottom: 40px;

1
src/views/admin/scss/_tabs.scss
View File

@ -5,6 +5,7 @@
ul {
border-bottom-color: var(--tainacan-input-border-color);
margin-bottom: 0;
}
li {
overflow-y: hidden;

13
src/views/admin/scss/_variables.scss
View File

@ -134,23 +134,16 @@ $colors: map-merge($colors, $addColors);
$size-small: 0.875em; // 0.75em on Bulma.
$dropdown-mobile-breakpoint: $tablet;
// Tainacan Header and side menus
// Tainacan Header, Filters and Page
$header-height: 52px;
$subheader-height: 42px;
$side-menu-width: 160px;
$filter-menu-width: 16.666666667%;
$filter-menu-width-theme: 20%;
$page-height: calc(100vh - 94px);
// Overall Pages padding:
$page-side-padding: 4.166666667%;//82px;
$table-side-padding: 4.166666667%;
$page-top-padding: 25px;
$page-small-side-padding: 25px;
$page-small-top-padding: 25px;
$page-mobile-side-padding: 1em;
$page-mobile-top-padding: 1em;
$one-column: 4.166666667%;
$container-padding: 25px;
// Links
$link: $secondary;

4
src/views/admin/scss/_view-mode-cards.scss
View File

@ -10,7 +10,7 @@
animation-duration: 0.5s;
@media screen and (max-width: 480px) {
width: 91.666666667%;
width: calc(100% - (2 * var(--tainacan-one-column)));
-ms-grid-columns: 100%;
grid-template-columns: repeat(auto-fill, 100%);
}
@ -66,7 +66,7 @@
.actions-area {
position: relative;
float: right;
top: -25px;
top: calc(-1 * var(--tainacan-container-padding));
padding-right: 12px;
display: flex;
justify-content: space-between;

2
src/views/admin/scss/_view-mode-masonry.scss
View File

@ -18,7 +18,7 @@
display: block;
width: 100%;
flex-basis: 0;
margin-bottom: 25px;
margin-bottom: var(--tainacan-container-padding);
text-align: center;
text-decoration: none;
transition: background-color 0.2s ease;

6
src/views/admin/scss/_view-mode-records.scss
View File

@ -44,7 +44,7 @@
.actions-area {
position: relative;
float: right;
top: -25px;
top: calc(-1 * var(--tainacan-container-padding));
padding-right: 12px;
//width: 80px;
display: flex;
@ -79,7 +79,7 @@
}
.tainacan-record-thumbnail {
float: right;
margin: 0 0 25px 25px;
margin: 0 0 var(--tainacan-container-padding) var(--tainacan-container-padding);
}
img {
width: 120px;
@ -126,7 +126,7 @@
transition: background-color 0.2s ease;
.list-metadata {
padding: 25px;
padding: var(--tainacan-container-padding);
flex: 1;
font-size: 1em;
color: var(--tainacan-info-color);

12
src/views/admin/scss/tainacan-admin.scss
View File

@ -90,8 +90,8 @@ body.tainacan-admin-page #adminmenumain, body.tainacan-admin-page #wpfooter, bod
height: 46px;
width: 46px;
background-size: initial;
top: calc(50% - 25px);
left: calc(50% - 25px);
top: calc(50% - var(--tainacan-container-padding));
left: calc(50% - var(--tainacan-container-padding));
}
// Link (hover is the same color as secondary
@ -120,7 +120,7 @@ a:hover {
// Generic page container
.page-container {
padding: $page-top-padding $page-side-padding;
padding: var(--tainacan-container-padding) var(--tainacan-one-column);
height: 100%;
overflow-y: auto;
overflow-x: hidden;
@ -132,11 +132,11 @@ a:hover {
transition: height 0.6s;
}
// Used for pages with subheader in mobile
.page-container-narrow{
padding: $page-small-top-padding $page-small-side-padding;
.page-container-narrow {
padding: var(--tainacan-container-padding);
@media screen and (max-width: 769px) {
padding: $page-mobile-top-padding $page-mobile-side-padding;
padding: 1em;
}
}

12
src/views/gutenberg-blocks/tainacan-items/search-bar/search-bar.scss
View File

@ -276,7 +276,7 @@
&:not(.is-aligned-right):not(.is-aligned-left) {
.tainacan-search-container {
width: calc(100% - 4.1667% - 53px);
width: calc(100% - var(--tainacan-one-column) - 53px);
width: calc(100% - 4.1667vw - 53px);
bottom: calc(-50% + 38px);
position: absolute;
@ -287,10 +287,10 @@
}
&.is-aligned-right {
.tainacan-search-container {
width: calc(100% - 4.1667% - 26px);
width: calc(100% - var(--tainacan-one-column) - 26px);
width: calc(100% - 4.1667vw - 26px);
top: calc(-50% + 26px);
right: calc(4.1667% + 26px);
right: calc(var(--tainacan-one-column) + 26px);
right: calc(4.1667vw + 26px);
position: absolute;
}
@ -300,7 +300,7 @@
.tainacan-search-container {
width: calc(100% - 1em - 26px);
top: calc(-50% + 26px);
left: calc(4.1667% + 26px);
left: calc(var(--tainacan-one-column) + 26px);
left: calc(4.1667vw + 26px);
position: absolute;
}
@ -321,7 +321,7 @@
@media only screen and (max-width: 768px) {
.tainacan-search-container {
width: calc(100% - 4.1667% - 53px) !important;
width: calc(100% - var(--tainacan-one-column) - 53px) !important;
width: calc(100% - 4.1667vw - 53px) !important;
bottom: calc(-50% + 38px) !important;
position: absolute !important;
@ -353,7 +353,7 @@
flex-wrap: wrap;
align-items: center;
flex-grow: 2;
padding: 0.5em 4.1667%;
padding: 0.5em var(--tainacan-one-column);
padding: 0.5em 4.1667vw;
text-align: center;
text-decoration: none !important;

3
src/views/theme-search/components/view-mode-slideshow.vue
View File

@ -640,9 +640,6 @@ export default {
<style lang="scss">
$page-small-side-padding: 25px;
$page-side-padding: 4.166666667%;
@import "../scss/_view-mode-slideshow.scss";
.is-fullscreen .table-wrapper {

29
src/views/theme-search/pages/theme-items-page.vue
View File

@ -1087,8 +1087,6 @@
<style lang="scss" scoped>
@import '../../scss/_variables.scss';
@keyframes open-full-screen {
from {
opacity: 0;
@ -1148,7 +1146,7 @@
.advanced-search-results-title {
margin-bottom: 40px;
margin: 0 $page-side-padding 42px $page-side-padding;
margin: 0 var(--tainacan-one-column) 42px var(--tainacan-one-column);
h1, h2 {
font-size: 1.25em;
@ -1175,8 +1173,8 @@
.advanced-search-form-submit {
display: flex;
justify-content: flex-end;
padding-right: $page-side-padding;
padding-left: $page-side-padding;
padding-right: var(--tainacan-one-column);
padding-left: var(--tainacan-one-column);
margin-bottom: 1em;
p { margin-left: 0.75em; }
@ -1184,8 +1182,8 @@
.tnc-advanced-search-close {
padding-top: 47px;
padding-right: $page-side-padding;
padding-left: $page-side-padding;
padding-right: var(--tainacan-one-column);
padding-left: var(--tainacan-one-column);
.column {
padding: 0 0.3em 0.3em !important;
@ -1243,12 +1241,9 @@
display: flex;
flex-wrap: wrap;
justify-content: space-between !important;
min-height: $subheader-height;
min-height: 42px;
height: auto;
padding-top: $page-small-top-padding;
padding-bottom: 20px;
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding: var(--tainacan-container-padding) var(--tainacan-one-column) 20px var(--tainacan-one-column);
.dropdown-item {
padding: 0.25em 1.35em 0.25em 0.25em;
@ -1394,7 +1389,7 @@
display: flex;
justify-content: space-between;
align-items: center;
margin: 6px $page-side-padding;
margin: 6px var(--tainacan-one-column);
border-radius: 3px;
padding: 4px 12px;
color: var(--tainacan-yellow2);
@ -1450,15 +1445,15 @@
}
.table-container {
padding-left: $page-side-padding;
padding-right: $page-side-padding;
padding-left: var(--tainacan-one-column);
padding-right: var(--tainacan-one-column);
min-height: 50vh;
//height: calc(100% - 82px);
}
.pagination-area {
margin-left: $page-side-padding;
margin-right: $page-side-padding;
margin-left: var(--tainacan-one-column);
margin-right: var(--tainacan-one-column);
}
</style>

2
src/views/theme-search/scss/_layout.scss
View File

@ -73,7 +73,7 @@
}
#filters-items-list {
padding: $page-small-side-padding;
padding: var(--tainacan-container-padding);
}
}
@media screen and (min-width: 769px) {

18
src/views/theme-search/scss/_view-mode-slideshow.scss
View File

@ -22,7 +22,7 @@
min-width: 180px;
min-height: 100%;
height: 100%;
padding: $page-side-padding 25px $page-side-padding $page-side-padding;
padding: var(--tainacan-one-column) var(--tainacan-container-padding) var(--tainacan-one-column) var(--tainacan-one-column);
float: left;
overflow-y: auto;
overflow-x: hidden;
@ -32,7 +32,7 @@
@media screen and (max-width: 768px) {
width: 100% !important;
padding: $page-small-side-padding !important;
padding: var(--tainacan-container-padding) !important;
h3 {
margin-top: 0 !important;
@ -275,7 +275,7 @@
// top: -85px;
// margin-bottom: -85px;
background-color: rgba(0,0,0,0.5);
padding: 1em $page-side-padding;
padding: 1em var(--tainacan-one-column);
display: flex;
justify-content: space-between;
align-items: center;
@ -301,7 +301,7 @@
background: var(--tainacan-white);
border: 3px solid var(--tainacan-turquoise5);
i, i:before {
font-size: 2.25em;
font-size: 1.5em;
}
}
&:focus, &:active {
@ -310,8 +310,8 @@
}
.circular-counter {
position: absolute;
right: calc(4.16667% + -2px);
top: -6px;
right: calc(var(--tainacan-one-column) - 2px);
top: -8px;
}
}
}
@ -344,12 +344,12 @@
}
&.arrow-left {
left: 0;
margin-left: $page-side-padding;
margin-left: var(--tainacan-one-column);
transition: margin-left 0.3s;
}
&.arrow-right {
right: 0;
margin-right: $page-side-padding;
margin-right: var(--tainacan-one-column);
transition: margin-right 0.3s;
}
&.slide-group-arrow {
@ -384,7 +384,7 @@
}
#tainacan-slide-container {
padding: 0 $page-side-padding;
padding: 0 var(--tainacan-one-column);
display: flex;
flex-wrap: nowrap;
overflow: hidden;