diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-12-01 12:57:34 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-12-19 12:45:27 -0600 |
| commit | 1e8de50375f39b22750015340a4e01521c82df05 (patch) | |
| tree | 3759f83eccae10db760b3fad60a9357d37764392 /app/assets | |
| parent | a623ddb0dcdc42b0bd4f9d20c79e82387d9b5547 (diff) | |
| download | gitlab-ce-1e8de50375f39b22750015340a4e01521c82df05.tar.gz | |
Replaced some fork icons instances and fixed the Icon component on the MR Widget
Diffstat (limited to 'app/assets')
3 files changed, 19 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js index 1f8bd2646ea..38c3ec874c6 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js @@ -1,6 +1,6 @@ import tooltip from '../../vue_shared/directives/tooltip'; import { pluralize } from '../../lib/utils/text_utility'; -import { spriteIcon } from '../../lib/utils/common_utils'; +import Icon from '../../vue_shared/components/icon.vue'; export default { name: 'MRWidgetHeader', @@ -10,6 +10,9 @@ export default { directives: { tooltip, }, + components: { + Icon, + }, computed: { shouldShowCommitsBehindText() { return this.mr.divergedCommitsCount > 0; @@ -26,9 +29,6 @@ export default { gfm: `\`${this.mr.sourceBranch}\``, }); }, - downloadIcon() { - return spriteIcon('download'); - }, }, methods: { isBranchTitleLong(branchTitle) { @@ -85,9 +85,9 @@ export default { data-toggle="dropdown" aria-label="Download as" role="button"> - <i - v-html="downloadIcon"> - </i> + <icon + name="download"> + </icon> <i class="fa fa-caret-down" aria-hidden="true"> diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index e75a35d78ad..373e01931ad 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -723,3 +723,9 @@ font-size: 16px; } } + +.fork-sprite { + width: 12px; + height: 12px; + margin-right: -5px; +} diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 9805fc4f882..05c1033c5f7 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -143,6 +143,12 @@ fill: $gl-text-color-secondary; } + .sprite { + width: 12px; + height: 12px; + fill: $gl-text-color; + } + .fa { font-size: 12px; color: $gl-text-color; |