From baed66b2e5e1e328019aad94c11bdd8bd29f03c8 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Fri, 27 Jul 2018 14:44:05 -0300 Subject: [PATCH] More adjustments on Ref. 87. Adds function to get repository name. --- src/admin/class-tainacan-admin.php | 1 + .../components/navigation/primary-menu.vue | 33 +++++++++++------ .../tainacan-collection-subheader.vue | 9 +++-- .../tainacan-repository-subheader.vue | 7 +++- .../components/other/activities-icon.vue | 5 ++- .../components/other/processes-popup.vue | 7 ++-- .../components/other/taxonomies-icon.vue | 29 +++++++++++++++ .../scss/_dropdown-and-autocomplete.scss | 2 +- src/admin/scss/_tables.scss | 1 + src/admin/scss/tainacan-admin.scss | 36 +++++++++++++++++++ 10 files changed, 110 insertions(+), 20 deletions(-) create mode 100644 src/admin/components/other/taxonomies-icon.vue diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php index 35eb25ba7..1b4dbc7e9 100644 --- a/src/admin/class-tainacan-admin.php +++ b/src/admin/class-tainacan-admin.php @@ -180,6 +180,7 @@ class Admin { 'admin_url' => admin_url(), 'custom_header_support' => get_theme_support('custom-header'), 'registered_view_modes' => \Tainacan\Theme_Helper::get_instance()->get_registered_view_modes(), + 'repository_name' => get_bloginfo('name') ]; $maps = [ diff --git a/src/admin/components/navigation/primary-menu.vue b/src/admin/components/navigation/primary-menu.vue index 9bbcaa87b..5334ef307 100644 --- a/src/admin/components/navigation/primary-menu.vue +++ b/src/admin/components/navigation/primary-menu.vue @@ -37,9 +37,9 @@ tag="a" to="/metadata" :class="activeRoute == 'MetadataPage' ? 'is-active':''"> - + + + {{ $i18n.getFrom('metadata', 'name') }} @@ -48,9 +48,9 @@ tag="a" to="/filters" :class="activeRoute == 'FiltersPage' ? 'is-active':''"> - + + + {{ $i18n.getFrom('filters', 'name') }} @@ -59,9 +59,7 @@ tag="a" to="/taxonomies" :class="activeRoute == 'Page' ? 'is-active':''"> - + {{ $i18n.getFrom('taxonomies', 'name') }} @@ -81,6 +79,8 @@ @@ -144,6 +145,18 @@ export default { .activities-icon { fill: white; + margin-bottom: -4px; + } + .taxonomies-icon { + fill: white; + margin-bottom: -2px; + } + .icon { + height: auto; + width: auto; + i { + font-size: 18px !important; + } } } diff --git a/src/admin/components/navigation/tainacan-collection-subheader.vue b/src/admin/components/navigation/tainacan-collection-subheader.vue index bef9e007a..140cd5f54 100644 --- a/src/admin/components/navigation/tainacan-collection-subheader.vue +++ b/src/admin/components/navigation/tainacan-collection-subheader.vue @@ -293,6 +293,7 @@ export default { li{ margin-right: 0px; + transition: background-color 0.2s ease; // transition: max-width 0.4s ease-in , width 0.4s ease-in ; // -webkit-transition: max-width 0.4s ease-in, width 0.4s ease-in ; // overflow: hidden; @@ -302,10 +303,12 @@ export default { background-color: $turquoise4; a { background-color: $turquoise4; + transition: background-color 0.2s ease; color: white; text-decoration: none; } svg.activities-icon { + transition: fill 0.2s ease; fill: white !important; } } @@ -335,11 +338,13 @@ export default { color: $gray4; text-align: center; white-space: nowrap; - padding: 1.0em 10px; + padding: 10px; min-width: 50px; line-height: 22px; border-radius: 0px; position: relative; + align-items: center; + display: flex; } a:focus{ box-shadow: none; @@ -347,12 +352,12 @@ export default { .icon { margin: 0; padding: 0; - i { font-size: 19px !important; } } .menu-text { + margin-left: 8px; font-size: 14px; display: inline-flex; // width: 0px; diff --git a/src/admin/components/navigation/tainacan-repository-subheader.vue b/src/admin/components/navigation/tainacan-repository-subheader.vue index 66de71bb5..8c0461c1c 100644 --- a/src/admin/components/navigation/tainacan-repository-subheader.vue +++ b/src/admin/components/navigation/tainacan-repository-subheader.vue @@ -3,7 +3,7 @@ id="tainacan-repository-subheader" class="level secondary-page" :class="{'is-menu-compressed': isMenuCompressed, 'is-repository-level' : isRepositoryLevel}"> -

Nome do Site

+

{{ repositoryName }}

{{ $i18n.get('collection') + '' }} {{ collectionName }}

@@ -13,6 +13,11 @@ import { mapActions, mapGetters } from 'vuex'; export default { name: 'TainacanRepositorySubheader', + data() { + return { + repositoryName: tainacan_plugin.repository_name + } + }, props: { isMenuCompressed: false, isRepositoryLevel: true diff --git a/src/admin/components/other/activities-icon.vue b/src/admin/components/other/activities-icon.vue index fe80f448e..c49352a4e 100644 --- a/src/admin/components/other/activities-icon.vue +++ b/src/admin/components/other/activities-icon.vue @@ -4,8 +4,8 @@ xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" -width="22" -height="22" +width="20" +height="20" viewBox="0 0 24 24" class="activities-icon" xml:space="preserve"> @@ -25,7 +25,6 @@ export default { diff --git a/src/admin/scss/_dropdown-and-autocomplete.scss b/src/admin/scss/_dropdown-and-autocomplete.scss index 27ba0ff00..73f2eb9d7 100644 --- a/src/admin/scss/_dropdown-and-autocomplete.scss +++ b/src/admin/scss/_dropdown-and-autocomplete.scss @@ -28,7 +28,7 @@ label { margin-bottom: 0; } &.control { font-size: 13px !important; } .b-checkbox { width: 100% }; - &:hover { background-color: $turquoise1; } + &:hover { background-color: $gray1; } .is-small { color: $gray4; } &.is-active { background-color: $turquoise2; } } diff --git a/src/admin/scss/_tables.scss b/src/admin/scss/_tables.scss index b7615a398..ad961a5ac 100644 --- a/src/admin/scss/_tables.scss +++ b/src/admin/scss/_tables.scss @@ -211,3 +211,4 @@ } } } + diff --git a/src/admin/scss/tainacan-admin.scss b/src/admin/scss/tainacan-admin.scss index 11cd3735e..fb3fc7cf9 100644 --- a/src/admin/scss/tainacan-admin.scss +++ b/src/admin/scss/tainacan-admin.scss @@ -75,9 +75,11 @@ a:hover { .is-primary, .is-primary:hover, .is-primary:focus { background-color: $blue4 !important; + color: white !important; } .is-secondary, .is-secondary:hover, .is-secondary:focus { background-color: $blue5 !important; + color: white !important; } .has-text-primary, .has-text-primary:hover, .is-has-text-primary:focus { color: $blue4 !important; @@ -99,6 +101,40 @@ a:hover { background-color: $gray1 !important; } } + .tainacan-table { + tr.selected-row { + background-color: $blue1 !important; + .checkbox-cell .checkbox, .actions-cell .actions-container { + background-color: $blue2 !important; + } + } + } + .dropdown-trigger { + .button .icon { + color: $blue5; + } + } + .dropdown-menu .dropdown-content { + .dropdown-item.is-active { background-color: $blue2; } + } + + .switch { + &:hover input[type="checkbox"]:checked + .check { + background-color: $blue2; + } + input[type="checkbox"]:checked + .check { + border: 2px solid $blue5; + + &::before { + background-color: $blue5; + } + } + &.is-small { + input[type="checkbox"]:checked + .check { + border: 1.5px solid $blue5; + } + } + } } // Generic page container .page-container {