Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
4cbe72d7
Commit
4cbe72d7
authored
Dec 02, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI improvements mostly for mobile screens
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
5b92ddb8
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
45 additions
and
17 deletions
+45
-17
app/assets/stylesheets/generic/timeline.scss
app/assets/stylesheets/generic/timeline.scss
+17
-0
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/issues.scss
+10
-0
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+5
-2
app/views/projects/_issues_nav.html.haml
app/views/projects/_issues_nav.html.haml
+4
-4
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+2
-2
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+0
-2
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+1
-1
features/project/active_tab.feature
features/project/active_tab.feature
+1
-1
features/steps/project/active_tab.rb
features/steps/project/active_tab.rb
+2
-2
features/steps/project/issues/milestones.rb
features/steps/project/issues/milestones.rb
+2
-2
No files found.
app/assets/stylesheets/generic/timeline.scss
View file @
4cbe72d7
...
@@ -75,3 +75,20 @@
...
@@ -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
;
}
}
}
}
app/assets/stylesheets/sections/issues.scss
View file @
4cbe72d7
...
@@ -151,4 +151,14 @@ form.edit-issue {
...
@@ -151,4 +151,14 @@ form.edit-issue {
}
}
}
}
}
}
.issue
{
&
:hover
.issue-actions
{
display
:
none
!
important
;
}
.issue-updated-at
{
display
:
none
;
}
}
}
}
app/assets/stylesheets/sections/notes.scss
View file @
4cbe72d7
...
@@ -36,12 +36,15 @@ ul.notes {
...
@@ -36,12 +36,15 @@ 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
;
}
}
}
}
...
...
app/views/projects/_issues_nav.html.haml
View file @
4cbe72d7
...
@@ -2,7 +2,7 @@
...
@@ -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 @@
...
@@ -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
...
@@ -47,6 +47,6 @@
...
@@ -47,6 +47,6 @@
%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
app/views/projects/issues/_issue.html.haml
View file @
4cbe72d7
...
@@ -28,7 +28,7 @@
...
@@ -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
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
4cbe72d7
...
@@ -7,7 +7,7 @@
...
@@ -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 @@
...
@@ -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
...
...
app/views/projects/merge_requests/index.html.haml
View file @
4cbe72d7
=
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'
...
...
app/views/projects/notes/_form.html.haml
View file @
4cbe72d7
...
@@ -29,7 +29,7 @@
...
@@ -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 ...
...
...
features/project/active_tab.feature
View file @
4cbe72d7
...
@@ -110,7 +110,7 @@ Feature: Project Active Tab
...
@@ -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
...
...
features/steps/project/active_tab.rb
View file @
4cbe72d7
...
@@ -89,8 +89,8 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
...
@@ -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
...
...
features/steps/project/issues/milestones.rb
View file @
4cbe72d7
...
@@ -8,7 +8,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment