diff options
-rw-r--r-- | app/assets/stylesheets/generic/selects.scss | 15 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/tree.scss | 14 | ||||
-rw-r--r-- | app/views/projects/issues/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/tree/_tree.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/tree/show.html.haml | 9 |
6 files changed, 36 insertions, 7 deletions
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss index 03597c1fc7d..681f38716fb 100644 --- a/app/assets/stylesheets/generic/selects.scss +++ b/app/assets/stylesheets/generic/selects.scss @@ -3,6 +3,10 @@ .select2-choice { background: #FFF; border-color: #BBB; + padding: 6px 12px; + font-size: 13px; + line-height: 18px; + height: auto; .select2-arrow { background: #FFF; @@ -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 { border: 1px solid #BBB !important; margin-top: 4px; diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index b0ce78ddb35..c019b626728 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -4,6 +4,10 @@ width: 100%; } + .breadcrumb { + padding: 2px 0; + } + .tree_progress { display: none; margin: 20px; @@ -122,9 +126,17 @@ } } +.tree-download-holder .btn { + padding: 4px 12px; +} + .tree-ref-holder { float: left; - margin-top: 8px; + margin-right: 6px; + + .select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice { + padding: 4px 12px; + } } .readme-holder { diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index 73cbb79665a..d29a7973100 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -35,7 +35,7 @@ .col-sm-10 = project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id) - = 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 .issue-milestone = f.label :milestone_id, class: 'control-label' do diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index b0e7aa6084a..9ef232b5268 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -37,7 +37,7 @@ .col-sm-10 = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id) - = 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 .issue-milestone = f.label :milestone_id, class: 'control-label' do diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml index 49c9edffc66..f049aa58e06 100644 --- a/app/views/projects/tree/_tree.html.haml +++ b/app/views/projects/tree/_tree.html.haml @@ -1,6 +1,5 @@ %ul.breadcrumb %li - %i.icon-angle-right = link_to project_tree_path(@project, @ref) do = @project.path - tree_breadcrumbs(tree, 6) do |title, path| diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml index 735ffae9e2c..1ef3020f35f 100644 --- a/app/views/projects/tree/show.html.haml +++ b/app/views/projects/tree/show.html.haml @@ -1,6 +1,9 @@ -%div.tree-ref-holder +.tree-ref-holder = render 'shared/ref_switcher', destination: 'tree', path: @path + - if can? current_user, :download_code, @project - = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-small pull-right', split_button: true -%div#tree-holder.tree-holder + .tree-download-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 |