Commit c4be8de7 authored by Mike Greiling's avatar Mike Greiling

Merge branch '47548-monospace-commit-messages' into 'master'

Resolve "Commit messages are no longer monospace, but still white-space: pre-wrap"

Closes #47548

See merge request gitlab-org/gitlab-ce!20988
parents 99c033f2 729951eb
.commit-description {
background: none;
%commit-description-base {
padding: $gl-padding-8 0 $gl-padding-8 $gl-padding-8;
margin-top: $gl-padding-8;
border: 0;
padding: 0;
border-radius: unset;
background: none;
word-break: normal;
white-space: pre-wrap;
overflow-x: auto;
border-left: 3px solid $white-dark;
color: $gl-text-color-secondary;
}
.commit-description {
@extend %commit-description-base;
}
.js-details-expand {
......@@ -175,11 +183,17 @@
justify-content: space-between;
align-items: start;
flex-grow: 1;
min-width: 0;
.project_namespace {
color: $gl-text-color-secondary;
}
}
.commit-content {
padding-right: 10px;
white-space: normal;
overflow: hidden;
.commit-title {
display: flex;
......@@ -270,17 +284,9 @@
}
.commit-row-description {
font-size: 14px;
padding: 0 0 0 $gl-padding-8;
border: 0;
@extend %commit-description-base;
display: none;
white-space: pre-wrap;
word-break: normal;
color: $gl-text-color-secondary;
background: none;
font-family: inherit;
border-left: 2px solid $theme-gray-300;
border-radius: unset;
flex: 1;
a {
color: $gl-text-color;
......
......@@ -55,7 +55,7 @@
%h3.commit-title
= markdown_field(@commit, :title)
- if @commit.description.present?
.commit-description<
%pre.commit-description<
= preserve(markdown_field(@commit, :description))
.info-well
......
......@@ -44,7 +44,7 @@
#{ commit_text.html_safe }
- if commit.description?
%pre.commit-row-description.js-toggle-content.prepend-top-8.append-bottom-8
%pre.commit-row-description.js-toggle-content.append-bottom-8
= preserve(markdown_field(commit, :description))
.commit-actions.flex-row.d-none.d-sm-flex
......
......@@ -2,7 +2,7 @@
%h3.commit-title
= markdown(commit.title, pipeline: :single_line)
- if commit.description.present?
.commit-description<
%pre.commit-description<
= preserve(markdown(commit.description, pipeline: :single_line))
.info-well
......
---
title: Update commit message styles with monospace font and overflow-x
merge_request: 20988
author:
type: changed
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