summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/assets/stylesheets/generic/forms.scss4
-rw-r--r--app/assets/stylesheets/gl_bootstrap.scss45
-rw-r--r--app/assets/stylesheets/sections/merge_requests.scss17
-rw-r--r--app/assets/stylesheets/sections/profile.scss2
-rw-r--r--app/assets/stylesheets/sections/projects.scss4
-rw-r--r--app/views/admin/groups/index.html.haml2
-rw-r--r--app/views/groups/_new_group_member.html.haml2
-rw-r--r--app/views/layouts/_head_panel.html.haml7
-rw-r--r--app/views/profiles/notifications/_settings.html.haml4
-rw-r--r--app/views/profiles/notifications/show.html.haml4
-rw-r--r--app/views/projects/_home_panel.html.haml26
-rw-r--r--app/views/projects/_settings_nav.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_mr_accept.html.haml62
-rw-r--r--app/views/projects/milestones/index.html.haml2
-rw-r--r--app/views/projects/milestones/show.html.haml2
-rw-r--r--app/views/projects/show.html.haml4
-rw-r--r--app/views/public/projects/index.html.haml2
-rw-r--r--features/steps/group/group.rb2
18 files changed, 123 insertions, 70 deletions
diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss
index 4f80a8a983b..931b75a3234 100644
--- a/app/assets/stylesheets/generic/forms.scss
+++ b/app/assets/stylesheets/generic/forms.scss
@@ -47,3 +47,7 @@ label {
.input-mx-250 {
max-width: 250px;
}
+
+.input-mn-300 {
+ min-width: 300px;
+}
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 5c5e3929028..44b76c7d834 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.scss
@@ -127,3 +127,48 @@
padding: 6px 9px;
}
}
+
+/*
+ * Callouts from Bootstrap3 docs
+ *
+ * Not quite alerts, but custom and helpful notes for folks reading the docs.
+ * Requires a base and modifier class.
+ */
+
+/* Common styles for all types */
+.bs-callout {
+ margin: 20px 0;
+ padding: 20px;
+ border-left: 3px solid #eee;
+ color: #666;
+ background: #f9f9f9;
+}
+.bs-callout h4 {
+ margin-top: 0;
+ margin-bottom: 5px;
+}
+.bs-callout p:last-child {
+ margin-bottom: 0;
+}
+
+/* Variations */
+.bs-callout-danger {
+ background-color: #fdf7f7;
+ border-color: #eed3d7;
+ color: #b94a48;
+}
+.bs-callout-warning {
+ background-color: #faf8f0;
+ border-color: #faebcc;
+ color: #8a6d3b;
+}
+.bs-callout-info {
+ background-color: #f4f8fa;
+ border-color: #bce8f1;
+ color: #34789a;
+}
+.bs-callout-success {
+ background-color: #dff0d8;
+ border-color: #5cA64d;
+ color: #3c763d;
+}
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 4dc67f1080b..b7f7c61597f 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -4,10 +4,6 @@
*
*/
.automerge_widget {
- &.can_be_merged {
- background: #DFF0D8;
- }
-
form {
margin-bottom: 0;
.clearfix {
@@ -16,10 +12,10 @@
}
.accept-group {
- }
-
- .how_to_merge_link {
- @extend .primary;
+ label {
+ margin: 5px;
+ margin-left: 20px;
+ }
}
}
@@ -33,11 +29,6 @@
}
}
-.merge-in-progress {
- @extend .padded;
- @extend .append-bottom-10;
-}
-
.mr_source_commit,
.mr_target_commit {
.commit {
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss
index 83dc80e1ba5..c5a90e2fdc4 100644
--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -1,6 +1,6 @@
.update-notifications {
.radio-inline {
- margin-right: 30px;
+ margin-right: 9%;
}
}
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 6142cbf9b32..b565b2bdaac 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -16,7 +16,7 @@
.project-home-panel {
border-bottom: 1px solid #DDD;
- padding-bottom: 25px;
+ padding-bottom: 15px;
margin-bottom: 30px;
&.empty-project {
@@ -41,12 +41,14 @@
.project-home-desc {
float: left;
color: #777;
+ margin-bottom: 10px;
}
.project-home-links {
float: right;
a {
margin-left: 10px;
+ font-weight: 500;
}
}
}
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 71a0004179c..7a373ee586c 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -8,7 +8,7 @@
%br
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
.form-group
- = text_field_tag :name, params[:name], class: "form-control input-xpadding"
+ = text_field_tag :name, params[:name], class: "form-control input-mn-300"
= submit_tag "Search", class: "btn submit btn-primary"
%hr
diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml
index a0dd4fbb595..54e010ad2d9 100644
--- a/app/views/groups/_new_group_member.html.haml
+++ b/app/views/groups/_new_group_member.html.haml
@@ -1,4 +1,4 @@
-= form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal' } do |f|
+= form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
%h4.append-bottom-20
New member(s) for
%strong #{@group.name}
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index ee97f865371..f303e45094a 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -8,6 +8,10 @@
%span.separator
%h1.project_name= title
+ %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
+ %span.sr-only Toggle navigation
+ %i.icon-reorder
+
.navbar-collapse.collapse
%ul.nav.navbar-nav
%li
@@ -17,6 +21,9 @@
Loading...
%li.hidden-sm
= render "layouts/search"
+ %li.visible-sm
+ = link_to search_path, title: "Search", class: 'has_bottom_tooltip', 'data-original-title' => 'Search area' do
+ %i.icon-search
%li
= link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.icon-globe
diff --git a/app/views/profiles/notifications/_settings.html.haml b/app/views/profiles/notifications/_settings.html.haml
index ab64d8303a4..d123b8f9407 100644
--- a/app/views/profiles/notifications/_settings.html.haml
+++ b/app/views/profiles/notifications/_settings.html.haml
@@ -1,6 +1,6 @@
%li
.row
- .col-md-4
+ .col-sm-4
%span
= notification_icon(notification)
@@ -8,7 +8,7 @@
= link_to membership.group.name, membership.group
- else
= link_to_project(membership.project)
- .col-md-7
+ .col-sm-8
= form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
= hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type')
= hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id')
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index ecec8f7b384..878d7f77430 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -18,11 +18,11 @@
– You will receive all notifications from projects in which you participate
.row
- .col-md-4
+ .col-sm-4
%h4
= notification_icon(@notification)
Global setting
- .col-md-7
+ .col-sm-8
= form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
= hidden_field_tag :notification_type, 'global'
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 6ac56a192ef..56af6722dc3 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -14,17 +14,19 @@
.form-horizontal
= render "shared/clone_panel"
- .project-home-extra.clearfix.row
- .project-home-desc.col-md-8
- - if @project.description.present?
- = @project.description
- - if can?(current_user, :admin_project, @project)
- –
- %strong= link_to 'Edit', edit_project_path
+ .project-home-extra.row
+ .col-md-8
+ .project-home-desc
+ - if @project.description.present?
+ = @project.description
+ - if can?(current_user, :admin_project, @project)
+ –
+ %strong= link_to 'Edit', edit_project_path
- unless empty_repo
- .project-home-links
- = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
- = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
- = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
- %span.light.prepend-left-20= repository_size
+ .col-md-4
+ .project-home-links
+ = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
+ = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
+ = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
+ %span.light.prepend-left-20= repository_size
diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml
index f59e2871aa3..48e7181931f 100644
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
@@ -1,4 +1,4 @@
-%ul.nav.nav-pills.nav-stacked.nav-stacked-menu
+%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20
= nav_link(path: 'projects#edit') do
= link_to edit_project_path(@project), class: "stat-tab tab " do
%i.icon-edit
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 2d8c7449fd2..d210d4667fd 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -1,53 +1,55 @@
- unless @allowed_to_merge
- .alert
+ .bs-callout
%strong You don't have permission to merge this MR
- if @show_merge_controls
- .automerge_widget.can_be_merged{style: "display:none"}
- .alert.alert-success
- %span
- = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
- %p
- You can accept this request automatically.
- If you still want to do it manually -
- %strong
- = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
- for instructions
- .accept-group
+ .automerge_widget.can_be_merged.hide
+ .bs-callout.bs-callout-success.clearfix
+ = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
+ %h4
+ You can accept this request automatically.
+ %p
+ If you still want to do it manually -
+ %strong
+ = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
+ for instructions
+ .accept-group
+ .pull-left
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
- - unless @merge_request.disallow_source_branch_removal?
- .remove_branch_holder
- = label_tag :should_remove_source_branch, class: "checkbox" do
- = check_box_tag :should_remove_source_branch
- Remove source-branch
- .clearfix
+ - unless @merge_request.disallow_source_branch_removal?
+ .remove_branch_holder.pull-left
+ = label_tag :should_remove_source_branch, class: "checkbox" do
+ = check_box_tag :should_remove_source_branch
+ Remove source-branch
- .automerge_widget.no_satellite{style: "display:none"}
- .alert.alert-danger
+ .automerge_widget.no_satellite.hide
+ .bs-callout.bs-callout-danger
%span
%strong This repository does not have satellite. Ask an administrator to fix this issue
- .automerge_widget.cannot_be_merged{style: "display:none"}
- .alert.alert-disabled
+ .automerge_widget.cannot_be_merged.hide
+ .bs-callout.bs-callout-disabled
+ %h4
+ This request can't be merged with GitLab.
%span
- = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"
-  
- %strong This request can't be merged with GitLab. You should do it manually
+ You should do it manually with
+ %strong
+ = link_to "command line", "#modal_merge_info", class: "how_to_merge_link", title: "How To Merge", "data-toggle" => "modal"
.automerge_widget.unchecked
- .alert.alert-warning
+ .bs-callout.bs-callout-warning
%strong
- %i.icon-refresh
+ %i.icon-refresh.icon-spin
Checking for ability to automatically merge…
- .automerge_widget.already_cannot_be_merged{style: "display:none"}
- .alert.alert-info
+ .automerge_widget.already_cannot_be_merged.hide
+ .bs-callout.bs-callout-info
%strong This merge request already can not be merged. Try to reload page.
.merge-in-progress.hide
- %span.cgray
+ .bs-callout.bs-callout-success
%i.icon-refresh.icon-spin
 
Merge is in progress. Please wait. Page will be automatically reloaded.  
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index cc71434af23..6cfe4d28778 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -8,7 +8,7 @@
New Milestone
.row
- .col-md-3
+ .col-md-3.hidden-sm
%ul.nav.nav-pills.nav-stacked
%li{class: ("active" if (params[:f] == "active" || !params[:f]))}
= link_to project_milestones_path(@project, f: "active") do
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index df65298d4df..e7c3785c056 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -49,7 +49,7 @@
= markdown @milestone.description
-%ul.nav.nav-tabs
+%ul.nav.nav-tabs.append-bottom-10
%li.active
= link_to '#tab-issues', 'data-toggle' => 'tab' do
Issues
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index dd3574c4553..e188d365903 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,12 +1,12 @@
= render "home_panel"
.row
- .col-md-9.hidden-sm
+ .col-md-9
= render "events/event_last_push", event: @last_push
= render 'shared/event_filter'
.content_list
.loading.hide
- .col-md-3.project-side
+ .col-md-3.project-side.hidden-sm
.clearfix
- if @project.archived?
.alert
diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml
index d511a3037aa..2fc93c5b742 100644
--- a/app/views/public/projects/index.html.haml
+++ b/app/views/public/projects/index.html.haml
@@ -7,7 +7,7 @@
.pull-left
= form_tag public_projects_path, method: :get, class: 'form-inline form-tiny' do |f|
.form-group
- = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input", id: "projects_search"
+ = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "projects_search"
.form-group
= submit_tag 'Search', class: "btn btn-primary wide"
diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb
index 99ec77a7613..bcadf21c233 100644
--- a/features/steps/group/group.rb
+++ b/features/steps/group/group.rb
@@ -40,7 +40,7 @@ class Groups < Spinach::FeatureSteps
And 'I select user "John" from list with role "Reporter"' do
user = User.find_by_name("John")
- within ".new_users_group" do
+ within ".users-group-form" do
select2(user.id, from: "#user_ids", multiple: true)
select "Reporter", from: "group_access"
end
View Lorry Controller Status