diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-02 13:55:59 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-02 13:55:59 +0300 |
| commit | a8347c22d0e33ab626ee4c3b4b9acffa69f7cf46 (patch) | |
| tree | 5b7907c9e9ac1c3077a98635b852e6633e88779e /app/assets/javascripts | |
| parent | 26108ddb119a910c4d03cc128f81adb0c0e88cc1 (diff) | |
| parent | dbeb7b21d3db77482bb23cca08d44248b1e2c616 (diff) | |
Merge branch '59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scss' into 'master'
Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/commits.scss`"
Closes #59898
See merge request gitlab-org/gitlab-ce!27647
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/diffs/components/commit_item.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/serverless/components/url.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/commit.vue | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue index c02a8740a42..a767379d662 100644 --- a/app/assets/javascripts/diffs/components/commit_item.vue +++ b/app/assets/javascripts/diffs/components/commit_item.vue @@ -113,9 +113,10 @@ export default { <commit-pipeline-status v-if="commit.pipeline_status_path" :endpoint="commit.pipeline_status_path" + class="d-inline-flex" /> <div class="commit-sha-group"> - <div class="label label-monospace" v-text="commit.short_id"></div> + <div class="label label-monospace monospace" v-text="commit.short_id"></div> <clipboard-button :text="commit.id" :title="__('Copy commit SHA to clipboard')" diff --git a/app/assets/javascripts/serverless/components/url.vue b/app/assets/javascripts/serverless/components/url.vue index ca53bf6c52a..e47a03f1939 100644 --- a/app/assets/javascripts/serverless/components/url.vue +++ b/app/assets/javascripts/serverless/components/url.vue @@ -20,7 +20,7 @@ export default { <template> <div class="clipboard-group"> - <div class="url-text-field label label-monospace">{{ uri }}</div> + <div class="url-text-field label label-monospace monospace">{{ uri }}</div> <clipboard-button :text="uri" :title="s__('ServerlessURL|Copy URL to clipboard')" diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index 944b9c0c083..3ba946e6447 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -133,7 +133,7 @@ export default { }; </script> <template> - <div class="branch-commit"> + <div class="branch-commit cgray"> <template v-if="shouldShowRefInfo"> <div class="icon-container"> <icon v-if="tag" name="tag" /> @@ -174,7 +174,7 @@ export default { :tooltip-text="author.username" class="avatar-image-container" /> - <gl-link :href="commitUrl" class="commit-row-message"> {{ title }} </gl-link> + <gl-link :href="commitUrl" class="commit-row-message cgray"> {{ title }} </gl-link> </span> <span v-else> Can't find HEAD commit for this branch </span> </div> |