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
Boxiang Sun
gitlab-ce
Commits
436ea57f
Commit
436ea57f
authored
Dec 02, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce base font sizes across app
parent
3ebb815a
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
20 additions
and
20 deletions
+20
-20
app/assets/stylesheets/framework/blank.scss
app/assets/stylesheets/framework/blank.scss
+2
-2
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-1
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+3
-3
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+2
-2
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-2
app/assets/stylesheets/pages/admin.scss
app/assets/stylesheets/pages/admin.scss
+1
-1
app/assets/stylesheets/pages/awards.scss
app/assets/stylesheets/pages/awards.scss
+1
-1
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+1
-1
app/assets/stylesheets/pages/lint.scss
app/assets/stylesheets/pages/lint.scss
+2
-2
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-1
spec/features/merge_requests/conflicts_spec.rb
spec/features/merge_requests/conflicts_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/blank.scss
View file @
436ea57f
...
@@ -32,14 +32,14 @@
...
@@ -32,14 +32,14 @@
.blank-state-title
{
.blank-state-title
{
margin-top
:
0
;
margin-top
:
0
;
margin-bottom
:
5px
;
margin-bottom
:
5px
;
font-size
:
1
9
px
;
font-size
:
1
8
px
;
font-weight
:
normal
;
font-weight
:
normal
;
}
}
.blank-state-text
{
.blank-state-text
{
margin-top
:
0
;
margin-top
:
0
;
margin-bottom
:
$gl-padding
;
margin-bottom
:
$gl-padding
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
>
strong
{
>
strong
{
font-weight
:
600
;
font-weight
:
600
;
...
...
app/assets/stylesheets/framework/common.scss
View file @
436ea57f
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
.slead
{
.slead
{
color
:
$common-gray
;
color
:
$common-gray
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
margin-bottom
:
12px
;
margin-bottom
:
12px
;
font-weight
:
normal
;
font-weight
:
normal
;
line-height
:
24px
;
line-height
:
24px
;
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
436ea57f
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
padding
:
6px
8px
6px
10px
;
padding
:
6px
8px
6px
10px
;
background-color
:
$dropdown-toggle-bg
;
background-color
:
$dropdown-toggle-bg
;
color
:
$dropdown-toggle-color
;
color
:
$dropdown-toggle-color
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
text-align
:
left
;
text-align
:
left
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
width
:
240px
;
width
:
240px
;
margin-top
:
2px
;
margin-top
:
2px
;
margin-bottom
:
0
;
margin-bottom
:
0
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
font-weight
:
normal
;
font-weight
:
normal
;
padding
:
8px
0
;
padding
:
8px
0
;
background-color
:
$dropdown-bg
;
background-color
:
$dropdown-bg
;
...
@@ -589,7 +589,7 @@
...
@@ -589,7 +589,7 @@
.ui-datepicker-title
{
.ui-datepicker-title
{
color
:
$gl-gray
;
color
:
$gl-gray
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
line-height
:
1
;
line-height
:
1
;
font-weight
:
normal
;
font-weight
:
normal
;
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
436ea57f
...
@@ -71,7 +71,7 @@ header {
...
@@ -71,7 +71,7 @@ header {
}
}
.fa-caret-down
{
.fa-caret-down
{
font-size
:
1
5
px
;
font-size
:
1
4
px
;
}
}
}
}
...
@@ -156,7 +156,7 @@ header {
...
@@ -156,7 +156,7 @@ header {
position
:
relative
;
position
:
relative
;
padding-right
:
20px
;
padding-right
:
20px
;
margin
:
0
;
margin
:
0
;
font-size
:
1
9
px
;
font-size
:
1
8
px
;
max-width
:
385px
;
max-width
:
385px
;
display
:
inline-block
;
display
:
inline-block
;
line-height
:
$header-height
;
line-height
:
$header-height
;
...
...
app/assets/stylesheets/framework/nav.scss
View file @
436ea57f
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
padding
:
$gl-btn-padding
;
padding
:
$gl-btn-padding
;
padding-bottom
:
11px
;
padding-bottom
:
11px
;
margin-bottom
:
-1px
;
margin-bottom
:
-1px
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
line-height
:
28px
;
line-height
:
28px
;
color
:
$note-toolbar-color
;
color
:
$note-toolbar-color
;
border-bottom
:
2px
solid
transparent
;
border-bottom
:
2px
solid
transparent
;
...
...
app/assets/stylesheets/framework/variables.scss
View file @
436ea57f
...
@@ -102,7 +102,7 @@ $well-light-text-color: #5b6169;
...
@@ -102,7 +102,7 @@ $well-light-text-color: #5b6169;
/*
/*
* Text
* Text
*/
*/
$gl-font-size
:
1
5
px
;
$gl-font-size
:
1
4
px
;
$gl-title-color
:
#333
;
$gl-title-color
:
#333
;
$gl-text-color
:
#5c5c5c
;
$gl-text-color
:
#5c5c5c
;
$gl-text-color-dark
:
#5c5d5e
;
$gl-text-color-dark
:
#5c5d5e
;
...
@@ -380,7 +380,7 @@ $ci-skipped-color: #888;
...
@@ -380,7 +380,7 @@ $ci-skipped-color: #888;
/*
/*
* Boards
* Boards
*/
*/
$issue-boards-font-size
:
1
5
px
;
$issue-boards-font-size
:
1
4
px
;
$issue-boards-card-shadow
:
rgba
(
186
,
186
,
186
,
0
.5
);
$issue-boards-card-shadow
:
rgba
(
186
,
186
,
186
,
0
.5
);
/*
/*
...
...
app/assets/stylesheets/pages/admin.scss
View file @
436ea57f
...
@@ -156,7 +156,7 @@
...
@@ -156,7 +156,7 @@
}
}
span
{
span
{
font-size
:
1
9
px
;
font-size
:
1
8
px
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/awards.scss
View file @
436ea57f
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
.award-control-icon
{
.award-control-icon
{
float
:
left
;
float
:
left
;
margin-right
:
5px
;
margin-right
:
5px
;
font-size
:
1
9
px
;
font-size
:
1
8
px
;
}
}
.award-control-icon-loading
{
.award-control-icon-loading
{
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
436ea57f
...
@@ -109,7 +109,7 @@
...
@@ -109,7 +109,7 @@
&
.title
{
&
.title
{
line-height
:
19px
;
line-height
:
19px
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
font-weight
:
600
;
font-weight
:
600
;
color
:
$gl-title-color
;
color
:
$gl-title-color
;
}
}
...
...
app/assets/stylesheets/pages/lint.scss
View file @
436ea57f
.ci-body
{
.ci-body
{
.incorrect-syntax
{
.incorrect-syntax
{
font-size
:
1
9
px
;
font-size
:
1
8
px
;
color
:
$lint-incorrect-color
;
color
:
$lint-incorrect-color
;
}
}
.correct-syntax
{
.correct-syntax
{
font-size
:
1
9
px
;
font-size
:
1
8
px
;
color
:
$lint-correct-color
;
color
:
$lint-correct-color
;
}
}
}
}
app/assets/stylesheets/pages/merge_requests.scss
View file @
436ea57f
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
h4
{
h4
{
font-size
:
1
5
px
;
font-size
:
1
4
px
;
}
}
p
{
p
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
436ea57f
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
.note-edit-form
{
.note-edit-form
{
display
:
none
;
display
:
none
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
.md-area
{
.md-area
{
background-color
:
$white-light
;
background-color
:
$white-light
;
...
...
app/assets/stylesheets/pages/projects.scss
View file @
436ea57f
...
@@ -521,7 +521,7 @@ a.deploy-project-label {
...
@@ -521,7 +521,7 @@ a.deploy-project-label {
.nav
>
li
>
a
{
.nav
>
li
>
a
{
padding
:
0
;
padding
:
0
;
background-color
:
transparent
;
background-color
:
transparent
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
line-height
:
29px
;
line-height
:
29px
;
color
:
$notes-light-color
;
color
:
$notes-light-color
;
...
...
spec/features/merge_requests/conflicts_spec.rb
View file @
436ea57f
...
@@ -20,7 +20,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
...
@@ -20,7 +20,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
within
find
(
'.files-wrapper .diff-file'
,
text:
'files/ruby/regex.rb'
)
do
within
find
(
'.files-wrapper .diff-file'
,
text:
'files/ruby/regex.rb'
)
do
all
(
'button'
,
text:
'Use ours'
).
each
do
|
button
|
all
(
'button'
,
text:
'Use ours'
).
each
do
|
button
|
button
.
click
button
.
trigger
(
'click'
)
end
end
end
end
...
...
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