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

Several updates on Icon font replacement.

This commit is contained in:
Mateus Machado Luna 2018-11-12 14:29:45 -02:00
parent 433e3633cb
commit b4c1397f31
26 changed files with 73 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/admin.vue
View File

@ -123,7 +123,7 @@
top: 192px;
left: 0px;
max-width: 25px;
height: 20px;
height: 25px;
width: 25px;
border: none;
background-color: $blue5;

2
src/admin/components/advanced-search/advanced-search.vue
View File

@ -146,7 +146,7 @@
@click="addSearchCriteria"
style="font-size: 0.75rem;">
<span class="icon is-small">
<i class="tainacan-icon tainacan-icon-add"/>
<i class="has-text-secondary tainacan-icon tainacan-icon-add"/>
</span>
{{ searchCriteria.length &lt;= 0 ?
$i18n.get('add_one_search_criterion') :

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

@ -959,7 +959,7 @@ export default {
display: inherit;
padding: 0;
margin: 0;
margin-top: 1px;
margin-top: -2px;
font-size: 18px;
}
}

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

@ -1337,7 +1337,7 @@ export default {
display: inherit;
padding: 0;
margin: 0;
margin-top: 1px;
margin-top: -2px;
font-size: 18px;
}
}

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

@ -28,7 +28,7 @@
:aria-label="$i18n.get('label_button_edit_header_image')"
@click="headerImageMediaFrame.openFrame($event)">
<span class="icon is-small">
<i class="tainacan-icon tainacan-edit"/>
<i class="tainacan-icon tainacan-icon-edit"/>
</span>
</a>
<a
@ -37,7 +37,7 @@
:aria-label="$i18n.get('label_button_delete_thumb')"
@click="deleteHeaderImage()">
<span class="icon is-small">
<i class="tainacan-icon tainacan-delete"/>
<i class="tainacan-icon tainacan-icon-delete"/>
</span>
</a>
</div>
@ -453,7 +453,7 @@
display: inherit;
padding: 0;
margin: 0;
margin-top: 1px;
margin-top: -2px;
font-size: 18px;
}
}

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

@ -9,7 +9,7 @@
class="first-card">
<div class="list-metadata">
<span class="icon is-large">
<i class="tainacan-icon taincan-icon-36px taincan-icon-addcollection"/>
<i class="tainacan-icon tainacan-icon-36px tainacan-icon-addcollection"/>
</span>
<div>{{ $i18n.get('label_create_collection') }}</div>
</div>
@ -61,7 +61,7 @@
class="tainacan-card new-card">
<div class="list-metadata">
<span class="icon is-large">
<i class="tainacan-icon taincan-icon-36px taincan-icon-addcollection"/>
<i class="tainacan-icon tainacan-icon-36px tainacan-icon-addcollection"/>
</span>
<div>{{ $i18n.get('label_create_collection') }}</div>
</div>

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

@ -80,7 +80,7 @@
<!--:aria-label="$i18n.get('approve_item')"-->
<!--@click.prevent.stop="approveEvent(event.id)">-->
<!-- <span class="icon">
<i class="tainacan-icon taincan-icon-20px tainacan-icon-finish"/>
<i class="tainacan-icon tainacan-icon-20px tainacan-icon-finish"/>
</span> -->
<!--</a>-->

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

@ -43,7 +43,9 @@
v-for="(filter, index) in activeFilterList"
:key="index">
<div class="handle">
<grip-icon/>
<span class="icon grip-icon">
<i class="tainacan-icon tainacan-icon-18px tainacan-icon-drag"/>
</span>
<span class="icon icon-level-identifier">
<i
:class="{ 'tainacan-icon-collection has-text-turquoise5': filter.collection_id == collectionId, 'tainacan-icon-repository has-text-blue5': filter.collection_id != collectionId }"
@ -159,7 +161,9 @@
v-for="(metadatum, index) in availableMetadatumList"
:key="index"
@click.prevent="addMetadatumViaButton(metadatum, index)">
<grip-icon/>
<span class="icon grip-icon">
<i class="tainacan-icon tainacan-icon-18px tainacan-icon-drag"/>
</span>
<span class="icon icon-level-identifier">
<i
:class="{ 'tainacan-icon-collection has-text-turquoise5': metadatum.collection_id == collectionId, 'tainacan-icon-repository has-text-blue5': metadatum.collection_id != collectionId }"
@ -195,7 +199,6 @@
<script>
import { mapActions, mapGetters } from 'vuex';
import GripIcon from '../other/grip-icon.vue';
import FilterEditionForm from './../edition/filter-edition-form.vue';
import CustomDialog from '../other/custom-dialog.vue';
@ -234,8 +237,7 @@ export default {
}
},
components: {
FilterEditionForm,
GripIcon
FilterEditionForm
},
beforeRouteLeave ( to, from, next ) {
let hasUnsavedForms = false;
@ -561,8 +563,7 @@ export default {
padding-right: 6em;
}
.grip-icon {
fill: $gray3;
top: 1px;
color: $gray3;
position: relative;
}
.filter-name {
@ -633,7 +634,7 @@ export default {
}
.grip-icon {
fill: $white;
color: $white;
}
.label-details, .icon, .icon-level-identifier>i {
@ -665,7 +666,7 @@ export default {
position: relative;
.grip-icon {
fill: $gray3;
color: $gray3;
top: 2px;
position: relative;
}
@ -709,8 +710,8 @@ export default {
transition: left 0.2s ease;
.grip-icon {
fill: $gray3;
top: -3px;
color: $gray3;
top: -4px;
position: relative;
display: inline-block;
}
@ -775,7 +776,7 @@ export default {
color: white !important;
}
.grip-icon {
fill: white !important;
color: white !important;
}
}
}

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

@ -47,7 +47,9 @@
v-for="(metadatum, index) in activeMetadatumList"
:key="index">
<div class="handle">
<grip-icon/>
<span class="icon grip-icon">
<i class="tainacan-icon tainacan-icon-18px tainacan-icon-drag"/>
</span>
<span class="icon icon-level-identifier">
<i
:class="{
@ -153,7 +155,9 @@
:class="{ 'hightlighted-metadatum' : hightlightedMetadatum == metadatum.name, 'inherited-metadatum': isRepositoryLevel }"
v-for="(metadatum, index) in availableMetadatumList"
:key="index">
<grip-icon/>
<span class="icon grip-icon">
<i class="tainacan-icon tainacan-icon-18px tainacan-icon-drag"/>
</span>
<span class="metadatum-name">{{ metadatum.name }}</span>
<span
class="loading-spinner"
@ -350,7 +354,6 @@
<script>
import { mapActions, mapGetters } from 'vuex';
import GripIcon from '../other/grip-icon.vue';
import MetadatumEditionForm from './../edition/metadatum-edition-form.vue';
import CustomDialog from '../other/custom-dialog.vue';
@ -382,8 +385,7 @@ export default {
}
},
components: {
MetadatumEditionForm,
GripIcon
MetadatumEditionForm
},
computed: {
availableMetadatumList: {
@ -863,8 +865,7 @@ export default {
padding-right: 6em;
}
.grip-icon {
fill: $gray3;
top: 1px;
color: $gray3;
position: relative;
}
.metadatum-name {
@ -939,7 +940,7 @@ export default {
}
.grip-icon {
fill: white;
color: white;
}
.switch.is-small {
@ -967,7 +968,7 @@ export default {
position: relative;
.grip-icon {
fill: white;
color: white;
}
}
}
@ -1009,8 +1010,8 @@ export default {
transition: left 0.2s ease;
.grip-icon {
fill: $gray3;
top: -3px;
color: $gray3;
top: -4px;
position: relative;
display: inline-block;
}
@ -1082,10 +1083,10 @@ export default {
}
}
@keyframes hightlighten-icon {
0% { fill: #b1b1b1; }
25% { fill: white; }
75% { fill: white; }
100% { fill: #b1b1b1; }
0% { color: #b1b1b1; }
25% { color: white; }
75% { color: white; }
100% { color: #b1b1b1; }
}
@keyframes hightlighten-arrow {
0% {
@ -1144,7 +1145,7 @@ export default {
}
.grip-icon {
fill: white;
color: white;
}
}

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

@ -270,7 +270,8 @@ export default {
color: $turquoise4;
background-color: transparent !important;
border: none;
.icon i {
.icon {
margin-top: -2px;
font-size: 24px;
}
}

8
src/admin/components/other/checkbox-radio-modal.vue
View File

@ -110,9 +110,9 @@
v-if="finderColumn.length < totalRemaining[key].remaining"
@click="getMoreOptions(finderColumn, key)"
class="tainacan-show-more">
<b-icon
size="is-small"
icon="chevron-down"/>
<span class="icon">
<i class="tainacan-icon tainacan-icon-20px tainacan-icon-showmore"/>
</span>
</div>
</li>
</ul>
@ -668,7 +668,7 @@
cursor: pointer;
border: 1px solid $gray1;
margin-top: 10px;
margin-bottom: 0.2rem;
margin-bottom: -0.2rem;
&:hover {
background-color: $blue1;

52
src/admin/components/other/grip-icon.vue
View File

@ -1,52 +0,0 @@
<template>
<svg
xmlns="http://www.w3.org/2000/svg"
width="13"
height="13"
viewBox="0 0 12.8 12.8"
class="grip-icon"><circle
cx="1.5"
cy="1.5"
r="1.5"
class="undefined"/><circle
cx="6.4"
cy="1.5"
r="1.5"
class="undefined"/><circle
cx="11.3"
cy="1.5"
r="1.5"
class="undefined"/><circle
cx="1.5"
cy="6.4"
r="1.5"
class="undefined"/><circle
cx="6.4"
cy="6.4"
r="1.5"
class="undefined"/><circle
cx="11.3"
cy="6.4"
r="1.5"
class="undefined"/><circle
cx="1.5"
cy="11.3"
r="1.5"
class="undefined"/><circle
cx="6.4"
cy="11.3"
r="1.5"
class="undefined"/><circle
cx="11.3"
cy="11.3"
r="1.5"
class="undefined"/></svg>
</template>
<script>
export default {
name: 'GripIcon'
}
</script>

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

@ -338,7 +338,7 @@
<span
class="gray-icon"
v-html="registeredViewModes[viewModeOption].icon"/>
{{ registeredViewModes[viewModeOption].label }}
<span>{{ registeredViewModes[viewModeOption].label }}</span>
</b-dropdown-item>
</b-dropdown>
</b-field>
@ -377,7 +377,7 @@
<span class="icon gray-icon">
<i class="tainacan-icon tainacan-icon-viewtable"/>
</span>
{{ $i18n.get('label_table') }}
<span>{{ $i18n.get('label_table') }}</span>
</b-dropdown-item>
<b-dropdown-item
:class="{ 'is-active': adminViewMode == 'cards' }"
@ -385,7 +385,7 @@
<span class="icon gray-icon">
<i class="tainacan-icon tainacan-icon-viewcards"/>
</span>
{{ $i18n.get('label_cards') }}
<span>{{ $i18n.get('label_cards') }}</span>
</b-dropdown-item>
<b-dropdown-item
:class="{ 'is-active': adminViewMode == 'grid' }"
@ -393,7 +393,7 @@
<span class="icon gray-icon">
<i class="tainacan-icon tainacan-icon-viewminiature"/>
</span>
{{ $i18n.get('label_thumbnails') }}
<span>{{ $i18n.get('label_thumbnails') }}</span>
</b-dropdown-item>
<b-dropdown-item
:class="{ 'is-active': adminViewMode == 'records' }"
@ -401,7 +401,7 @@
<span class="icon gray-icon">
<i class="tainacan-icon tainacan-icon-viewrecords"/>
</span>
{{ $i18n.get('label_records') }}
<span>{{ $i18n.get('label_records') }}</span>
</b-dropdown-item>
<b-dropdown-item
:class="{ 'is-active': adminViewMode == 'masonry' }"
@ -409,7 +409,7 @@
<span class="icon gray-icon">
<i class="tainacan-icon tainacan-icon-viewmasonry"/>
</span>
{{ $i18n.get('label_masonry') }}
<span>{{ $i18n.get('label_masonry') }}</span>
</b-dropdown-item>
</b-dropdown>
</b-field>
@ -1446,7 +1446,7 @@
top: 120px;
left: 0;
max-width: 23px;
height: 21px;
height: 24px;
width: 23px;
border: none;
background-color: $turquoise1;

5
src/admin/scss/_buttons.scss
View File

@ -52,11 +52,10 @@
}
}
.button.is-small {
height: 26px !important;
height: 1.625rem !important;
line-height: 0.75rem;
}
.button:not(.is-small):not(.is-medium):not(.is-large) {
height: 30px !important;
line-height: 1.25rem !important;
height: 1.875rem !important;
font-size: 0.875rem !important;
}

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

@ -151,7 +151,7 @@ $table-cell-padding: 1.0em 0.75em;
// Roboto font
$family-sans-serif: 'Roboto', sans-serif;
// Bulma's modal (needs to be greather than taincan-admin-app)
// Bulma's modal (needs to be greather than tainacan-admin-app)
$modal-z: 9999999;
// Animations for Slide Menu

4
src/admin/scss/_view-mode-records.scss
View File

@ -51,6 +51,10 @@
visibility: hidden;
opacity: 0;
transition: visibility 0.2s, opacity 0.2s;
a {
margin-left: 12px;
}
}
&:hover .actions-area {
visibility: visible;

17
src/assets/5a2386a7b351ee453ae028ae5c6e95a1.svg
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Camada_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="12.815px" height="12.815px" viewBox="0 0 12.815 12.815" enable-background="new 0 0 12.815 12.815" xml:space="preserve">
<g>
<circle cx="1.469" cy="1.469" r="1.469"/>
<circle cx="6.407" cy="1.469" r="1.469"/>
<circle cx="11.346" cy="1.469" r="1.469"/>
<circle cx="1.469" cy="6.407" r="1.469"/>
<circle cx="6.407" cy="6.407" r="1.469"/>
<circle cx="11.346" cy="6.407" r="1.469"/>
<circle cx="1.469" cy="11.346" r="1.469"/>
<circle cx="6.407" cy="11.346" r="1.469"/>
<circle cx="11.346" cy="11.346" r="1.469"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 915 B

BIN
src/assets/css/fonts/Tainacan Icons.eot
View File

Binary file not shown.

BIN
src/assets/css/fonts/Tainacan Icons.otf
View File

Binary file not shown.

12
src/assets/css/fonts/Tainacan Icons.svg
View File

@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
<metadata>
Created by FontForge 20161003 at Fri Nov 9 14:30:51 2018
Created by FontForge 20161003 at Mon Nov 12 12:19:24 2018
By www-data
</metadata>
<defs>
@ -65,8 +65,8 @@ q25 0 46.5 -9t38.5 -25l294 172q-2 7 -3 14t-1 15q0 26 10 48.5t27 39.5t39.5 27t48.
<glyph glyph-name="export" unicode="export"
d="M958 242l-166 166v-124h-292v-84h292v-124zM84 -9v501q0 18 6.5 33t18 26.5t26.5 18t32 6.5h460q35 0 59 -24.5t24 -59.5v-125h-83v125h-460v-501h460v126h83v-126q0 -35 -24 -59.5t-59 -24.5h-460q-35 0 -59 24.5t-24 59.5z" />
<glyph glyph-name="url" unicode="url"
d="M162 251q0 -27 10 -50.5t28 -41t41.5 -27.5t50.5 -10h166v-79h-166q-43 0 -81.5 16.5t-66.5 44.5t-44.5 66t-16.5 81t16.5 81t44.5 66.5t66 45t81 16.5h167v-80h-167q-27 0 -50.5 -10t-41 -27.5t-27.5 -41t-10 -50.5zM333 293h334v-84h-334v84zM709 460q43 0 81 -16.5
t66 -45t44.5 -66.5t16.5 -81t-16.5 -81t-44.5 -66.5t-66 -45t-81 -16.5h-167v80h167q27 0 50.5 10t41 27.5t27.5 41t10 50.5t-10 50.5t-27.5 41t-41 27.5t-50.5 10h-167v80h167z" />
d="M162 251q0 -27 10 -50.5t28 -41t41.5 -27.5t50.5 -10h166v-79h-166q-43 0 -81.5 16.5t-66.5 44.5t-44.5 66t-16.5 81t16.5 81t44.5 66.5t66.5 45t81.5 16.5h166v-80h-166q-27 0 -50.5 -10t-41.5 -27.5t-28 -41t-10 -50.5zM333 293h334v-84h-334v84zM709 460
q43 0 81 -16.5t66 -45t44.5 -66.5t16.5 -81t-16.5 -81t-44.5 -66.5t-66 -45t-81 -16.5h-167v80h167q27 0 50.5 10t41 27.5t27.5 41t10 50.5t-10 50.5t-27.5 41t-41 27.5t-50.5 10h-167v80h167z" />
<glyph glyph-name="see" unicode="see"
d="M625 251q0 -26 -10 -48.5t-27 -39.5t-39.5 -27t-48.5 -10t-48.5 10t-39.5 27t-27 39.5t-10 48.5t10 48.5t27 39.5t39.5 27t48.5 10t48.5 -10t39.5 -27t27 -39.5t10 -48.5zM500 460q-81 0 -139 -24.5t-97 -58t-61 -69t-31 -57.5q9 -22 31 -57.5t61 -69t97 -57.5t139 -24
t139 24t97 57.5t61 69t31 57.5q-9 22 -31 57.5t-61 69t-97 58t-139 24.5zM500 543q63 0 114 -12.5t92 -33t72.5 -47t55.5 -53.5q55 -64 83 -146q-28 -82 -83 -146q-24 -27 -55.5 -53.5t-72.5 -47t-92 -33t-114 -12.5t-114 12.5t-92 33t-72.5 47t-55.5 53.5q-55 64 -83 146
@ -123,7 +123,7 @@ d="M501 667q86 0 162 -33t132.5 -89.5t89.5 -132.5t33 -162t-33 -162t-89.5 -132.5t-
<glyph glyph-name="approved" unicode="approved"
d="M817 516l58 -59l-498 -498l-232 232l59 59l173 -174z" />
<glyph glyph-name="alertcircle" unicode="alertcircle"
d="M500 667q86 0 162 -33t132.5 -89.5t89.5 -132.5t33 -162t-33 -162t-89.5 -132.5t-132.5 -89.5t-162 -33t-162 33t-132.5 89.5t-89.5 132.5t-33 162t33 162t89.5 132.5t132.5 89.5t162 33zM542 125h-84v-83h84v83zM542 458h-84v-250h84v250z" />
d="M500 667q86 0 162 -33t132.5 -89.5t89.5 -132.5t33 -162t-33 -162t-89.5 -132.5t-132.5 -89.5t-162 -33t-162 33t-132.5 89.5t-89.5 132.5t-33 162t33 162t89.5 132.5t132.5 89.5t162 33zM542 125h-84v-83h84v83zM542 459h-84v-251h84v251z" />
<glyph glyph-name="alert" unicode="alert"
d="M542 0h-84v84h84v-84zM542 500v-334h-84v334h84z" />
<glyph glyph-name="repprovedcircle" unicode="repprovedcircle"
@ -219,7 +219,9 @@ t-106 71.5t-129.5 26t-129.5 -26t-106 -71.5t-71.5 -106t-26 -129.5t26 -129.5t71.5
<glyph glyph-name="embed" unicode="embed"
d="M392 58l-192 192l192 192l-59 58l-250 -250l250 -250zM608 58l192 192l-192 192l59 58l250 -250l-250 -250z" />
<glyph glyph-name="nextlevel" unicode="nextlevel"
d="M793 125l-250 -250l-59 59l149 149h-464v499h83v-416h381l-149 149l59 59z" />
d="M793 125l-250 -250l-59 59l149 149h-465v499h84v-416h381l-149 149l59 59z" />
<glyph glyph-name="showmore" unicode="showmore"
d="M243 371l256 -255l256 255l78 -78l-334 -334l-334 334z" />
<glyph glyph-name=".notdef" horiz-adv-x="500"
/>
<glyph glyph-name="uni0000" horiz-adv-x="0"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
src/assets/css/fonts/Tainacan Icons.ttf
View File

Binary file not shown.

BIN
src/assets/css/fonts/Tainacan Icons.woff
View File

Binary file not shown.

BIN
src/assets/css/fonts/Tainacan Icons.woff2
View File

Binary file not shown.

3
src/assets/css/fonts/tainacanicons.css
View File

@ -141,6 +141,9 @@
.tainacan-icon-more:before {
content: "more";
}
.tainacan-icon-showmore:before {
content: "showmore";
}
.tainacan-icon-next:before {
content: "next";
}

2
src/classes/filter-types/tainacan-filter-item.vue
View File

@ -19,7 +19,7 @@
slot-scope="props">
<span class="icon">
<i
:class="{ 'tainacan-icon-arrowleft' : props.open, 'tainacan-icon-arrowright' : !props.open }"
:class="{ 'tainacan-icon-arrowdown' : props.open, 'tainacan-icon-arrowright' : !props.open }"
class="tainacan-icon tainacan-icon-20px"/>
</span>
<span class="collapse-label">{{ filter.name }}</span>

4
src/importer/class-tainacan-csv.php
View File

@ -365,8 +365,8 @@ class CSV extends Importer {
There are two special columns you can use: <b>special_document</b>, which will set the Document of your item, and <b>special_attachments</b> to add one or many attachments.\n
The values for the special_document must be prepended with 'url:'', 'file:'' or 'text:'. This will indicate the Document Type.\n
The values for the special_attachments is just a list of files. If you want to add many attachments, use the separator you set in the Multivalued Delimiter option.\n
In either case, you can point to a file using a full URL, or just a file name. In this last case, you should set the option below to tell Tainacan where to find the files in your server. You can then upload them directly (via FTP for example) and Taincan will add them to your items.\n
", 'taincan')); ?>
In either case, you can point to a file using a full URL, or just a file name. In this last case, you should set the option below to tell Tainacan where to find the files in your server. You can then upload them directly (via FTP for example) and tainacan will add them to your items.\n
", 'tainacan')); ?>
</p>
<label class="label"><?php _e('Server path', 'tainacan'); ?></label>
<span class="help-wrapper">