kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add <pre> styles and fix check out branch modal

This commit is contained in:
Annabel Dunstone Gray 2018-05-14 15:40:14 -07:00
parent f107184be3
commit 22250d7a3f
No known key found for this signature in database
GPG Key ID: 7C8C78A372AD7A2D
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/framework/typography.scss
View File

@ -321,6 +321,16 @@ h6 {
/** CODE **/
pre {
font-family: $monospace_font;
display: block;
padding: $gl-padding-8;
margin: 0 0 $gl-padding-8;
font-size: 13px;
word-break: break-all;
word-wrap: break-word;
color: $gl-text-color;
background-color: $gray-light;
border: 1px solid $border-color;
border-radius: $border-radius-small;
}
code {

2
app/views/projects/merge_requests/_how_to_merge.html.haml
View File

@ -2,8 +2,8 @@
.modal-dialog
.modal-content
.modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3 Check out, review, and merge locally
%a.close{ href: "#", "data-dismiss" => "modal" } ×
.modal-body
%p
%strong Step 1.