diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-19 10:44:25 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-19 10:44:25 +0300 |
| commit | 0517e1d8538c57a4c298695a053368c497b86a87 (patch) | |
| tree | cbc720f557427753136327805e9c3ab979020e0d | |
| parent | ffde69d71e3c77dd39f955bbf5c562271ba7963a (diff) | |
| parent | 71102f028065e633a536c6d1c980199ad0d98812 (diff) | |
Merge branch '44834-ide-remove-branch-from-bottom-bar' into 'master'
Resolve "Get rid of branch element all in bottom bar in WEB IDE"
Closes #44834
See merge request gitlab-org/gitlab-ce!18367
| -rw-r--r-- | app/assets/javascripts/ide/components/ide_status_bar.vue | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/44834-ide-remove-branch-from-bottom-bar.yml | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/assets/javascripts/ide/components/ide_status_bar.vue b/app/assets/javascripts/ide/components/ide_status_bar.vue index 152a5f632ad..c13eeeace3f 100644 --- a/app/assets/javascripts/ide/components/ide_status_bar.vue +++ b/app/assets/javascripts/ide/components/ide_status_bar.vue @@ -22,13 +22,6 @@ export default { <template> <div class="ide-status-bar"> - <div class="ref-name"> - <icon - name="branch" - :size="12" - /> - {{ file.branchId }} - </div> <div> <div v-if="file.lastCommit && file.lastCommit.id"> Last commit: diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index f58f2579050..3a05a1cf2a9 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -378,7 +378,11 @@ padding: $gl-bar-padding $gl-padding; background: $white-light; display: flex; - justify-content: space-between; + justify-content: flex-end; + + > div + div { + padding-left: $gl-padding; + } svg { vertical-align: middle; diff --git a/changelogs/unreleased/44834-ide-remove-branch-from-bottom-bar.yml b/changelogs/unreleased/44834-ide-remove-branch-from-bottom-bar.yml new file mode 100644 index 00000000000..d3f838ad362 --- /dev/null +++ b/changelogs/unreleased/44834-ide-remove-branch-from-bottom-bar.yml @@ -0,0 +1,5 @@ +--- +title: Remove branch name from the status bar of WebIDE +merge_request: +author: +type: changed |