diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-28 21:09:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-28 21:09:14 +0300 |
commit | a6f15de9f648591f704625ed0debb7178ff71459 (patch) | |
tree | efd63b584d085ee2f216375ee43755ef3f439b93 | |
parent | 2456dfad81258eb4dd66bd4b0fa34b458fe31955 (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 4 | ||||
-rw-r--r-- | changelogs/unreleased/yo-fix-folder-line-alignment.yml | 5 | ||||
-rw-r--r-- | doc/ci/yaml/README.md | 2 |
4 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 9d46fcec09b..22d401c451d 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -180,15 +180,8 @@ export default { <div v-if="isGroupPendingRemoval"> <gl-badge variant="warning">{{ __('pending removal') }}</gl-badge> </div> - <div - class="metadata align-items-md-center d-flex flex-grow-1 flex-shrink-0 flex-wrap justify-content-md-between" - > - <item-actions - v-if="isGroup" - :group="group" - :parent-group="parentGroup" - :action="action" - /> + <div class="metadata d-flex flex-grow-1 flex-shrink-0 flex-wrap justify-content-md-between"> + <item-actions v-if="isGroup" :group="group" :parent-group="parentGroup" /> <item-stats :item="group" class="group-stats gl-mt-2 d-none d-md-flex" /> </div> </div> diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index ee1385d36df..d8d6b4ce416 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -378,10 +378,6 @@ table.pipeline-project-metrics tr td { .folder-caret { width: $gl-font-size-large; - - svg { - margin-bottom: 2px; - } } .item-type-icon { diff --git a/changelogs/unreleased/yo-fix-folder-line-alignment.yml b/changelogs/unreleased/yo-fix-folder-line-alignment.yml new file mode 100644 index 00000000000..b80afb8c35c --- /dev/null +++ b/changelogs/unreleased/yo-fix-folder-line-alignment.yml @@ -0,0 +1,5 @@ +--- +title: Fix alignment of folder-caret and actions button in the subgroup list +merge_request: 52400 +author: Yogi (@yo) +type: other diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 1a2beeb40fb..d4dc8e7f498 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -4896,7 +4896,7 @@ reused in the `test` job: - !reference [.teardown, after_script] ``` -In the following example, `test-vars-1` reuses the all the variables in `.vars`, while `test-vars-2` +In the following example, `test-vars-1` reuses all the variables in `.vars`, while `test-vars-2` selects a specific variable and reuses it as a new `MY_VAR` variable. ```yaml |