UI improvements mostly for mobile screens

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-12-02 11:31:57 +02:00
parent 5b92ddb809
commit 4cbe72d767
No known key found for this signature in database
GPG Key ID: 161B5D6A44D3D88A
11 changed files with 45 additions and 17 deletions

View File

@ -75,3 +75,20 @@
} }
} }
} }
@media (max-width: $screen-xs-max) {
.timeline {
&:before {
background: none;
}
.timeline-entry .timeline-entry-inner {
.timeline-icon {
display: none;
}
.timeline-content {
margin-left: 0;
}
}
}
}

View File

@ -151,4 +151,14 @@ form.edit-issue {
} }
} }
} }
.issue {
&:hover .issue-actions {
display: none !important;
}
.issue-updated-at {
display: none;
}
}
} }

View File

@ -36,13 +36,16 @@ ul.notes {
font-size: 13px; font-size: 13px;
} }
.author { .author {
color: #555; color: #333;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
&:hover { &:hover {
color: $link_hover_color; color: $link_color;
} }
} }
.author-username {
font-size: 14px;
}
} }
.discussion { .discussion {

View File

@ -2,7 +2,7 @@
- if project_nav_tab? :issues - if project_nav_tab? :issues
= nav_link(controller: :issues) do = nav_link(controller: :issues) do
= link_to project_issues_path(@project), class: "tab" do = link_to project_issues_path(@project), class: "tab" do
Browse Issues Issues
- if project_nav_tab? :merge_requests - if project_nav_tab? :merge_requests
= nav_link(controller: :merge_requests) do = nav_link(controller: :merge_requests) do
= link_to project_merge_requests_path(@project), class: "tab" do = link_to project_merge_requests_path(@project), class: "tab" do
@ -19,7 +19,7 @@
- if current_controller?(:issues) - if current_controller?(:issues)
- if current_user - if current_user
%li %li.hidden-xs
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
%i.fa.fa-rss %i.fa.fa-rss
@ -45,8 +45,8 @@
.pull-right .pull-right
%button.btn.btn-default.sidebar-expand-button %button.btn.btn-default.sidebar-expand-button
%i.icon.fa.fa-list %i.icon.fa.fa-list
- if can? current_user, :write_merge_request, @project - if can? current_user, :write_merge_request, @project
= link_to new_project_merge_request_path(@project), class: "pull-right btn btn-new", title: "New Merge Request" do = link_to new_project_merge_request_path(@project), class: "btn btn-new pull-left", title: "New Merge Request" do
%i.fa.fa-plus %i.fa.fa-plus
New Merge Request New Merge Request

View File

@ -28,7 +28,7 @@
%span.task-status %span.task-status
= issue.task_status = issue.task_status
.pull-right .pull-right.issue-updated-at
%small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')} %small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')}
.issue-labels .issue-labels

View File

@ -7,7 +7,7 @@
%i.fa.fa-check %i.fa.fa-check
MERGED MERGED
- else - else
%span.pull-right %span.pull-right.hidden-xs
- if merge_request.for_fork? - if merge_request.for_fork?
%span.light %span.light
#{merge_request.source_project_namespace}: #{merge_request.source_project_namespace}:
@ -31,7 +31,7 @@
%span.task-status %span.task-status
= merge_request.task_status = merge_request.task_status
.pull-right .pull-right.hidden-xs
%small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')} %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')}
.merge-request-labels .merge-request-labels

View File

@ -1,8 +1,6 @@
= render "projects/issues_nav" = render "projects/issues_nav"
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project), = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project),
labels: true, redirect: 'merge_requests', entity: 'merge_request' labels: true, redirect: 'merge_requests', entity: 'merge_request'

View File

@ -29,7 +29,7 @@
= yield(:note_actions) = yield(:note_actions)
%a.btn.grouped.js-close-discussion-note-form Cancel %a.btn.grouped.js-close-discussion-note-form Cancel
.note-form-option .note-form-option.hidden-xs
%a.choose-btn.btn.js-choose-note-attachment-button %a.choose-btn.btn.js-choose-note-attachment-button
%i.fa.fa-paperclip %i.fa.fa-paperclip
%span Choose File ... %span Choose File ...

View File

@ -110,7 +110,7 @@ Feature: Project Active Tab
Scenario: On Project Issues/Browse Scenario: On Project Issues/Browse
Given I visit my project's issues page Given I visit my project's issues page
Then the active sub tab should be Browse Issues Then the active sub tab should be Issues
And no other sub tabs should be active And no other sub tabs should be active
And the active main tab should be Issues And the active main tab should be Issues

View File

@ -89,8 +89,8 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
click_link('Labels') click_link('Labels')
end end
step 'the active sub tab should be Browse Issues' do step 'the active sub tab should be Issues' do
ensure_active_sub_tab('Browse Issues') ensure_active_sub_tab('Issues')
end end
step 'the active sub tab should be Milestones' do step 'the active sub tab should be Milestones' do

View File

@ -8,7 +8,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
milestone = @project.milestones.find_by(title: "v2.2") milestone = @project.milestones.find_by(title: "v2.2")
page.should have_content(milestone.title[0..10]) page.should have_content(milestone.title[0..10])
page.should have_content(milestone.expires_at) page.should have_content(milestone.expires_at)
page.should have_content("Browse Issues") page.should have_content("Issues")
end end
step 'I click link "v2.2"' do step 'I click link "v2.2"' do
@ -28,7 +28,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
milestone = @project.milestones.find_by(title: "v2.3") milestone = @project.milestones.find_by(title: "v2.3")
page.should have_content(milestone.title[0..10]) page.should have_content(milestone.title[0..10])
page.should have_content(milestone.expires_at) page.should have_content(milestone.expires_at)
page.should have_content("Browse Issues") page.should have_content("Issues")
end end
step 'project "Shop" has milestone "v2.2"' do step 'project "Shop" has milestone "v2.2"' do