Commit 7798a4a6 authored by Nathan Friend's avatar Nathan Friend

Fix style issues in job details sidebar

This commit fixes a number of minor style issues in the job details
sidebar - spacing, font weights, button sizes, and font sizes.

More details here:
https://gitlab.com/gitlab-org/gitlab-ce/issues/54814
parent 4a10c813
...@@ -28,27 +28,29 @@ export default { ...@@ -28,27 +28,29 @@ export default {
</script> </script>
<template> <template>
<div class="block"> <div class="block">
<div class="title">{{ s__('Job|Job artifacts') }}</div> <div class="title font-weight-bold">{{ s__('Job|Job artifacts') }}</div>
<p v-if="isExpired" class="js-artifacts-removed build-detail-row">
{{ s__('Job|The artifacts were removed') }}
</p>
<p v-else-if="willExpire" class="js-artifacts-will-be-removed build-detail-row">
{{ s__('Job|The artifacts will be removed in') }}
</p>
<p
v-if="isExpired || willExpire"
:class="{
'js-artifacts-removed': isExpired,
'js-artifacts-will-be-removed': willExpire,
}"
class="build-detail-row"
>
<span v-if="isExpired">{{ s__('Job|The artifacts were removed') }}</span>
<span v-if="willExpire">{{ s__('Job|The artifacts will be removed') }}</span>
<timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" /> <timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" />
</p>
<div class="btn-group d-flex" role="group"> <div class="btn-group d-flex prepend-top-10" role="group">
<gl-link <gl-link
v-if="artifact.keep_path" v-if="artifact.keep_path"
:href="artifact.keep_path" :href="artifact.keep_path"
class="js-keep-artifacts btn btn-sm btn-default" class="js-keep-artifacts btn btn-sm btn-default"
data-method="post" data-method="post"
>{{ s__('Job|Keep') }}</gl-link
> >
{{ s__('Job|Keep') }}
</gl-link>
<gl-link <gl-link
v-if="artifact.download_path" v-if="artifact.download_path"
...@@ -56,17 +58,15 @@ export default { ...@@ -56,17 +58,15 @@ export default {
class="js-download-artifacts btn btn-sm btn-default" class="js-download-artifacts btn btn-sm btn-default"
download download
rel="nofollow" rel="nofollow"
>{{ s__('Job|Download') }}</gl-link
> >
{{ s__('Job|Download') }}
</gl-link>
<gl-link <gl-link
v-if="artifact.browse_path" v-if="artifact.browse_path"
:href="artifact.browse_path" :href="artifact.browse_path"
class="js-browse-artifacts btn btn-sm btn-default" class="js-browse-artifacts btn btn-sm btn-default"
>{{ s__('Job|Browse') }}</gl-link
> >
{{ s__('Job|Browse') }}
</gl-link>
</div> </div>
</div> </div>
</template> </template>
...@@ -31,12 +31,12 @@ export default { ...@@ -31,12 +31,12 @@ export default {
block: !isLastBlock, block: !isLastBlock,
}" }"
> >
<p> <p class="append-bottom-5">
{{ __('Commit') }} <span class="font-weight-bold">{{ __('Commit') }}</span>
<gl-link :href="commit.commit_path" class="js-commit-sha commit-sha link-commit">{{ <gl-link :href="commit.commit_path" class="js-commit-sha commit-sha link-commit">
commit.short_id {{ commit.short_id }}
}}</gl-link> </gl-link>
<clipboard-button <clipboard-button
:text="commit.short_id" :text="commit.short_id"
...@@ -44,11 +44,14 @@ export default { ...@@ -44,11 +44,14 @@ export default {
css-class="btn btn-clipboard btn-transparent" css-class="btn btn-clipboard btn-transparent"
/> />
<gl-link v-if="mergeRequest" :href="mergeRequest.path" class="js-link-commit link-commit" <span v-if="mergeRequest">
{{ __('in') }}
<gl-link :href="mergeRequest.path" class="js-link-commit link-commit"
>!{{ mergeRequest.iid }}</gl-link >!{{ mergeRequest.iid }}</gl-link
> >
</span>
</p> </p>
<p class="build-light-text append-bottom-0">{{ commit.title }}</p> <p class="append-bottom-0">{{ commit.title }}</p>
</div> </div>
</template> </template>
...@@ -110,22 +110,20 @@ export default { ...@@ -110,22 +110,20 @@ export default {
<aside class="right-sidebar build-sidebar" data-offset-top="101" data-spy="affix"> <aside class="right-sidebar build-sidebar" data-offset-top="101" data-spy="affix">
<div class="sidebar-container"> <div class="sidebar-container">
<div class="blocks-container"> <div class="blocks-container">
<div class="block"> <div class="block d-flex align-items-center">
<strong class="inline prepend-top-8"> {{ job.name }} </strong> <h4 class="flex-grow-1 prepend-top-8 m-0">{{ job.name }}</h4>
<gl-link <gl-link
v-if="job.retry_path" v-if="job.retry_path"
:class="retryButtonClass" :class="retryButtonClass"
:href="job.retry_path" :href="job.retry_path"
data-method="post" data-method="post"
rel="nofollow" rel="nofollow"
>{{ __('Retry') }}</gl-link
> >
{{ __('Retry') }}
</gl-link>
<gl-link <gl-link
v-if="job.terminal_path" v-if="job.terminal_path"
:href="job.terminal_path" :href="job.terminal_path"
class="js-terminal-link pull-right btn btn-primary class="js-terminal-link pull-right btn btn-primary btn-inverted visible-md-block visible-lg-block"
btn-inverted visible-md-block visible-lg-block"
target="_blank" target="_blank"
> >
{{ __('Debug') }} <icon name="external-link" /> {{ __('Debug') }} <icon name="external-link" />
...@@ -133,8 +131,7 @@ export default { ...@@ -133,8 +131,7 @@ export default {
<gl-button <gl-button
:aria-label="__('Toggle Sidebar')" :aria-label="__('Toggle Sidebar')"
type="button" type="button"
class="btn btn-blank gutter-toggle class="btn btn-blank gutter-toggle float-right d-block d-md-none js-sidebar-build-toggle"
float-right d-block d-md-none js-sidebar-build-toggle"
@click="toggleSidebar" @click="toggleSidebar"
> >
<i aria-hidden="true" data-hidden="true" class="fa fa-angle-double-right"></i> <i aria-hidden="true" data-hidden="true" class="fa fa-angle-double-right"></i>
...@@ -145,25 +142,18 @@ export default { ...@@ -145,25 +142,18 @@ export default {
v-if="job.new_issue_path" v-if="job.new_issue_path"
:href="job.new_issue_path" :href="job.new_issue_path"
class="js-new-issue btn btn-success btn-inverted" class="js-new-issue btn btn-success btn-inverted"
>{{ __('New issue') }}</gl-link
> >
{{ __('New issue') }}
</gl-link>
<gl-link <gl-link
v-if="job.retry_path" v-if="job.retry_path"
:href="job.retry_path" :href="job.retry_path"
class="js-retry-job btn btn-inverted-secondary" class="js-retry-job btn btn-inverted-secondary"
data-method="post" data-method="post"
rel="nofollow" rel="nofollow"
>{{ __('Retry') }}</gl-link
> >
{{ __('Retry') }}
</gl-link>
</div> </div>
<div :class="{ block: renderBlock }"> <div :class="{ block: renderBlock }">
<p v-if="job.merge_request" class="build-detail-row js-job-mr">
<span class="build-light-text"> {{ __('Merge Request:') }} </span>
<gl-link :href="job.merge_request.path"> !{{ job.merge_request.iid }} </gl-link>
</p>
<detail-row <detail-row
v-if="job.duration" v-if="job.duration"
:value="duration" :value="duration"
...@@ -198,10 +188,10 @@ export default { ...@@ -198,10 +188,10 @@ export default {
title="Coverage" title="Coverage"
/> />
<p v-if="job.tags.length" class="build-detail-row js-job-tags"> <p v-if="job.tags.length" class="build-detail-row js-job-tags">
<span class="build-light-text"> {{ __('Tags:') }} </span> <span class="font-weight-bold">{{ __('Tags:') }}</span>
<span v-for="(tag, i) in job.tags" :key="i" class="badge badge-primary"> <span v-for="(tag, i) in job.tags" :key="i" class="badge badge-primary mr-1">{{
{{ tag }} tag
</span> }}</span>
</p> </p>
<div v-if="job.cancel_path" class="btn-group prepend-top-5" role="group"> <div v-if="job.cancel_path" class="btn-group prepend-top-5" role="group">
...@@ -210,9 +200,8 @@ export default { ...@@ -210,9 +200,8 @@ export default {
class="js-cancel-job btn btn-sm btn-default" class="js-cancel-job btn btn-sm btn-default"
data-method="post" data-method="post"
rel="nofollow" rel="nofollow"
>{{ __('Cancel') }}</gl-link
> >
{{ __('Cancel') }}
</gl-link>
</div> </div>
</div> </div>
......
...@@ -34,8 +34,7 @@ export default { ...@@ -34,8 +34,7 @@ export default {
</script> </script>
<template> <template>
<p class="build-detail-row"> <p class="build-detail-row">
<span v-if="hasTitle" class="build-light-text"> {{ title }}: </span> {{ value }} <span v-if="hasTitle" class="font-weight-bold">{{ title }}:</span> {{ value }}
<span v-if="hasHelpURL" class="help-button float-right"> <span v-if="hasHelpURL" class="help-button float-right">
<gl-link :href="helpUrl" target="_blank" rel="noopener noreferrer nofollow"> <gl-link :href="helpUrl" target="_blank" rel="noopener noreferrer nofollow">
<i class="fa fa-question-circle" aria-hidden="true"></i> <i class="fa fa-question-circle" aria-hidden="true"></i>
......
...@@ -38,11 +38,11 @@ export default { ...@@ -38,11 +38,11 @@ export default {
<div class="block-last dropdown"> <div class="block-last dropdown">
<ci-icon :status="pipeline.details.status" class="vertical-align-middle" /> <ci-icon :status="pipeline.details.status" class="vertical-align-middle" />
{{ __('Pipeline') }} <span class="font-weight-bold">{{ __('Pipeline') }}</span>
<a :href="pipeline.path" class="js-pipeline-path link-commit"> #{{ pipeline.id }} </a> <a :href="pipeline.path" class="js-pipeline-path link-commit">#{{ pipeline.id }}</a>
<template v-if="hasRef"> <template v-if="hasRef">
{{ __('from') }} {{ __('from') }}
<a :href="pipeline.ref.path" class="link-commit ref-name"> {{ pipeline.ref.name }} </a> <a :href="pipeline.ref.path" class="link-commit ref-name">{{ pipeline.ref.name }}</a>
</template> </template>
<button <button
......
...@@ -43,23 +43,24 @@ export default { ...@@ -43,23 +43,24 @@ export default {
<template> <template>
<div class="build-widget block"> <div class="build-widget block">
<h4 class="title">{{ __('Trigger') }}</h4>
<p <p
v-if="trigger.short_token" v-if="trigger.short_token"
class="js-short-token" class="js-short-token"
:class="{ 'append-bottom-0': !hasVariables }" :class="{ 'append-bottom-5': hasVariables, 'append-bottom-0': !hasVariables }"
> >
<span class="build-light-text"> {{ __('Token') }} </span> {{ trigger.short_token }} <span class="font-weight-bold">{{ __('Trigger token:') }}</span> {{ trigger.short_token }}
</p> </p>
<template v-if="hasVariables"> <template v-if="hasVariables">
<p class="trigger-variables-btn-container"> <p class="trigger-variables-btn-container">
<span class="build-light-text"> {{ __('Variables:') }} </span> <span class="font-weight-bold">{{ __('Trigger variables:') }}</span>
<gl-button v-if="hasValues" class="group js-reveal-variables" @click="toggleValues"> <gl-button
{{ getToggleButtonText }} v-if="hasValues"
</gl-button> class="btn-sm group js-reveal-variables trigger-variables-btn"
@click="toggleValues"
>{{ getToggleButtonText }}</gl-button
>
</p> </p>
<table class="js-build-variables trigger-build-variables"> <table class="js-build-variables trigger-build-variables">
......
...@@ -232,6 +232,11 @@ ...@@ -232,6 +232,11 @@
@extend .d-flex; @extend .d-flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.trigger-variables-btn {
margin-top: -5px;
margin-bottom: -5px;
}
} }
.trigger-build-variables { .trigger-build-variables {
......
---
title: Fix label and header styles in the job details sidebar.
merge_request: 23816
author: Nathan Friend
type: changed
...@@ -3756,7 +3756,7 @@ msgstr "" ...@@ -3756,7 +3756,7 @@ msgstr ""
msgid "Job|The artifacts were removed" msgid "Job|The artifacts were removed"
msgstr "" msgstr ""
msgid "Job|The artifacts will be removed in" msgid "Job|The artifacts will be removed"
msgstr "" msgstr ""
msgid "Job|This job is stuck because the project doesn't have any runners online assigned to it." msgid "Job|This job is stuck because the project doesn't have any runners online assigned to it."
...@@ -4090,9 +4090,6 @@ msgstr "" ...@@ -4090,9 +4090,6 @@ msgstr ""
msgid "Merge Request" msgid "Merge Request"
msgstr "" msgstr ""
msgid "Merge Request:"
msgstr ""
msgid "Merge Requests" msgid "Merge Requests"
msgstr "" msgstr ""
...@@ -7113,10 +7110,13 @@ msgstr "" ...@@ -7113,10 +7110,13 @@ msgstr ""
msgid "Trending" msgid "Trending"
msgstr "" msgstr ""
msgid "Trigger" msgid "Trigger this manual action"
msgstr "" msgstr ""
msgid "Trigger this manual action" msgid "Trigger token:"
msgstr ""
msgid "Trigger variables:"
msgstr "" msgstr ""
msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions." msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions."
...@@ -7320,9 +7320,6 @@ msgstr "" ...@@ -7320,9 +7320,6 @@ msgstr ""
msgid "Variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. You can use variables for passwords, secret keys, or whatever you want." msgid "Variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. You can use variables for passwords, secret keys, or whatever you want."
msgstr "" msgstr ""
msgid "Variables:"
msgstr ""
msgid "Various container registry settings." msgid "Various container registry settings."
msgstr "" msgstr ""
...@@ -7852,6 +7849,9 @@ msgstr "" ...@@ -7852,6 +7849,9 @@ msgstr ""
msgid "importing" msgid "importing"
msgstr "" msgstr ""
msgid "in"
msgstr ""
msgid "issue boards" msgid "issue boards"
msgstr "" msgstr ""
......
...@@ -351,8 +351,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -351,8 +351,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
context 'when user is a maintainer' do context 'when user is a maintainer' do
shared_examples 'no reveal button variables behavior' do shared_examples 'no reveal button variables behavior' do
it 'renders a hidden value with no reveal values button', :js do it 'renders a hidden value with no reveal values button', :js do
expect(page).to have_content('Token') expect(page).to have_content('Trigger token')
expect(page).to have_content('Variables') expect(page).to have_content('Trigger variables')
expect(page).not_to have_css('.js-reveal-variables') expect(page).not_to have_css('.js-reveal-variables')
...@@ -389,8 +389,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -389,8 +389,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
shared_examples 'reveal button variables behavior' do shared_examples 'reveal button variables behavior' do
it 'renders a hidden value with a reveal values button', :js do it 'renders a hidden value with a reveal values button', :js do
expect(page).to have_content('Token') expect(page).to have_content('Trigger token')
expect(page).to have_content('Variables') expect(page).to have_content('Trigger variables')
expect(page).to have_css('.js-reveal-variables') expect(page).to have_css('.js-reveal-variables')
......
...@@ -2,6 +2,7 @@ import Vue from 'vue'; ...@@ -2,6 +2,7 @@ import Vue from 'vue';
import { getTimeago } from '~/lib/utils/datetime_utility'; import { getTimeago } from '~/lib/utils/datetime_utility';
import component from '~/jobs/components/artifacts_block.vue'; import component from '~/jobs/components/artifacts_block.vue';
import mountComponent from '../../helpers/vue_mount_component_helper'; import mountComponent from '../../helpers/vue_mount_component_helper';
import { trimText } from '../../helpers/vue_component_helper';
describe('Artifacts block', () => { describe('Artifacts block', () => {
const Component = Vue.extend(component); const Component = Vue.extend(component);
...@@ -9,7 +10,7 @@ describe('Artifacts block', () => { ...@@ -9,7 +10,7 @@ describe('Artifacts block', () => {
const expireAt = '2018-08-14T09:38:49.157Z'; const expireAt = '2018-08-14T09:38:49.157Z';
const timeago = getTimeago(); const timeago = getTimeago();
const formatedDate = timeago.format(expireAt); const formattedDate = timeago.format(expireAt);
const expiredArtifact = { const expiredArtifact = {
expire_at: expireAt, expire_at: expireAt,
...@@ -36,9 +37,8 @@ describe('Artifacts block', () => { ...@@ -36,9 +37,8 @@ describe('Artifacts block', () => {
expect(vm.$el.querySelector('.js-artifacts-removed')).not.toBeNull(); expect(vm.$el.querySelector('.js-artifacts-removed')).not.toBeNull();
expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).toBeNull(); expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).toBeNull();
expect(vm.$el.textContent).toContain(formatedDate); expect(trimText(vm.$el.querySelector('.js-artifacts-removed').textContent)).toEqual(
expect(vm.$el.querySelector('.js-artifacts-removed').textContent.trim()).toEqual( `The artifacts were removed ${formattedDate}`,
'The artifacts were removed',
); );
}); });
}); });
...@@ -51,9 +51,8 @@ describe('Artifacts block', () => { ...@@ -51,9 +51,8 @@ describe('Artifacts block', () => {
expect(vm.$el.querySelector('.js-artifacts-removed')).toBeNull(); expect(vm.$el.querySelector('.js-artifacts-removed')).toBeNull();
expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).not.toBeNull(); expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).not.toBeNull();
expect(vm.$el.textContent).toContain(formatedDate); expect(trimText(vm.$el.querySelector('.js-artifacts-will-be-removed').textContent)).toEqual(
expect(vm.$el.querySelector('.js-artifacts-will-be-removed').textContent.trim()).toEqual( `The artifacts will be removed ${formattedDate}`,
'The artifacts will be removed in',
); );
}); });
}); });
......
...@@ -79,14 +79,6 @@ describe('Sidebar details block', () => { ...@@ -79,14 +79,6 @@ describe('Sidebar details block', () => {
}); });
describe('information', () => { describe('information', () => {
it('should render merge request link', () => {
expect(trimText(vm.$el.querySelector('.js-job-mr').textContent)).toEqual('Merge Request: !2');
expect(vm.$el.querySelector('.js-job-mr a').getAttribute('href')).toEqual(
job.merge_request.path,
);
});
it('should render job duration', () => { it('should render job duration', () => {
expect(trimText(vm.$el.querySelector('.js-job-duration').textContent)).toEqual( expect(trimText(vm.$el.querySelector('.js-job-duration').textContent)).toEqual(
'Duration: 6 seconds', 'Duration: 6 seconds',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment