Commit 34d9f34a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve select2 css to match bootstrap style

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 838bbb55
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
.select2-choice { .select2-choice {
background: #FFF; background: #FFF;
border-color: #BBB; border-color: #BBB;
padding: 6px 12px;
font-size: 13px;
line-height: 18px;
height: auto;
.select2-arrow { .select2-arrow {
background: #FFF; background: #FFF;
...@@ -10,6 +14,17 @@ ...@@ -10,6 +14,17 @@
} }
} }
.select2-container-multi .select2-choices {
@include border-radius(4px)
}
.select2-container-multi .select2-choices .select2-search-field input {
padding: 6px 12px;
font-size: 13px;
line-height: 18px;
height: auto;
}
.select2-drop-active { .select2-drop-active {
border: 1px solid #BBB !important; border: 1px solid #BBB !important;
margin-top: 4px; margin-top: 4px;
......
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
width: 100%; width: 100%;
} }
.breadcrumb {
padding: 2px 0;
}
.tree_progress { .tree_progress {
display: none; display: none;
margin: 20px; margin: 20px;
...@@ -122,9 +126,17 @@ ...@@ -122,9 +126,17 @@
} }
} }
.tree-download-holder .btn {
padding: 4px 12px;
}
.tree-ref-holder { .tree-ref-holder {
float: left; float: left;
margin-top: 8px; margin-right: 6px;
.select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice {
padding: 4px 12px;
}
} }
.readme-holder { .readme-holder {
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
.col-sm-10 .col-sm-10
= project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id) = project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id)
&nbsp; &nbsp;
= link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
.form-group .form-group
.issue-milestone .issue-milestone
= f.label :milestone_id, class: 'control-label' do = f.label :milestone_id, class: 'control-label' do
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
.col-sm-10 .col-sm-10
= project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id) = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id)
&nbsp; &nbsp;
= link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
.form-group .form-group
.issue-milestone .issue-milestone
= f.label :milestone_id, class: 'control-label' do = f.label :milestone_id, class: 'control-label' do
......
%ul.breadcrumb %ul.breadcrumb
%li %li
%i.icon-angle-right
= link_to project_tree_path(@project, @ref) do = link_to project_tree_path(@project, @ref) do
= @project.path = @project.path
- tree_breadcrumbs(tree, 6) do |title, path| - tree_breadcrumbs(tree, 6) do |title, path|
......
%div.tree-ref-holder .tree-ref-holder
= render 'shared/ref_switcher', destination: 'tree', path: @path = render 'shared/ref_switcher', destination: 'tree', path: @path
- if can? current_user, :download_code, @project - if can? current_user, :download_code, @project
= render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-small pull-right', split_button: true .tree-download-holder
%div#tree-holder.tree-holder = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-small pull-right hidden-xs', split_button: true
#tree-holder.tree-holder.clearfix
= render "tree", tree: @tree = render "tree", tree: @tree
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