diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-05 19:01:21 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-05 19:01:21 +0000 |
| commit | c07b6b7793dd5414f4763240c462fe7cfe0b27da (patch) | |
| tree | 15249903bfd0e7436741baaae7a04360e66fa3fc | |
| parent | 4900390711305ec05e514e7077ab99713d68ff6b (diff) | |
| parent | fa7cc50f04af34bd58039d190f5844b7f5c3fe8b (diff) | |
| download | gitlab-ce-c07b6b7793dd5414f4763240c462fe7cfe0b27da.tar.gz | |
Merge branch 'style/include-branch-in-mobile-view' into 'master'
Include branch in mobile view for pipelines
Closes #42650
See merge request gitlab-org/gitlab-ce!16910
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/commit.vue | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/style-include-branch-in-mobile-view.yml | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index 6d1fe7ee8ca..97789636787 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -118,7 +118,7 @@ <template> <div class="branch-commit"> <template v-if="hasCommitRef && showBranch"> - <div class="icon-container hidden-xs"> + <div class="icon-container"> <i v-if="tag" class="fa fa-tag" @@ -132,7 +132,7 @@ </div> <a - class="ref-name hidden-xs" + class="ref-name" :href="commitRef.ref_url" v-tooltip data-container="body" diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index db88d4a16b7..f10908c3630 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -121,7 +121,7 @@ .ref-name { font-weight: $gl-font-weight-bold; - max-width: 120px; + max-width: 100px; overflow: hidden; display: inline-block; white-space: nowrap; diff --git a/changelogs/unreleased/style-include-branch-in-mobile-view.yml b/changelogs/unreleased/style-include-branch-in-mobile-view.yml new file mode 100644 index 00000000000..5c8ef86992d --- /dev/null +++ b/changelogs/unreleased/style-include-branch-in-mobile-view.yml @@ -0,0 +1,5 @@ +--- +title: Include branch in mobile view for pipelines +merge_request: 16910 +author: George Tsiolis +type: other |