diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-08-05 15:59:52 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-08-05 17:19:01 -0500 |
| commit | fe8ff714d5b4ee7270b13ebbf8586481871f4013 (patch) | |
| tree | 795d690a456b157d263561c5cdd1c1b4fc979058 | |
| parent | f9378bad06688bb4e1428d0b77debd9c6966a6ad (diff) | |
| download | gitlab-ce-fe8ff714d5b4ee7270b13ebbf8586481871f4013.tar.gz | |
Fix .panel-title style
Since .panel-heading is a bit different from bootstrap, using .panel-title for h3 looks different.
So with this .panel-title will look good again inheriting custom properties our app sets for .panel-heading
3 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss index 874416e1007..c6f30e144fd 100644 --- a/app/assets/stylesheets/framework/panels.scss +++ b/app/assets/stylesheets/framework/panels.scss @@ -23,4 +23,9 @@ margin-top: $gl-padding; } } + + .panel-title { + font-size: inherit; + line-height: inherit; + } } diff --git a/app/views/projects/protected_branches/_branches_list.html.haml b/app/views/projects/protected_branches/_branches_list.html.haml index 4e6d432f8fa..04b19a8c5a7 100644 --- a/app/views/projects/protected_branches/_branches_list.html.haml +++ b/app/views/projects/protected_branches/_branches_list.html.haml @@ -1,7 +1,8 @@ .panel.panel-default.protected-branches-list - if @protected_branches.empty? .panel-heading - %b Protected branch (#{@protected_branches.size}) + %h3.panel-title + Protected branch (#{@protected_branches.size}) %p.settings-message.text-center There are currently no protected branches, protect a branch with the form above. - else diff --git a/app/views/projects/protected_branches/_create_protected_branch.html.haml b/app/views/projects/protected_branches/_create_protected_branch.html.haml index e4319e3405d..34bc465c356 100644 --- a/app/views/projects/protected_branches/_create_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_create_protected_branch.html.haml @@ -1,7 +1,8 @@ = form_for [@project.namespace.becomes(Namespace), @project, @protected_branch] do |f| .panel.panel-default .panel-heading - %b Protect a branch + %h3.panel-title + Protect a branch .panel-body .form-horizontal .form-group |