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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
8229aedf
Commit
8229aedf
authored
Dec 21, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'change-code-font-size-to-12px' into 'master'
Change code font size to 12px See merge request !8157
parents
580220c6
5a4b3e8e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-2
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
8229aedf
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
padding
:
20px
;
padding
:
20px
;
color
:
$gl-gray
;
color
:
$gl-gray
;
font-weight
:
normal
;
font-weight
:
normal
;
font-size
:
1
6
px
;
font-size
:
1
4
px
;
line-height
:
36px
;
line-height
:
36px
;
&
.diff-collapsed
{
&
.diff-collapsed
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
8229aedf
...
@@ -134,8 +134,8 @@ $md-area-border: #ddd;
...
@@ -134,8 +134,8 @@ $md-area-border: #ddd;
/*
/*
* Code
* Code
*/
*/
$code_font_size
:
1
3
px
;
$code_font_size
:
1
2
px
;
$code_line_height
:
1
.
5
;
$code_line_height
:
1
.
6
;
/*
/*
* Padding
* Padding
...
...
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