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

Merge remote-tracking branch 'origin/develop' into issue-#24

This commit is contained in:
Jacson Passold 2018-07-27 11:17:17 -03:00
parent 05374f7553 e483a27354
commit e59251c976
24 changed files with 90 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<template> <template>
<div <div
class="page-container" class="page-container"
:class="{'primary-page' : isNewCollection }"> :class="{'repository-level-page' : isNewCollection }">
<tainacan-title /> <tainacan-title />
<form <form
v-if="collection != null && collection != undefined" v-if="collection != null && collection != undefined"

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

@ -1,6 +1,6 @@
<template> <template>
<div <div
class="primary-page page-container"> class="repository-level-page page-container">
<tainacan-title /> <tainacan-title />
<form <form
class="tainacan-form" class="tainacan-form"

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

@ -1,11 +1,11 @@
<template> <template>
<div <div
class="primary-page page-container"> class="repository-level-page page-container">
<div class="tainacan-page-title"> <div class="tainacan-page-title">
<h1>{{ $i18n.get('label_metadata_mapping') }} </h1> <h1>{{ $i18n.get('label_metadata_mapping') }} </h1>
<a <a
@click="$router.go(-1)" @click="$router.go(-1)"
class="back-link is-secondary"> class="back-link has-text-secondary">
{{ $i18n.get('back') }} {{ $i18n.get('back') }}
</a> </a>
<hr> <hr>
@ -119,7 +119,7 @@
</b-modal> </b-modal>
<a <a
v-if="collectionId != null && collectionId != undefined" 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()"> @click="createNewMetadatum()">
<b-icon <b-icon
icon="plus-circle" icon="plus-circle"

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

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div class="page-container primary-page"> <div class="page-container repository-level-page">
<tainacan-title /> <tainacan-title />
<b-tabs v-model="activeTab"> <b-tabs v-model="activeTab">
<b-tab-item :label="$i18n.get('taxonomy')"> <b-tab-item :label="$i18n.get('taxonomy')">

12
src/admin/components/lists/filters-list.vue
View File

@ -130,7 +130,7 @@
</div> </div>
<div class="column available-metadata-area"> <div class="column available-metadata-area">
<div class="field" > <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 <draggable
v-if="availableMetadatumList.length > 0" v-if="availableMetadatumList.length > 0"
v-model="availableMetadatumList" v-model="availableMetadatumList"
@ -466,15 +466,6 @@ export default {
@import "../../scss/_variables.scss"; @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 { .loading-spinner {
animation: spinAround 500ms infinite linear; animation: spinAround 500ms infinite linear;
border: 2px solid #dbdbdb; border: 2px solid #dbdbdb;
@ -657,7 +648,6 @@ export default {
} }
h3 { h3 {
color: $secondary;
margin: 0.2em 0em 1em -1.2em; margin: 0.2em 0em 1em -1.2em;
font-weight: 500; font-weight: 500;
} }

3
src/admin/components/lists/metadata-list.vue
View File

@ -113,7 +113,7 @@
<div class="column available-metadata-area" > <div class="column available-metadata-area" >
<div class="field"> <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 <draggable
v-model="availableMetadatumList" v-model="availableMetadatumList"
:options="{ :options="{
@ -935,7 +935,6 @@ export default {
} }
h3 { h3 {
color: $secondary;
margin: 0.2em 0em 1em -1.2em; margin: 0.2em 0em 1em -1.2em;
font-weight: 500; font-weight: 500;
} }

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

@ -31,7 +31,7 @@
:key="term.id" :key="term.id"
@click.prevent="isEditingTerm ? null : loadTerms(term.id)"> @click.prevent="isEditingTerm ? null : loadTerms(term.id)">
<a <a
class="is-small" class="is-small has-text-secondary"
type="button" type="button"
@click="addNewChildTerm(term, index)" @click="addNewChildTerm(term, index)"
:disabled="isEditingTerm"> :disabled="isEditingTerm">

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

@ -1,18 +1,20 @@
<template> <template>
<div <div
id="tainacan-subheader" id="tainacan-subheader"
class="level secondary-page"> class="secondary-page">
<div class="level-left">
<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="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"> <nav class="breadcrumbs">
<router-link <router-link
tag="a" tag="a"
@ -32,6 +34,7 @@
</nav> </nav>
</div> </div>
</div> </div>
<ul class="menu-list level-right"> <ul class="menu-list level-right">
<li <li
:class="activeRoute == 'ItemPage' || activeRoute == 'CollectionItemsPage' || activeRoute == 'ItemEditionForm' || activeRoute == 'ItemCreatePage' ? 'is-active':''" :class="activeRoute == 'ItemPage' || activeRoute == 'CollectionItemsPage' || activeRoute == 'ItemEditionForm' || activeRoute == 'ItemCreatePage' ? 'is-active':''"
@ -98,6 +101,7 @@
</li> </li>
</ul> </ul>
</div>
</div> </div>
</template> </template>
@ -220,7 +224,7 @@ export default {
// Tainacan Header // Tainacan Header
#tainacan-subheader { #tainacan-subheader {
background-color: $gray2; background-color: $gray1;
height: $subheader-height; height: $subheader-height;
max-height: $subheader-height; max-height: $subheader-height;
width: 100%; width: 100%;
@ -234,6 +238,10 @@ export default {
left: 0; left: 0;
right: 0; right: 0;
z-index: 9; z-index: 9;
display: flex;
align-items: center;
justify-content: space-between;
transition: padding 0.3s, height 0.3s; transition: padding 0.3s, height 0.3s;
h1 { h1 {
@ -252,19 +260,21 @@ export default {
.back-button { .back-button {
padding: 0; padding: 0;
margin: 0 12px 0 0; margin: 0;
height: 42px; height: 42px;
width: 42px; width: $page-side-padding;
background-color: $turquoise4; min-width: $page-side-padding;
color: white; background-color: $gray1;
color: $turquoise4;
display: flex; display: flex;
align-items: center; align-items: center;
button, button,
button:hover, button:hover,
button:focus, button:focus,
button:active{ button:active {
color: white; width: 100%;
color: $turquoise4;
background-color: transparent !important; background-color: transparent !important;
border: none; border: none;
.icon i { .icon i {
@ -279,6 +289,10 @@ export default {
color: #1d1d1d; color: #1d1d1d;
} }
.level {
width: 100%;
}
li{ li{
margin-right: 0px; margin-right: 0px;
transition: max-width 0.4s linear, width 0.4s linear; transition: max-width 0.4s linear, width 0.4s linear;

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

@ -64,7 +64,7 @@
</div> </div>
<button <button
@click="showProcesses = !showProcesses" @click="showProcesses = !showProcesses"
class="button is-small is-gray2 level-item"> class="button is-small is-white level-item">
<b-icon icon="swap-vertical"/> <b-icon icon="swap-vertical"/>
</button> </button>
<processes-popup <processes-popup
@ -154,7 +154,7 @@
// Tainacan Header // Tainacan Header
#tainacan-header { #tainacan-header {
background-color: $gray2; background-color: white;
height: $header-height; height: $header-height;
max-height: $header-height; max-height: $header-height;
width: 100%; width: 100%;
@ -191,7 +191,7 @@
color: $blue5 !important; color: $blue5 !important;
} }
.button:hover, .button:active, .button:focus { .button:hover, .button:active, .button:focus {
background-color: $gray2 !important; background-color: white !important;
} }
.search-area { .search-area {
@ -200,7 +200,7 @@
margin-right: 28px; margin-right: 28px;
.control { .control {
.search-header { .search-header {
border: 1px solid $gray2 !important; border: 1px solid $gray3 !important;
height: 27px; height: 27px;
font-size: 11px; font-size: 11px;
transition: width linear 0.15s; transition: width linear 0.15s;

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

@ -4,7 +4,7 @@
class="level secondary-page" class="level secondary-page"
:class="{'is-menu-compressed': isMenuCompressed, 'is-repository-level' : isRepositoryLevel}"> :class="{'is-menu-compressed': isMenuCompressed, 'is-repository-level' : isRepositoryLevel}">
<h1 v-if="isRepositoryLevel">Nome do Site</h1> <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> </div>
</template> </template>
@ -70,7 +70,6 @@ export default {
h1 { h1 {
font-size: 18px; font-size: 18px;
font-weight: 500;
color: white; color: white;
line-height: 18px; line-height: 18px;
max-width: 100%; max-width: 100%;

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

@ -4,7 +4,7 @@
<h1>{{ pageTitle }} <span class="is-italic has-text-weight-semibold">{{ isRepositoryLevel ? '' : entityName }}</span></h1> <h1>{{ pageTitle }} <span class="is-italic has-text-weight-semibold">{{ isRepositoryLevel ? '' : entityName }}</span></h1>
<a <a
@click="$router.go(-1)" @click="$router.go(-1)"
class="back-link is-secondary"> class="back-link has-text-secondary">
{{ $i18n.get('back') }} {{ $i18n.get('back') }}
</a> </a>
<hr> <hr>

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

@ -1,6 +1,6 @@
<template> <template>
<span class="help-wrapper"> <span class="help-wrapper">
<a class="help-button"> <a class="help-button has-text-secondary">
<b-icon <b-icon
size="is-small" size="is-small"
icon="help-circle-outline"/></a> icon="help-circle-outline"/></a>

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

@ -192,7 +192,7 @@ export default {
} }
.processes-popup{ .processes-popup{
background-color: #c1dae0; background-color: $turquoise2;
width: 320px; width: 320px;
max-width: 100%; max-width: 100%;
position: absolute; position: absolute;

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

@ -1,5 +1,5 @@
<template> <template>
<div class="primary-page page-container"> <div class="repository-level-page page-container">
<tainacan-title /> <tainacan-title />
<h3>{{ $i18n.get('label_available_importers') }}</h3> <h3>{{ $i18n.get('label_available_importers') }}</h3>

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

@ -1,5 +1,5 @@
<template> <template>
<div class="primary-page page-container"> <div class="repository-level-page page-container">
<b-loading :active.sync="isLoadingMetadatumMappers"/> <b-loading :active.sync="isLoadingMetadatumMappers"/>
<tainacan-title /> <tainacan-title />
<div <div

2
src/admin/pages/lists/events-page.vue
View File

@ -2,7 +2,7 @@
<div> <div>
<div <div
:class="{ :class="{
'primary-page': isRepositoryLevel, 'repository-level-page': isRepositoryLevel,
'page-container': isRepositoryLevel 'page-container': isRepositoryLevel
}"> }">
<tainacan-title /> <tainacan-title />

2
src/admin/pages/lists/filters-page.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="primary-page page-container"> <div class="repository-level-page page-container">
<tainacan-title /> <tainacan-title />
<filters-list/> <filters-list/>
</div> </div>

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

@ -1,6 +1,6 @@
<template> <template>
<div <div
:class="{'primary-page': isRepositoryLevel}"> :class="{'repository-level-page': isRepositoryLevel}">
<!-- SEARCH AND FILTERS --------------------- --> <!-- SEARCH AND FILTERS --------------------- -->
<!-- Filter menu compress button --> <!-- Filter menu compress button -->
@ -40,7 +40,7 @@
</div> </div>
<a <a
@click="openAdvancedSearch = !openAdvancedSearch" @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> <h3 class="has-text-weight-semibold">{{ $i18n.get('filters') }}</h3>
<a <a
@ -368,7 +368,7 @@
</div> </div>
<a <a
@click="openAdvancedSearch = !openAdvancedSearch" @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> </div>
</div> </div>

2
src/admin/pages/lists/metadata-page.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="primary-page page-container"> <div class="repository-level-page page-container">
<tainacan-title /> <tainacan-title />
<metadata-list/> <metadata-list/>
</div> </div>

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

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div class="primary-page page-container"> <div class="repository-level-page page-container">
<tainacan-title /> <tainacan-title />
<div <div
class="sub-header" class="sub-header"

2
src/admin/pages/singles/event-page.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<div class="is-fullheight"> <div class="is-fullheight">
<div class="page-container primary-page"> <div class="page-container repository-level-page">
<tainacan-title/> <tainacan-title/>
<h1 class="event-titles">{{ event.description }}</h1> <h1 class="event-titles">{{ event.description }}</h1>
<div <div

2
src/admin/pages/singles/taxonomy-page.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="columns is-fullheight"> <div class="columns is-fullheight">
<div class="page-container primary-page"> <div class="page-container repository-level-page">
<div class="card"> <div class="card">
<div class="card-content"> <div class="card-content">
<p class="title"> <p class="title">

2
src/admin/scss/_selects.scss
View File

@ -11,7 +11,7 @@
margin-bottom: 0px !important; margin-bottom: 0px !important;
color: $tainacan-input-color; color: $tainacan-input-color;
option:checked, option:hover { option:checked, option:hover {
background-color: $turquoise1 !important; background-color: $gray1 !important;
} }
&:focus, &:active { &:focus, &:active {
box-shadow: none !important; box-shadow: none !important;

31
src/admin/scss/tainacan-admin.scss
View File

@ -64,14 +64,41 @@ a:hover {
} }
} }
// Page settings // Repository-level pages
.primary-page { .repository-level-page {
margin-top: 94px; margin-top: 94px;
height: $page-height !important; height: $page-height !important;
@media screen and (max-width: 769px) { @media screen and (max-width: 769px) {
margin-top: 0; 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 // Generic page container
.page-container { .page-container {