BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 30815a89 by Jacob Schatz
Options

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

Reduce base font sizes across app by 1px Looking at other websites that use system fonts, the default seems to be `14px`. We currently use `15px` which feels a little too big at the moment (in my opinion). This is just an idea so feel free to close it @awhildy 😄 Before: ![Screen_Shot_2016-12-02_at_1.46.25_PM](/uploads/4e287d3e66b1fe1dbac9999978594546/Screen_Shot_2016-12-02_at_1.46.25_PM.png) After: ![Screen_Shot_2016-12-02_at_1.46.02_PM](/uploads/09aed0952c25df214e8e5fb1404d6f4f/Screen_Shot_2016-12-02_at_1.46.02_PM.png) See merge request !7905
parents 5d8c3342 436ea57f
Showing with 20 additions and 20 deletions
app/assets/stylesheets/framework/blank.scss
...@@ -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: 19px; font-size: 18px;
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: 15px; font-size: 14px;
> strong { > strong {
font-weight: 600; font-weight: 600;
......
app/assets/stylesheets/framework/common.scss
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
.slead { .slead {
color: $common-gray; color: $common-gray;
font-size: 15px; font-size: 14px;
margin-bottom: 12px; margin-bottom: 12px;
font-weight: normal; font-weight: normal;
line-height: 24px; line-height: 24px;
......
app/assets/stylesheets/framework/dropdowns.scss
...@@ -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: 15px; font-size: 14px;
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: 15px; font-size: 14px;
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: 15px; font-size: 14px;
line-height: 1; line-height: 1;
font-weight: normal; font-weight: normal;
} }
......
app/assets/stylesheets/framework/header.scss
...@@ -71,7 +71,7 @@ header { ...@@ -71,7 +71,7 @@ header {
} }
.fa-caret-down { .fa-caret-down {
font-size: 15px; font-size: 14px;
} }
} }
...@@ -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: 19px; font-size: 18px;
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
...@@ -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: 15px; font-size: 14px;
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
...@@ -102,7 +102,7 @@ $well-light-text-color: #5b6169; ...@@ -102,7 +102,7 @@ $well-light-text-color: #5b6169;
/* /*
* Text * Text
*/ */
$gl-font-size: 15px; $gl-font-size: 14px;
$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: 15px; $issue-boards-font-size: 14px;
$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
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
} }
span { span {
font-size: 19px; font-size: 18px;
} }
} }
} }
......
app/assets/stylesheets/pages/awards.scss
...@@ -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: 19px; font-size: 18px;
} }
.award-control-icon-loading { .award-control-icon-loading {
......
app/assets/stylesheets/pages/cycle_analytics.scss
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
&.title { &.title {
line-height: 19px; line-height: 19px;
font-size: 15px; font-size: 14px;
font-weight: 600; font-weight: 600;
color: $gl-title-color; color: $gl-title-color;
} }
......
app/assets/stylesheets/pages/lint.scss
.ci-body { .ci-body {
.incorrect-syntax { .incorrect-syntax {
font-size: 19px; font-size: 18px;
color: $lint-incorrect-color; color: $lint-incorrect-color;
} }
.correct-syntax { .correct-syntax {
font-size: 19px; font-size: 18px;
color: $lint-correct-color; color: $lint-correct-color;
} }
} }
app/assets/stylesheets/pages/merge_requests.scss
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
h4 { h4 {
font-size: 15px; font-size: 14px;
} }
p { p {
......
app/assets/stylesheets/pages/note_form.scss
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
.note-edit-form { .note-edit-form {
display: none; display: none;
font-size: 15px; font-size: 14px;
.md-area { .md-area {
background-color: $white-light; background-color: $white-light;
......
app/assets/stylesheets/pages/projects.scss
...@@ -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: 15px; font-size: 14px;
line-height: 29px; line-height: 29px;
color: $notes-light-color; color: $notes-light-color;
......
spec/features/merge_requests/conflicts_spec.rb
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment