Fix UI for pages with panels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
1ef0ac505c
commit
cf673ba9f6
|
@ -2,7 +2,13 @@
|
|||
margin-bottom: $gl-padding;
|
||||
|
||||
.panel-heading {
|
||||
padding: 7px $gl-padding;
|
||||
padding: $gl-vert-padding $gl-padding;
|
||||
line-height: 36px;
|
||||
|
||||
.controls {
|
||||
margin-top: -2px;
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
.panel-body {
|
||||
|
@ -14,7 +20,3 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-blank .panel .panel-heading {
|
||||
line-height: 42px !important;
|
||||
}
|
||||
|
|
|
@ -114,22 +114,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
.container-blank .panel .panel-heading {
|
||||
font-size: 17px;
|
||||
line-height: 38px;
|
||||
}
|
||||
|
||||
.panel {
|
||||
box-shadow: none;
|
||||
|
||||
.panel-heading {
|
||||
.panel-head-actions {
|
||||
position: relative;
|
||||
top: -5px;
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
.panel-body {
|
||||
form, pre {
|
||||
margin: 0;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
.panel.panel-default
|
||||
.panel-heading
|
||||
Public deploy keys (#{@deploy_keys.count})
|
||||
.panel-head-actions
|
||||
.controls
|
||||
= link_to 'New Deploy Key', new_admin_deploy_key_path, class: "btn btn-new btn-sm"
|
||||
- if @deploy_keys.any?
|
||||
.table-holder
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- page_title "Projects"
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
.row.prepend-top-default
|
||||
%aside.col-md-3
|
||||
.admin-filter
|
||||
= form_tag admin_namespaces_projects_path, method: :get, class: '' do
|
||||
|
@ -47,7 +47,7 @@
|
|||
.panel.panel-default
|
||||
.panel-heading
|
||||
Projects (#{@projects.total_count})
|
||||
.panel-head-actions
|
||||
.controls
|
||||
.dropdown.inline
|
||||
%button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%span.light sort:
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
- header_title group_title(@group, "Settings", edit_group_path(@group))
|
||||
- @blank_container = true
|
||||
|
||||
.panel.panel-default.prepend-top-default
|
||||
.panel-heading
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
- page_title "Members"
|
||||
- header_title group_title(@group, "Members", group_group_members_path(@group))
|
||||
- @blank_container = true
|
||||
|
||||
.group-members-page.prepend-top-default
|
||||
- if current_user && current_user.can?(:admin_group_member, @group)
|
||||
|
@ -20,7 +19,7 @@
|
|||
group members
|
||||
%small
|
||||
(#{@members.total_count})
|
||||
.pull-right
|
||||
.controls
|
||||
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do
|
||||
.form-group
|
||||
= search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control', spellcheck: false }
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
%strong= @group.name
|
||||
projects:
|
||||
- if can? current_user, :admin_group, @group
|
||||
.panel-head-actions
|
||||
.controls
|
||||
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do
|
||||
%i.fa.fa-plus
|
||||
= icon('plus')
|
||||
New Project
|
||||
%ul.well-list
|
||||
- @projects.each do |project|
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
- page_title "Account"
|
||||
- header_title page_title, profile_account_path
|
||||
- @blank_container = true
|
||||
|
||||
- if current_user.ldap_user?
|
||||
.alert.alert-info
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
%small
|
||||
(#{members.count})
|
||||
- if can?(current_user, :admin_group_member, @group)
|
||||
.pull-right
|
||||
.controls
|
||||
= link_to group_group_members_path(@group), class: 'btn' do
|
||||
= icon('pencil-square-o')
|
||||
Manage group members
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
project members
|
||||
%small
|
||||
(#{members.count})
|
||||
.pull-right
|
||||
.controls
|
||||
= form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form' do
|
||||
.form-group
|
||||
= search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control', spellcheck: false }
|
||||
|
|
|
@ -1,13 +1,12 @@
|
|||
- page_title "Members"
|
||||
= render "header_title"
|
||||
- @blank_container = true
|
||||
|
||||
.project-members-page.prepend-top-default
|
||||
- if can?(current_user, :admin_project_member, @project)
|
||||
.panel.panel-default
|
||||
.panel-heading
|
||||
Add new user to project
|
||||
.pull-right
|
||||
.controls
|
||||
= link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
|
||||
Import members
|
||||
.panel-body
|
||||
|
|
Loading…
Reference in New Issue