Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
22250d7a
Commit
22250d7a
authored
May 14, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add <pre> styles and fix check out branch modal
parent
f107184b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+10
-0
app/views/projects/merge_requests/_how_to_merge.html.haml
app/views/projects/merge_requests/_how_to_merge.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/typography.scss
View file @
22250d7a
...
...
@@ -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
{
...
...
app/views/projects/merge_requests/_how_to_merge.html.haml
View file @
22250d7a
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment