diff --git a/app/assets/javascripts/issues/list/components/jira_issues_import_status_app.vue b/app/assets/javascripts/issues/list/components/jira_issues_import_status_app.vue
index fb1dbef666c685157c3b57f5bb01ff51635be18f..43e09b2420f917f263de19de61d78b2bf35440c6 100644
--- a/app/assets/javascripts/issues/list/components/jira_issues_import_status_app.vue
+++ b/app/assets/javascripts/issues/list/components/jira_issues_import_status_app.vue
@@ -103,7 +103,6 @@ export default {
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
index a8c25fa86836bfcf008f8c1e6a1881241a8ae484..f3a60bb353fa4f52eb0e21e1fbe5f27e4a05e4f7 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue
@@ -151,7 +151,6 @@ export default {
:background-color="getLabelBackgroundColor(label)"
:scoped="showScopedLabel(label)"
:title="label"
- size="sm"
/>
@@ -162,7 +161,6 @@ export default {
"
:scoped="showScopedLabel(activeTokenValue ? getLabelName(activeTokenValue) : inputValue)"
:title="activeTokenValue ? getLabelName(activeTokenValue) : inputValue"
- size="sm"
/>
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
index 4dce443b709fc3c12d54ae9f0572a56bf53f7007..2419c347b9f490ac2ab6187f473f3aa4fe1d12b6 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
@@ -370,7 +370,6 @@ export default {
:description="label.description"
:scoped="scopedLabel(label)"
:target="labelTarget(label)"
- size="sm"
/>
diff --git a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
index 1e73a4c690f2e75c6b2467c955c06fb7d895b65f..7aca7e4a23d1bf0d65b46ea51ee7b71fddcdfeaa 100644
--- a/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
+++ b/app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue
@@ -232,7 +232,7 @@ export default {
:background-color="label.color"
:description="label.description"
:scoped="showScopedLabel(label)"
- class="gl-mt-2 gl-mr-2 gl-mb-auto gl-label-sm"
+ class="gl-mt-2 gl-mr-2 gl-mb-auto"
tooltip-placement="top"
/>
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 728dda8a769b02289e299e805c5c3c0cb4cfc46b..d57999d56379ec9389926de49a5f6c7776dc8872 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -26,7 +26,6 @@
@import 'framework/header';
@import 'framework/top_bar';
@import 'framework/highlight';
-@import 'framework/labels';
@import 'framework/lists';
@import 'framework/logo';
@import 'framework/markdown_area';
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 3fe23a12898d138893a70fa35e5375e9649b58c8..b0dfdd981ce7c1b452c5a5aa0877836678fec0e9 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -561,10 +561,6 @@ See https://gitlab.com/gitlab-org/gitlab/issues/36857 for more details.
.gl-label-scoped {
box-shadow: 0 0 0 2px currentColor inset;
-
- &.gl-label-sm {
- box-shadow: 0 0 0 1px inset;
- }
}
.ref-container,
diff --git a/app/assets/stylesheets/framework/labels.scss b/app/assets/stylesheets/framework/labels.scss
deleted file mode 100644
index 9a9edbeb91a1980766f7a9ad4c09860c13764ed5..0000000000000000000000000000000000000000
--- a/app/assets/stylesheets/framework/labels.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-// FF :simplified_labels
-//
-// Temporarily override label styles
-// globally
-//
-// Once verified we will update the
-// label component in GitLab UI
-// refactor GitLab and remove this
-// custom code
-//
-// see https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/3307
-.ff-simplified-labels-enabled {
- // These changes will be moved to
- // GitLab UI's label component
- .gl-label,
- .gl-label-sm {
- vertical-align: bottom;
-
- &:focus:active {
- color: inherit;
- box-shadow: none;
- outline: none;
- }
-
- .gl-label-text,
- .gl-label-text-scoped {
- font-size: $gl-font-size-sm;
- padding-block: $gl-spacing-scale-1;
- padding-inline: calc(#{$gl-spacing-scale-3} - 2px);
- }
-
- > .gl-label-close.gl-button {
- width: px-to-rem(14px);
- height: px-to-rem(14px);
- margin-left: calc(#{-$gl-spacing-scale-2} - 1px);
- margin-right: calc(#{$gl-spacing-scale-2} - 1px);
- }
- }
-
- // These changes will be moved to
- // app/assets/stylesheets/framework/sidebar.scss
- .issuable-show-labels .gl-label {
- margin-bottom: $gl-spacing-scale-2;
- margin-right: $gl-spacing-scale-2;
- }
-
- // These changes will be moved to
- // app/assets/stylesheets/framework/typography.scss
- .md p > code {
- font-size: px-to-rem(13px);
- }
-
- .md code {
- vertical-align: bottom;
- }
-}
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 27e899e79a996c23fcc00883a82ca2b6b00d17d4..782f29a07b189a5f59a4bf8529c7b7f8d4217a5e 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -742,8 +742,8 @@
.issuable-show-labels {
.gl-label {
- margin-bottom: 5px;
- margin-right: 5px;
+ margin-bottom: $gl-spacing-scale-2;
+ margin-right: $gl-spacing-scale-2;
}
a {
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index a8f5961e4c881705dbd8894d2b31137520d3e0f4..bb49ef89d99d5042adcfe369a48c2b4f0ab036a7 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -80,6 +80,7 @@
// Single code lines should wrap
code {
font-family: $monospace-font;
+ vertical-align: bottom;
white-space: pre-wrap;
// Safari
word-wrap: break-word;
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 07655694784b1808da21b0b332a2228380e9ac0b..bd573c7a9c12679320a3081fe8d3ee1f56366146 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -79,10 +79,6 @@
iframe.twitter-share-button {
vertical-align: bottom;
}
-
- .gl-label-scoped.gl-label-sm {
- --label-inset-border: inset 0 0 0 1px currentColor;
- }
}
code {
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index a6bc9bcf2053fbf84ca93dc94c751cb9516075b1..486ccd46be0332598e2a1b22b8a0cef4af8f5e58 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -36,17 +36,17 @@ def show_label_issuables_link?(label, issuables_type, current_user: nil)
# link_to_label(label) { "My Custom Label Text" }
#
# Returns a String
- def link_to_label(label, type: :issue, tooltip: true, small: false, css_class: nil, &block)
+ def link_to_label(label, type: :issue, tooltip: true, css_class: nil, &block)
link = label.filter_path(type: type)
if block
link_to link, class: css_class, &block
else
- render_label(label, link: link, tooltip: tooltip, small: small)
+ render_label(label, link: link, tooltip: tooltip)
end
end
- def render_label(label, link: nil, tooltip: true, dataset: nil, small: false, tooltip_shows_title: false)
+ def render_label(label, link: nil, tooltip: true, dataset: nil, tooltip_shows_title: false)
html = render_colored_label(label)
if link
@@ -54,7 +54,7 @@ def render_label(label, link: nil, tooltip: true, dataset: nil, small: false, to
html = render_label_link(html, link: link, title: title, dataset: dataset)
end
- wrap_label_html(html, small: small, label: label)
+ wrap_label_html(html, label: label)
end
def render_colored_label(label, suffix: '')
@@ -67,9 +67,8 @@ def render_colored_label(label, suffix: '')
end
# We need the `label` argument here for EE
- def wrap_label_html(label_html, small:, label:)
+ def wrap_label_html(label_html, label:)
wrapper_classes = %w[gl-label]
- wrapper_classes << 'gl-label-sm' if small
%(#{label_html}).html_safe
end
diff --git a/app/serializers/analytics/cycle_analytics/stage_entity.rb b/app/serializers/analytics/cycle_analytics/stage_entity.rb
index 06b39fedec9993114444f4edf9210e352aed98c3..ef88e1da7b0bd28385fd4f80baa78d04e1e878ca 100644
--- a/app/serializers/analytics/cycle_analytics/stage_entity.rb
+++ b/app/serializers/analytics/cycle_analytics/stage_entity.rb
@@ -58,7 +58,7 @@ def html_description(event)
options = {}
if event.label_based?
label = event.label.present(issuable_subject: event.label.subject)
- options[:label_html] = render_label(label, link: '', small: true, tooltip: true)
+ options[:label_html] = render_label(label, link: '', tooltip: true)
end
content_tag(:p) { event.html_description(options).html_safe }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 60af6741835460283f83f8d977ee1c586047f716..309ad07d99d6eafbc2277c91883e583b43db0fbe 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,13 +1,12 @@
- page_classes = page_class << @html_class
- page_classes = [user_application_color_mode, user_application_theme, page_classes.flatten.compact]
- body_classes = [user_tab_width, @body_class, client_class_list, *custom_diff_color_classes]
-- ff_simplified_labels_classes = Feature.enabled?(:simplified_labels, current_user) ? 'ff-simplified-labels-enabled' : ''
- ff_simplified_badges_classes = Feature.enabled?(:simplified_badges, current_user) ? 'ff-simplified-badges-enabled' : ''
!!! 5
%html{ lang: I18n.locale, class: page_classes }
= render "layouts/head"
- %body{ class: [body_classes, ff_simplified_labels_classes, ff_simplified_badges_classes], data: body_data }
+ %body{ class: [body_classes, ff_simplified_badges_classes], data: body_data }
= render "layouts/init_auto_complete" if @gfm_form
= render "layouts/init_client_detection_flags"
= render "layouts/visual_review" if review_apps_enabled?
diff --git a/app/views/projects/_issue.html.haml b/app/views/projects/_issue.html.haml
index cc1d9a51811a38fe14fb31ab2b29cb2560374035..3fd931edec36163c2b86c2eaf9fe73ca4d686f6c 100644
--- a/app/views/projects/_issue.html.haml
+++ b/app/views/projects/_issue.html.haml
@@ -41,7 +41,7 @@
- if issue.labels.any?
- presented_labels_sorted_by_title(issue.labels, issue.project).each do |label|
- = link_to_label(label, small: true)
+ = link_to_label(label)
= render 'projects/issue_estimate', issue: issue
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 0b90b7409aad5501bf545b7d92ea3beb5152b81a..b0ad1ca383e1d1d1fe8a74bed9de294244325425 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -40,7 +40,7 @@
- if merge_request.labels.any?
.gl-mt-1.gl-display-flex.gl-flex-wrap.gl-gap-2{ role: 'group', 'aria-label': _('Labels') }
- presented_labels_sorted_by_title(merge_request.labels, merge_request.project).each do |label|
- = link_to_label(label, type: :merge_request, small: true)
+ = link_to_label(label, type: :merge_request)
.issuable-meta
%ul.controls.d-flex.gl-align-items-center
diff --git a/app/views/search/results/_issuable.html.haml b/app/views/search/results/_issuable.html.haml
index bd98e0b087cd5d651b1feccd0ae2db97ecba939a..7a46f3fa4511e4a8dfa7739d0fd99df5b557011a 100644
--- a/app/views/search/results/_issuable.html.haml
+++ b/app/views/search/results/_issuable.html.haml
@@ -20,7 +20,7 @@
- if issuable.labels.any?
.gl-mt-3
- presented_labels_sorted_by_title(issuable.labels, issuable.project).each do |label|
- = link_to_label(label, small: true)
+ = link_to_label(label)
.col-sm-3.gl-mt-3.gl-sm-mt-0.gl-text-right
- if issuable.respond_to?(:upvotes_count) && issuable.upvotes_count > 0
diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml
index 12380d4c34ecfb5f1ab5104d379c492550437ed0..9a3df35d4bf323764a1a5b8c9ac08e8641a34e8b 100644
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
@@ -18,7 +18,7 @@
%span.issuable-number= issuable.to_reference
- labels.each do |label|
- = render_label(label.present(issuable_subject: project), link: polymorphic_path(issuable_type_args, { milestone_title: @milestone.title, label_name: label.title, state: 'all' }), small: true)
+ = render_label(label.present(issuable_subject: project), link: polymorphic_path(issuable_type_args, { milestone_title: @milestone.title, label_name: label.title, state: 'all' }))
%span.assignee-icon
- assignees.each do |assignee|
diff --git a/config/feature_flags/development/simplified_labels.yml b/config/feature_flags/development/simplified_labels.yml
deleted file mode 100644
index 95619cd5ea53d3141e7d7e64eff84c0319c2873b..0000000000000000000000000000000000000000
--- a/config/feature_flags/development/simplified_labels.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: simplified_labels
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140239
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437859
-milestone: '16.8'
-type: development
-group: group::ux paper cuts
-default_enabled: false
diff --git a/ee/app/assets/javascripts/analytics/dashboards/components/comparison_chart_labels.vue b/ee/app/assets/javascripts/analytics/dashboards/components/comparison_chart_labels.vue
index 25acd81c94193c3f0576ac7dae9778b960ce0a9d..f3e1a7a8388f9edd7d330119cd755a69571a9e9c 100644
--- a/ee/app/assets/javascripts/analytics/dashboards/components/comparison_chart_labels.vue
+++ b/ee/app/assets/javascripts/analytics/dashboards/components/comparison_chart_labels.vue
@@ -72,7 +72,6 @@ export default {
:background-color="label.color"
:scoped="isScoped(label)"
:target="labelTarget(label.title)"
- size="sm"
/>
@@ -94,7 +93,6 @@ export default {
:background-color="label.color"
:scoped="isScoped(label)"
:target="labelTarget(label.title)"
- size="sm"
/>
diff --git a/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue b/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue
index 4d7c218c8ee00407237827f552404c96a85888e1..5abf7add93fd93895a2f9a2c4197b93557f4b7f7 100644
--- a/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue
+++ b/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue
@@ -176,7 +176,6 @@ export default {
:title="label"
:background-color="getLabelBackgroundColor(label)"
:scoped="isScopedLabel(label)"
- size="sm"
class="gl-mt-3 gl-mr-3"
/>