summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-07-20 19:20:01 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-07-20 19:20:01 +0000
commit3873617548c03359e4fb9e093d181a7d61f642c4 (patch)
tree921ef71b939406ddad63feee671fd37d77274a56 /app/assets
parentced005f330419ec81657e852c5cb9124fdb29fbb (diff)
parent0deb8547af52ea1ccb147a07629705ec5e435bfb (diff)
downloadgitlab-ce-3873617548c03359e4fb9e093d181a7d61f642c4.tar.gz
Merge branch '47530-replace-label-light-with-label-bold' into 'master'
Resolve "Replace all usages of `label-light` with `label-bold`" Closes #47530 and #41725 See merge request gitlab-org/gitlab-ce!20727
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/boards/components/board_new_issue.vue2
-rw-r--r--app/assets/javascripts/boards/components/project_select.vue2
-rw-r--r--app/assets/javascripts/ide/components/new_dropdown/modal.vue2
-rw-r--r--app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue14
-rw-r--r--app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue2
-rw-r--r--app/assets/stylesheets/framework/forms.scss2
6 files changed, 12 insertions, 12 deletions
diff --git a/app/assets/javascripts/boards/components/board_new_issue.vue b/app/assets/javascripts/boards/components/board_new_issue.vue
index ec23b1e7c11..271c6eac81a 100644
--- a/app/assets/javascripts/boards/components/board_new_issue.vue
+++ b/app/assets/javascripts/boards/components/board_new_issue.vue
@@ -105,7 +105,7 @@ export default {
</div>
<label
:for="list.id + '-title'"
- class="label-light"
+ class="label-bold"
>
Title
</label>
diff --git a/app/assets/javascripts/boards/components/project_select.vue b/app/assets/javascripts/boards/components/project_select.vue
index eb335f352d3..dc887db1e73 100644
--- a/app/assets/javascripts/boards/components/project_select.vue
+++ b/app/assets/javascripts/boards/components/project_select.vue
@@ -68,7 +68,7 @@ export default {
<template>
<div>
- <label class="label-light prepend-top-10">
+ <label class="label-bold prepend-top-10">
Project
</label>
<div
diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
index 1867b7980d2..833c4b027df 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -66,7 +66,7 @@ export default {
<div
class="form-group row"
>
- <label class="label-light col-form-label col-sm-3">
+ <label class="label-bold col-form-label col-sm-3">
{{ __('Name') }}
</label>
<div class="col-sm-9">
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
index d0613804067..0d05668b285 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
@@ -68,7 +68,7 @@
:name="inputNameAttribute"
:value="cronInterval"
:checked="isEditable"
- class="label-light"
+ class="label-bold"
type="radio"
@click="toggleCustomInput(true)"
/>
@@ -93,13 +93,13 @@
v-model="cronInterval"
:name="inputNameAttribute"
:value="cronIntervalPresets.everyDay"
- class="label-light"
+ class="label-bold"
type="radio"
@click="toggleCustomInput(false)"
/>
<label
- class="label-light"
+ class="label-bold"
for="every-day"
>
{{ __('Every day (at 4:00am)') }}
@@ -112,13 +112,13 @@
v-model="cronInterval"
:name="inputNameAttribute"
:value="cronIntervalPresets.everyWeek"
- class="label-light"
+ class="label-bold"
type="radio"
@click="toggleCustomInput(false)"
/>
<label
- class="label-light"
+ class="label-bold"
for="every-week"
>
{{ __('Every week (Sundays at 4:00am)') }}
@@ -131,13 +131,13 @@
v-model="cronInterval"
:name="inputNameAttribute"
:value="cronIntervalPresets.everyMonth"
- class="label-light"
+ class="label-bold"
type="radio"
@click="toggleCustomInput(false)"
/>
<label
- class="label-light"
+ class="label-bold"
for="every-month"
>
{{ __('Every month (on the 1st at 4:00am)') }}
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
index 17b91479ea5..83437363af5 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
@@ -24,7 +24,7 @@
<div class="project-feature-row">
<label
v-if="label"
- class="label-light"
+ class="label-bold"
>
{{ label }}
<a
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index a22454c24e2..a10ff3eecb3 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -31,7 +31,7 @@ label {
margin: 0;
}
- &.label-light {
+ &.label-bold {
font-weight: $gl-font-weight-bold;
}
}