diff options
author | Phil Hughes <me@iamphill.com> | 2017-12-01 12:57:39 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-12-01 12:57:39 +0000 |
commit | 4820a195833810c14260915a1c443a1bbdbe8839 (patch) | |
tree | f658fa40cd8b1aa58c2a1f23beacee0328c80efa | |
parent | cadf378f293cf1227a0d2c58520142224259f5a6 (diff) | |
parent | d057b18e8cd05c95f1f05b25bb0ed15fe4a006cf (diff) | |
download | gitlab-ce-4820a195833810c14260915a1c443a1bbdbe8839.tar.gz |
Merge branch '40286-hide-full-namespace-groups-tree' into 'master'
Show only group name by default and put full namespace in tooltip in Groups tree
Closes #40286
See merge request gitlab-org/gitlab-ce!15650
-rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 6 | ||||
-rw-r--r-- | changelogs/unreleased/40286-hide-full-namespace-groups-tree.yml | 6 |
3 files changed, 24 insertions, 2 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 356a95c05ca..0cd0c59a275 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -1,4 +1,5 @@ <script> +import tooltip from '../../vue_shared/directives/tooltip'; import identicon from '../../vue_shared/components/identicon.vue'; import eventHub from '../event_hub'; @@ -8,6 +9,9 @@ import itemStats from './item_stats.vue'; import itemActions from './item_actions.vue'; export default { + directives: { + tooltip, + }, components: { identicon, itemCaret, @@ -112,10 +116,16 @@ export default { </a> </div> <div - class="title"> + class="title namespace-title"> <a + v-tooltip :href="group.relativePath" - class="no-expand">{{group.fullName}}</a> + :title="group.fullName" + class="no-expand" + data-placement="top" + > + {{group.name}} + </a> <span v-if="group.permission" class="access-type" diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index ad3bb0e35d1..cd505bcaf6d 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -449,6 +449,12 @@ ul.indent-list { } } +.namespace-title { + .tooltip-inner { + max-width: 350px; + } +} + ul.group-list-tree { li.group-row { &.has-description { diff --git a/changelogs/unreleased/40286-hide-full-namespace-groups-tree.yml b/changelogs/unreleased/40286-hide-full-namespace-groups-tree.yml new file mode 100644 index 00000000000..cae02d0c2f6 --- /dev/null +++ b/changelogs/unreleased/40286-hide-full-namespace-groups-tree.yml @@ -0,0 +1,6 @@ +--- +title: Show only group name by default and put full namespace in tooltip in Groups + tree +merge_request: 15650 +author: +type: changed |