diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index eb19bec..3a9f42e 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -90,6 +90,7 @@ line-height: 36px; font-size: 14px; font-weight: normal; + margin: 0; > a { text-shadow: 0 1px 1px #fff; @@ -132,15 +133,6 @@ margin-bottom: 0; padding: 5px 20px; } - .middle_title { - background: #f5f5f5; - margin:20px -20px; - padding: 0 20px; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; - font-size: 14px; - color: #777; - } } .row_title { diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index e9b8568..90b041b 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -43,11 +43,8 @@ } } - &.success { - @extend .btn-success; - + &.btn-success { &:hover { - @extend .btn-success; background: #51a351; } @@ -59,7 +56,7 @@ &.btn-create { @extend .wide; - @extend .success; + @extend .btn-success; } &.btn-save { diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index 4a77e16..1d958a0 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -68,10 +68,6 @@ input[type='text'].danger { fieldset legend { font-size: 17px; } -/** PAGINATION **/ -.gitlab_pagination { -} - .tab-content { overflow: visible; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index 78a3f0b..4d42bf4 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -48,7 +48,8 @@ &.wiki { padding: 20px; - font-size: 13px; + font-size: 14px; + line-height: 1.6; .highlight { margin-bottom: 9px; diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss index 2f83ca0..c35c321 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss @@ -79,10 +79,8 @@ @mixin md-typography { code { padding: 0 4px; } p { font-size: 13px; } - h1 { font-size: 26px; line-height: 40px; margin: 10px 0;} - h2 { font-size: 22px; line-height: 40px; margin: 10px 0;} - h3 { font-size: 18px; line-height: 40px; margin: 10px 0;} - h4 { font-size: 16px; line-height: 20px; margin: 10px 0;} - h5 { font-size: 14px; line-height: 20px; margin: 10px 0;} - h6 { font-size: 12px; line-height: 20px; margin: 10px 0;} + h1 { margin-top: 30px;} + h2 { margin-top: 25px;} + h3 { margin-top: 20px;} + h4 { margin-top: 15px;} } diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index 5445810..7ea7c56 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -3,15 +3,12 @@ * */ -h1, h2, h3, h4, h5, h6 { margin: 0; } -h3, h4, h5, h6 { line-height: 36px; } -h5 { font-size: 14px; } - h3.page-title { color: #456; font-size: 20px; font-weight: normal; line-height: 28px; + margin-top: 0px; margin-bottom: 15px; } @@ -92,11 +89,10 @@ a:focus { * */ .wiki { + font-size: 14px; + line-height: 1.6; @include md-typography; - font-size: 13px; - line-height: 20px; - .white .highlight pre { background: #f5f5f5; } ul { margin: 0 0 9px 25px !important; } } diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 98c010e..c564f12 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -45,6 +45,7 @@ header { margin: 0 6px; h1 { + margin: 0; background: url('logo-black.png') no-repeat center 1px; background-size: 38px; float: left; diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index ac97f63..0750057 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -14,7 +14,7 @@ %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" for instructions .accept_group - = f.submit "Accept Merge Request", class: "btn success accept_merge_request" + = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request" - unless @project.root_ref? @merge_request.source_branch .remove_branch_holder = label_tag :should_remove_source_branch, class: "checkbox" do -- libgit2 0.21.2