Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/pages/issuable.scss3
-rw-r--r--app/helpers/issuables_helper.rb2
-rw-r--r--changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml5
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index cb29b5d4313..57539212e0c 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -703,7 +703,8 @@
text-overflow: ellipsis;
.user-status-emoji {
- margin: 0 $gl-padding-8 0 $gl-padding-4;
+ margin-left: $gl-padding-4;
+ margin-right: 0;
}
}
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 1f67c045d1c..56f6686da57 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -191,7 +191,7 @@ module IssuablesHelper
output << content_tag(:span, (issuable_first_contribution_icon if issuable.first_contribution?), class: 'has-tooltip', title: _('1st contribution!'))
- output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block")
+ output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block prepend-left-8")
output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "d-md-none")
output.join.html_safe
diff --git a/changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml b/changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml
new file mode 100644
index 00000000000..5d245f672f2
--- /dev/null
+++ b/changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml
@@ -0,0 +1,5 @@
+---
+title: Add margin between username and subsequent text in issuable header
+merge_request: 21697
+author:
+type: other