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

Fix .panel-title style

Browse source 
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
This commit is contained in:
Alfredo Sumaran 2016-08-05 15:59:52 -05:00
parent f9378bad06
commit fe8ff714d5
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/framework/panels.scss
View file

@ -23,4 +23,9 @@
margin-top: $gl-padding; margin-top: $gl-padding;
} }
} }
.panel-title {
font-size: inherit;
line-height: inherit;
}
} }

3
app/views/projects/protected_branches/_branches_list.html.haml
View file

@ -1,7 +1,8 @@
.panel.panel-default.protected-branches-list .panel.panel-default.protected-branches-list
- if @protected_branches.empty? - if @protected_branches.empty?
.panel-heading .panel-heading
%b Protected branch (#{@protected_branches.size}) %h3.panel-title
Protected branch (#{@protected_branches.size})
%p.settings-message.text-center %p.settings-message.text-center
There are currently no protected branches, protect a branch with the form above. There are currently no protected branches, protect a branch with the form above.
- else - else

3
app/views/projects/protected_branches/_create_protected_branch.html.haml
View file

@ -1,7 +1,8 @@
= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch] do |f| = form_for [@project.namespace.becomes(Namespace), @project, @protected_branch] do |f|
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
%b Protect a branch %h3.panel-title
Protect a branch
.panel-body .panel-body
.form-horizontal .form-horizontal
.form-group .form-group