BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 69beca5a by Dmitriy Zaporozhets
Options

Merge branch 'ui-improvements' into 'master'

UI improvements Signed-off-by: 's avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1245
parents 8301836b aa75e76a
Showing with 56 additions and 77 deletions
app/assets/stylesheets/generic/common.scss
......@@ -398,5 +398,12 @@ table {
color: #4c4e54;
border-bottom: 2px solid #1cacfc;
}
.badge {
font-weight: normal;
background-color: #fff;
background-color: #eee;
color: #78a;
}
}
}
app/assets/stylesheets/generic/filters.scss
......@@ -2,31 +2,6 @@
margin-right: 15px;
}
.issues-state-filters {
li.active a {
border-color: #DDD !important;
&, &:hover, &:active, &.active {
background: #f5f5f5 !important;
border-bottom: 1px solid #f5f5f5 !important;
}
}
}
.issues-details-filters {
font-size: 13px;
background: #f5f5f5;
margin: -10px 0;
padding: 10px 15px;
margin-top: -15px;
border-left: 1px solid #DDD;
border-right: 1px solid #DDD;
.btn {
font-size: 13px;
}
}
@media (min-width: 800px) {
.issues-filters,
.issues_bulk_update {
......
app/assets/stylesheets/pages/issuable.scss
......@@ -45,3 +45,14 @@
.btn { font-size: 13px; }
}
.project-issuable-filter {
.controls {
float: right;
margin-top: 7px;
}
.center-top-menu {
text-align: left;
}
}
app/assets/stylesheets/pages/projects.scss
......@@ -285,7 +285,7 @@ pre.light-well {
}
.pull-right.light {
line-height: 38px;
line-height: 45px;
color: #7f8fa4;
}
......
app/views/dashboard/issues.html.haml
......@@ -4,15 +4,14 @@
- if current_user
= auto_discovery_link_tag(:atom, issues_dashboard_url(format: :atom, private_token: current_user.private_token), title: "#{current_user.name} issues")
%p.light
List all issues from all projects you have access to.
.append-bottom-20
.pull-right
- if current_user
.hidden-xs.pull-left
= link_to issues_dashboard_url(format: :atom, private_token: current_user.private_token), class: 'btn' do
.hidden-xs.pull-left.prepend-top-20
= link_to issues_dashboard_url(format: :atom, private_token: current_user.private_token), class: '' do
%i.fa.fa-rss
= render 'shared/issuable/filter', type: :issues
= render 'shared/issues'
app/views/dashboard/merge_requests.html.haml
- page_title "Merge Requests"
- header_title "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id)
%p.light
List all merge requests from all projects you have access to.
.append-bottom-20
= render 'shared/issuable/filter', type: :merge_requests
= render 'shared/merge_requests'
app/views/dashboard/milestones/index.html.haml
- page_title "Milestones"
- header_title "Milestones", dashboard_milestones_path
%p.light
List all milestones from all projects you have access to.
= render 'shared/milestones_filter'
.gray-content-block
.oneline
List all milestones from all projects you have access to.
.milestones
.panel.panel-default
%ul.well-list
- if @dashboard_milestones.blank?
%li
.nothing-here-block No milestones to show
- else
- @dashboard_milestones.each do |milestone|
= render 'milestone', milestone: milestone
%ul.content-list
- if @dashboard_milestones.blank?
%li
.nothing-here-block No milestones to show
- else
- @dashboard_milestones.each do |milestone|
= render 'milestone', milestone: milestone
= paginate @dashboard_milestones, theme: "gitlab"
app/views/projects/issues/_issues.html.haml
.panel.panel-default
%ul.well-list.issues-list
= render @issues
- if @issues.blank?
%li
.nothing-here-block No issues to show
%ul.content-list.issues-list
= render @issues
- if @issues.blank?
%li
.nothing-here-block No issues to show
- if @issues.present?
.pull-right
......
app/views/projects/issues/index.html.haml
......@@ -3,8 +3,8 @@
- if current_user
= auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
.append-bottom-10
.pull-right
.project-issuable-filter
.controls
.pull-left
- if current_user
.hidden-xs.pull-left
......
app/views/projects/merge_requests/_merge_request.html.haml
......@@ -14,11 +14,6 @@
%span
%i.fa.fa-ban
CLOSED
- else
%span.hidden-xs.hidden-sm
%span.label-branch<
%i.fa.fa-code-fork
%span= merge_request.target_branch
- note_count = merge_request.mr_and_commit_notes.user.count
- if merge_request.assignee
&nbsp;
......
app/views/projects/merge_requests/_merge_requests.html.haml
.panel.panel-default
%ul.well-list.mr-list
= render @merge_requests
- if @merge_requests.blank?
%li
.nothing-here-block No merge requests to show
%ul.content-list.mr-list
= render @merge_requests
- if @merge_requests.blank?
%li
.nothing-here-block No merge requests to show
- if @merge_requests.present?
.pull-right
......
app/views/projects/merge_requests/index.html.haml
- page_title "Merge Requests"
= render 'projects/last_push'
.append-bottom-10
.pull-right
.project-issuable-filter
.controls
= render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
- if can? current_user, :create_merge_request, @project
......
app/views/shared/_milestones_filter.html.haml
.milestones-filters.append-bottom-10
%ul.nav.nav-tabs
.milestones-filters
%ul.center-top-menu
%li{class: ("active" if params[:state].blank? || params[:state] == 'opened')}
= link_to milestones_filter_path(state: 'opened') do
%i.fa.fa-exclamation-circle
Open
%li{class: ("active" if params[:state] == 'closed')}
= link_to milestones_filter_path(state: 'closed') do
%i.fa.fa-check-circle
Closed
%li{class: ("active" if params[:state] == 'all')}
= link_to milestones_filter_path(state: 'all') do
%i.fa.fa-compass
All
app/views/shared/issuable/_filter.html.haml
.issues-filters
.issues-state-filters
%ul.nav.nav-tabs
%ul.center-top-menu
%li{class: ("active" if params[:state] == 'opened')}
= link_to page_filter_path(state: 'opened') do
= icon('exclamation-circle')
#{state_filters_text_for(:opened, @project)}
- if defined?(type) && type == :merge_requests
%li{class: ("active" if params[:state] == 'merged')}
= link_to page_filter_path(state: 'merged') do
= icon('check-circle')
#{state_filters_text_for(:merged, @project)}
%li{class: ("active" if params[:state] == 'closed')}
= link_to page_filter_path(state: 'closed') do
= icon('ban')
#{state_filters_text_for(:closed, @project)}
- else
%li{class: ("active" if params[:state] == 'closed')}
= link_to page_filter_path(state: 'closed') do
= icon('check-circle')
#{state_filters_text_for(:closed, @project)}
%li{class: ("active" if params[:state] == 'all')}
= link_to page_filter_path(state: 'all') do
= icon('compass')
#{state_filters_text_for(:all, @project)}
.issues-details-filters
.issues-details-filters.gray-content-block
= form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name]), method: :get, class: 'filter-form' do
- if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
.check-all-holder
......
features/steps/project/commits/commits.rb
......@@ -98,4 +98,8 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step 'I see inline diff button' do
expect(page).to have_content "Inline"
end
step 'I click side-by-side diff button' do
find('#parallel-diff-btn').click
end
end
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