Download as
Browse Code »

Commit 34d9f34a61bc20f1dec9e6ad504e08835716bd66

Authored by Dmitriy Zaporozhets
1 parent 838bbb55
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Improve select2 css to match bootstrap style 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 6 changed files with 36 additions and 7 deletions   Show diff stats
app/assets/stylesheets/generic/selects.scss
  Diff comments   View file @34d9f34
@@ -3,6 +3,10 @@ @@ -3,6 +3,10 @@
3 .select2-choice { 3 .select2-choice {
4 background: #FFF; 4 background: #FFF;
5 border-color: #BBB; 5 border-color: #BBB;
  6 + padding: 6px 12px;
  7 + font-size: 13px;
  8 + line-height: 18px;
  9 + height: auto;
6 10
7 .select2-arrow { 11 .select2-arrow {
8 background: #FFF; 12 background: #FFF;
@@ -10,6 +14,17 @@ @@ -10,6 +14,17 @@
10 } 14 }
11 } 15 }
12 16
  17 +.select2-container-multi .select2-choices {
  18 + @include border-radius(4px)
  19 +}
  20 +
  21 +.select2-container-multi .select2-choices .select2-search-field input {
  22 + padding: 6px 12px;
  23 + font-size: 13px;
  24 + line-height: 18px;
  25 + height: auto;
  26 +}
  27 +
13 .select2-drop-active { 28 .select2-drop-active {
14 border: 1px solid #BBB !important; 29 border: 1px solid #BBB !important;
15 margin-top: 4px; 30 margin-top: 4px;
app/assets/stylesheets/sections/tree.scss
  Diff comments   View file @34d9f34
@@ -4,6 +4,10 @@ @@ -4,6 +4,10 @@
4 width: 100%; 4 width: 100%;
5 } 5 }
6 6
  7 + .breadcrumb {
  8 + padding: 2px 0;
  9 + }
  10 +
7 .tree_progress { 11 .tree_progress {
8 display: none; 12 display: none;
9 margin: 20px; 13 margin: 20px;
@@ -122,9 +126,17 @@ @@ -122,9 +126,17 @@
122 } 126 }
123 } 127 }
124 128
  129 +.tree-download-holder .btn {
  130 + padding: 4px 12px;
  131 +}
  132 +
125 .tree-ref-holder { 133 .tree-ref-holder {
126 float: left; 134 float: left;
127 - margin-top: 8px; 135 + margin-right: 6px;
  136 +
  137 + .select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice {
  138 + padding: 4px 12px;
  139 + }
128 } 140 }
129 141
130 .readme-holder { 142 .readme-holder {
app/views/projects/issues/_form.html.haml
  Diff comments   View file @34d9f34
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 .col-sm-10 35 .col-sm-10
36 = project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id) 36 = project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id)
37 &nbsp; 37 &nbsp;
38 - = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' 38 + = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
39 .form-group 39 .form-group
40 .issue-milestone 40 .issue-milestone
41 = f.label :milestone_id, class: 'control-label' do 41 = f.label :milestone_id, class: 'control-label' do
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @34d9f34
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 .col-sm-10 37 .col-sm-10
38 = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id) 38 = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id)
39 &nbsp; 39 &nbsp;
40 - = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' 40 + = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
41 .form-group 41 .form-group
42 .issue-milestone 42 .issue-milestone
43 = f.label :milestone_id, class: 'control-label' do 43 = f.label :milestone_id, class: 'control-label' do
app/views/projects/tree/_tree.html.haml
  Diff comments   View file @34d9f34
1 %ul.breadcrumb 1 %ul.breadcrumb
2 %li 2 %li
3 - %i.icon-angle-right  
4 = link_to project_tree_path(@project, @ref) do 3 = link_to project_tree_path(@project, @ref) do
5 = @project.path 4 = @project.path
6 - tree_breadcrumbs(tree, 6) do |title, path| 5 - tree_breadcrumbs(tree, 6) do |title, path|
app/views/projects/tree/show.html.haml
  Diff comments   View file @34d9f34
1 -%div.tree-ref-holder 1 +.tree-ref-holder
2 = render 'shared/ref_switcher', destination: 'tree', path: @path 2 = render 'shared/ref_switcher', destination: 'tree', path: @path
  3 +
3 - if can? current_user, :download_code, @project 4 - if can? current_user, :download_code, @project
4 - = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-small pull-right', split_button: true  
5 -%div#tree-holder.tree-holder 5 + .tree-download-holder
  6 + = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-small pull-right hidden-xs', split_button: true
  7 +
  8 +#tree-holder.tree-holder.clearfix
6 = render "tree", tree: @tree 9 = render "tree", tree: @tree