Merge remote-tracking branch 'origin/develop' into issue-#24
This commit is contained in:
Jacson Passold
commit
06d5e27c0e
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div
|
||||
class="page-container"
|
||||
:class="{'primary-page' : isNewCollection }">
|
||||
:class="{'repository-level-page' : isNewCollection }">
|
||||
<tainacan-title />
|
||||
<form
|
||||
v-if="collection != null && collection != undefined"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div
|
||||
class="primary-page page-container">
|
||||
class="repository-level-page page-container">
|
||||
<tainacan-title />
|
||||
<form
|
||||
class="tainacan-form"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<template>
|
||||
<div
|
||||
class="primary-page page-container">
|
||||
class="repository-level-page page-container">
|
||||
<div class="tainacan-page-title">
|
||||
<h1>{{ $i18n.get('label_metadata_mapping') }} </h1>
|
||||
<a
|
||||
@click="$router.go(-1)"
|
||||
class="back-link is-secondary">
|
||||
class="back-link has-text-secondary">
|
||||
{{ $i18n.get('back') }}
|
||||
</a>
|
||||
<hr>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
</b-modal>
|
||||
<a
|
||||
v-if="collectionId != null && collectionId != undefined"
|
||||
class="is-inline is-pulled-right add-link"
|
||||
class="is-inline is-pulled-right add-link has-text-secondary"
|
||||
@click="createNewMetadatum()">
|
||||
<b-icon
|
||||
icon="plus-circle"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="page-container primary-page">
|
||||
<div class="page-container repository-level-page">
|
||||
<tainacan-title />
|
||||
<b-tabs v-model="activeTab">
|
||||
<b-tab-item :label="$i18n.get('taxonomy')">
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
</div>
|
||||
<div class="column available-metadata-area">
|
||||
<div class="field" >
|
||||
<h3 class="label"> {{ $i18n.get('label_available_metadata') }}</h3>
|
||||
<h3 class="label has-text-primary"> {{ $i18n.get('label_available_metadata') }}</h3>
|
||||
<draggable
|
||||
v-if="availableMetadatumList.length > 0"
|
||||
v-model="availableMetadatumList"
|
||||
|
|
@ -466,15 +466,6 @@ export default {
|
|||
|
||||
@import "../../scss/_variables.scss";
|
||||
|
||||
.page-title {
|
||||
border-bottom: 1px solid $secondary;
|
||||
h2 {
|
||||
color: $blue5;
|
||||
font-weight: 500;
|
||||
}
|
||||
margin: 1em 0em 2.0em 0em;
|
||||
}
|
||||
|
||||
.loading-spinner {
|
||||
animation: spinAround 500ms infinite linear;
|
||||
border: 2px solid #dbdbdb;
|
||||
|
|
@ -657,7 +648,6 @@ export default {
|
|||
}
|
||||
|
||||
h3 {
|
||||
color: $secondary;
|
||||
margin: 0.2em 0em 1em -1.2em;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@
|
|||
|
||||
<div class="column available-metadata-area" >
|
||||
<div class="field">
|
||||
<h3 class="label">{{ $i18n.get('label_available_metadata_types') }}</h3>
|
||||
<h3 class="label has-text-secondary">{{ $i18n.get('label_available_metadata_types') }}</h3>
|
||||
<draggable
|
||||
v-model="availableMetadatumList"
|
||||
:options="{
|
||||
|
|
@ -935,7 +935,6 @@ export default {
|
|||
}
|
||||
|
||||
h3 {
|
||||
color: $secondary;
|
||||
margin: 0.2em 0em 1em -1.2em;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
:key="term.id"
|
||||
@click.prevent="isEditingTerm ? null : loadTerms(term.id)">
|
||||
<a
|
||||
class="is-small"
|
||||
class="is-small has-text-secondary"
|
||||
type="button"
|
||||
@click="addNewChildTerm(term, index)"
|
||||
:disabled="isEditingTerm">
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
<template>
|
||||
<div
|
||||
id="tainacan-subheader"
|
||||
class="level secondary-page">
|
||||
<div class="level-left">
|
||||
class="secondary-page">
|
||||
|
||||
<div class="back-button">
|
||||
<button
|
||||
@click="$router.go(-1)"
|
||||
class="button is-turquoise4">
|
||||
<span class="icon">
|
||||
<i class="mdi mdi-chevron-left"/>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<div class="back-button">
|
||||
<button
|
||||
@click="$router.go(-1)"
|
||||
class="button is-turquoise4">
|
||||
<span class="icon">
|
||||
<i class="mdi mdi-chevron-left"/>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
<nav class="breadcrumbs">
|
||||
<router-link
|
||||
tag="a"
|
||||
|
|
@ -32,6 +34,7 @@
|
|||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul class="menu-list level-right">
|
||||
<li
|
||||
:class="activeRoute == 'ItemPage' || activeRoute == 'CollectionItemsPage' || activeRoute == 'ItemEditionForm' || activeRoute == 'ItemCreatePage' ? 'is-active':''"
|
||||
|
|
@ -98,6 +101,7 @@
|
|||
</li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -220,7 +224,7 @@ export default {
|
|||
|
||||
// Tainacan Header
|
||||
#tainacan-subheader {
|
||||
background-color: $gray2;
|
||||
background-color: $gray1;
|
||||
height: $subheader-height;
|
||||
max-height: $subheader-height;
|
||||
width: 100%;
|
||||
|
|
@ -234,6 +238,10 @@ export default {
|
|||
left: 0;
|
||||
right: 0;
|
||||
z-index: 9;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
transition: padding 0.3s, height 0.3s;
|
||||
|
||||
h1 {
|
||||
|
|
@ -252,19 +260,21 @@ export default {
|
|||
|
||||
.back-button {
|
||||
padding: 0;
|
||||
margin: 0 12px 0 0;
|
||||
margin: 0;
|
||||
height: 42px;
|
||||
width: 42px;
|
||||
background-color: $turquoise4;
|
||||
color: white;
|
||||
width: $page-side-padding;
|
||||
min-width: $page-side-padding;
|
||||
background-color: $gray1;
|
||||
color: $turquoise4;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
button,
|
||||
button:hover,
|
||||
button:focus,
|
||||
button:active{
|
||||
color: white;
|
||||
button:active {
|
||||
width: 100%;
|
||||
color: $turquoise4;
|
||||
background-color: transparent !important;
|
||||
border: none;
|
||||
.icon i {
|
||||
|
|
@ -279,6 +289,10 @@ export default {
|
|||
color: #1d1d1d;
|
||||
}
|
||||
|
||||
.level {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
li{
|
||||
margin-right: 0px;
|
||||
transition: max-width 0.4s linear, width 0.4s linear;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
</div>
|
||||
<button
|
||||
@click="showProcesses = !showProcesses"
|
||||
class="button is-small is-gray2 level-item">
|
||||
class="button is-small is-white level-item">
|
||||
<b-icon icon="swap-vertical"/>
|
||||
</button>
|
||||
<processes-popup
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
|
||||
// Tainacan Header
|
||||
#tainacan-header {
|
||||
background-color: $gray2;
|
||||
background-color: white;
|
||||
height: $header-height;
|
||||
max-height: $header-height;
|
||||
width: 100%;
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
color: $blue5 !important;
|
||||
}
|
||||
.button:hover, .button:active, .button:focus {
|
||||
background-color: $gray2 !important;
|
||||
background-color: white !important;
|
||||
}
|
||||
|
||||
.search-area {
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
margin-right: 28px;
|
||||
.control {
|
||||
.search-header {
|
||||
border: 1px solid $gray2 !important;
|
||||
border: 1px solid $gray3 !important;
|
||||
height: 27px;
|
||||
font-size: 11px;
|
||||
transition: width linear 0.15s;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
class="level secondary-page"
|
||||
:class="{'is-menu-compressed': isMenuCompressed, 'is-repository-level' : isRepositoryLevel}">
|
||||
<h1 v-if="isRepositoryLevel">Nome do Site</h1>
|
||||
<h1 v-else>{{ collectionName }}</h1>
|
||||
<h1 v-else>{{ $i18n.get('collection') + '' }} <span class="has-text-weight-bold">{{ collectionName }}</span></h1>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -70,7 +70,6 @@ export default {
|
|||
|
||||
h1 {
|
||||
font-size: 18px;
|
||||
font-weight: 500;
|
||||
color: white;
|
||||
line-height: 18px;
|
||||
max-width: 100%;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<h1>{{ pageTitle }} <span class="is-italic has-text-weight-semibold">{{ isRepositoryLevel ? '' : entityName }}</span></h1>
|
||||
<a
|
||||
@click="$router.go(-1)"
|
||||
class="back-link is-secondary">
|
||||
class="back-link has-text-secondary">
|
||||
{{ $i18n.get('back') }}
|
||||
</a>
|
||||
<hr>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<span class="help-wrapper">
|
||||
<a class="help-button">
|
||||
<a class="help-button has-text-secondary">
|
||||
<b-icon
|
||||
size="is-small"
|
||||
icon="help-circle-outline"/></a>
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ export default {
|
|||
}
|
||||
|
||||
.processes-popup{
|
||||
background-color: #c1dae0;
|
||||
background-color: $turquoise2;
|
||||
width: 320px;
|
||||
max-width: 100%;
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="primary-page page-container">
|
||||
<div class="repository-level-page page-container">
|
||||
<tainacan-title />
|
||||
|
||||
<h3>{{ $i18n.get('label_available_importers') }}</h3>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="primary-page page-container">
|
||||
<div class="repository-level-page page-container">
|
||||
<b-loading :active.sync="isLoadingMetadatumMappers"/>
|
||||
<tainacan-title />
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div>
|
||||
<div
|
||||
:class="{
|
||||
'primary-page': isRepositoryLevel,
|
||||
'repository-level-page': isRepositoryLevel,
|
||||
'page-container': isRepositoryLevel
|
||||
}">
|
||||
<tainacan-title />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="primary-page page-container">
|
||||
<div class="repository-level-page page-container">
|
||||
<tainacan-title />
|
||||
<filters-list/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div
|
||||
:class="{'primary-page': isRepositoryLevel}">
|
||||
:class="{'repository-level-page': isRepositoryLevel}">
|
||||
|
||||
<!-- SEARCH AND FILTERS --------------------- -->
|
||||
<!-- Filter menu compress button -->
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
</div>
|
||||
<a
|
||||
@click="openAdvancedSearch = !openAdvancedSearch"
|
||||
class="is-size-7 is-secondary is-pulled-right is-hidden-mobile">{{ $i18n.get('advanced_search') }}</a>
|
||||
class="is-size-7 has-text-secondary is-pulled-right is-hidden-mobile">{{ $i18n.get('advanced_search') }}</a>
|
||||
|
||||
<h3 class="has-text-weight-semibold">{{ $i18n.get('filters') }}</h3>
|
||||
<a
|
||||
|
|
@ -368,7 +368,7 @@
|
|||
</div>
|
||||
<a
|
||||
@click="openAdvancedSearch = !openAdvancedSearch"
|
||||
class="is-size-7 is-secondary is-pulled-right">{{ $i18n.get('advanced_search') }}</a>
|
||||
class="is-size-7 has-text-secondary is-pulled-right">{{ $i18n.get('advanced_search') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="primary-page page-container">
|
||||
<div class="repository-level-page page-container">
|
||||
<tainacan-title />
|
||||
<metadata-list/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="primary-page page-container">
|
||||
<div class="repository-level-page page-container">
|
||||
<tainacan-title />
|
||||
<div
|
||||
class="sub-header"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="is-fullheight">
|
||||
<div class="page-container primary-page">
|
||||
<div class="page-container repository-level-page">
|
||||
<tainacan-title/>
|
||||
<h1 class="event-titles">{{ event.description }}</h1>
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="columns is-fullheight">
|
||||
<div class="page-container primary-page">
|
||||
<div class="page-container repository-level-page">
|
||||
<div class="card">
|
||||
<div class="card-content">
|
||||
<p class="title">
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
margin-bottom: 0px !important;
|
||||
color: $tainacan-input-color;
|
||||
option:checked, option:hover {
|
||||
background-color: $turquoise1 !important;
|
||||
background-color: $gray1 !important;
|
||||
}
|
||||
&:focus, &:active {
|
||||
box-shadow: none !important;
|
||||
|
|
|
|||
|
|
@ -64,14 +64,41 @@ a:hover {
|
|||
}
|
||||
}
|
||||
|
||||
// Page settings
|
||||
.primary-page {
|
||||
// Repository-level pages
|
||||
.repository-level-page {
|
||||
margin-top: 94px;
|
||||
height: $page-height !important;
|
||||
|
||||
@media screen and (max-width: 769px) {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.is-primary, .is-primary:hover, .is-primary:focus {
|
||||
background-color: $blue4 !important;
|
||||
}
|
||||
.is-secondary, .is-secondary:hover, .is-secondary:focus {
|
||||
background-color: $blue5 !important;
|
||||
}
|
||||
.has-text-primary, .has-text-primary:hover, .is-has-text-primary:focus {
|
||||
color: $blue4 !important;
|
||||
}
|
||||
a, a:hover,
|
||||
.has-text-secondary, .has-text-secondary:hover, .is-has-text-secondary:focus {
|
||||
color: $blue5 !important;
|
||||
}
|
||||
.tabs {
|
||||
li.is-active a {
|
||||
border-bottom: 5px solid $blue5;
|
||||
color: $blue5;
|
||||
}
|
||||
}
|
||||
.select:not(.is-multiple)::after {
|
||||
color: $blue5;
|
||||
|
||||
option:checked, option:hover {
|
||||
background-color: $gray1 !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Generic page container
|
||||
.page-container {
|
||||
|
|
|
|||
Loading…
Reference in New Issue