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

Merge branch 'font-size-14' into 'master'

Browse source 
Font size 14px

Increase base font size from 13 to 14px. We already have it in most of ui elements so no need to duplicate `font-size: 14px` everywhere - just change base variable

See merge request !1663
This commit is contained in:
Dmitriy Zaporozhets 2015-03-10 01:46:21 +00:00
commit f6113c2818
13 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/base/gl_variables.scss
View file

@ -99,7 +99,7 @@ $font-size-base: $gl-font-size;
//
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
$padding-base-vertical: 8px;
$padding-base-vertical: 6px;
$padding-base-horizontal: 14px;
// $padding-large-vertical: 10px

2
app/assets/stylesheets/base/variables.scss
View file

@ -3,7 +3,7 @@ $hover: #FFF3EB;
$box_bg: #F9F9F9;
$gl-link-color: #446e9b;
$nprogress-color: #c0392b;
$gl-font-size: 13px;
$gl-font-size: 14px;
$list-font-size: 15px;
$sidebar_width: 230px;
$avatar_radius: 50%;

2
app/assets/stylesheets/generic/common.scss
View file

@ -24,7 +24,7 @@
.slead {
color: #666;
font-size: 14px;
font-size: 15px;
margin-bottom: 12px;
font-weight: normal;
line-height: 24px;

2
app/assets/stylesheets/generic/markdown_area.scss
View file

@ -57,7 +57,6 @@
border: 1px solid #ddd;
min-height: 100px;
padding: 5px;
font-size: 14px;
box-shadow: none;
}
@ -83,7 +82,6 @@
border: 1px solid #ddd;
min-height: 100px;
padding: 5px;
font-size: 14px;
box-shadow: none;
width: 100%;
}

2
app/assets/stylesheets/generic/nav_sidebar.scss
View file

@ -154,7 +154,7 @@
.collapse-nav a {
position: fixed;
top: 47px;
top: 46px;
padding: 5px 13px 3px 13px;
left: 197px;
background: #EEE;

4
app/assets/stylesheets/generic/selects.scss
View file

@ -4,10 +4,8 @@
background: #FFF;
border-color: #BBB;
padding: 6px 14px;
font-size: 13px;
line-height: 18px;
line-height: 1.42857143;
height: auto;
margin: 2px 0;
.select2-arrow {
background: #FFF;

9
app/assets/stylesheets/pages/commit.scss
View file

@ -45,15 +45,6 @@
}
}
.commit-committer-link,
.commit-author-link {
font-size: 13px;
color: #555;
&:hover {
color: #999;
}
}
.commit-box {
margin: 10px 0;
border-top: 1px solid #ddd;

1
app/assets/stylesheets/pages/commits.scss
View file

@ -100,6 +100,7 @@ li.commit {
.commit-row-info {
color: #777;
line-height: 24px;
font-size: 13px;
a {
color: #777;

4
app/assets/stylesheets/pages/events.scss
View file

@ -53,6 +53,7 @@
}
}
.event-body {
font-size: 13px;
margin-left: 35px;
margin-right: 80px;
color: #777;
@ -184,11 +185,10 @@
}
.event_filter {
li a {
font-size: 13px;
padding: 5px 10px;
background: rgba(0,0,0,0.045);
margin-left: 4px;
}
}

2
app/assets/stylesheets/pages/help.scss
View file

@ -12,7 +12,6 @@
color: #888;
a {
font-size: 14px;
margin-right: 3px;
}
}
@ -29,7 +28,6 @@
th {
padding-top: 15px;
font-size: 14px;
line-height: 1.5;
color: #333;
text-align: left

1
app/assets/stylesheets/pages/issues.scss
View file

@ -11,6 +11,7 @@
.issue-info {
color: #999;
font-size: 13px;
}
.issue-check {

1
app/assets/stylesheets/pages/merge_requests.scss
View file

@ -96,6 +96,7 @@
.merge-request-info {
color: #999;
font-size: 13px;
.merge-request-labels {
display: inline-block;

11
app/assets/stylesheets/pages/notes.scss
View file

@ -38,13 +38,11 @@ ul.notes {
.author {
color: #333;
font-weight: bold;
font-size: 14px;
&:hover {
color: $gl-link-color;
}
}
.author-username {
font-size: 14px;
}
}
@ -57,9 +55,6 @@ ul.notes {
.note {
display: block;
position:relative;
.attachment {
font-size: 14px;
}
.note-body {
overflow: auto;
.note-text {
@ -184,6 +179,7 @@ ul.notes {
margin-left: -60px;
position: absolute;
z-index: 10;
width: 32px;
transition: all 0.2s ease;
@ -192,8 +188,9 @@ ul.notes {
filter: alpha(opacity=0);
&:hover {
font-size: 24px;
background: $gl-primary;
width: 38px;
font-size: 20px;
background: $gl-info;
color: #FFF;
@include show-add-diff-note;
}