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
Kazuhiko Shiozaki
gitlab-ce
Commits
a9872799
Commit
a9872799
authored
Jan 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mobile-fixes' into 'master'
Mobile fixes See merge request !1403
parents
67b42e26
03a669d8
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
42 deletions
+43
-42
app/assets/stylesheets/generic/mobile.scss
app/assets/stylesheets/generic/mobile.scss
+33
-1
app/assets/stylesheets/sections/nav_sidebar.scss
app/assets/stylesheets/sections/nav_sidebar.scss
+8
-12
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+0
-14
app/views/projects/_issues_nav.html.haml
app/views/projects/_issues_nav.html.haml
+0
-11
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/shared/_milestones_filter.html.haml
app/views/shared/_milestones_filter.html.haml
+1
-3
No files found.
app/assets/stylesheets/generic/mobile.scss
View file @
a9872799
/** Common mobile (screen XS) styles **/
/** Common mobile (screen XS
, SM
) styles **/
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
.container
.content
{
.container
.content
{
margin-top
:
20px
;
margin-top
:
20px
;
...
@@ -13,5 +13,37 @@
...
@@ -13,5 +13,37 @@
display
:
none
;
display
:
none
;
}
}
}
}
.issues-filters
,
.dash-projects-filters
,
.check-all-holder
{
display
:
none
;
}
.rss-btn
{
display
:
none
!
important
;
}
.project-home-panel
{
.star-fork-buttons
{
padding-top
:
10px
;
padding-right
:
15px
;
}
}
.project-home-links
{
display
:
none
;
}
}
}
@media
(
max-width
:
$screen-sm-max
)
{
.issues-filters
{
.milestone-filter
,
.labels-filter
{
display
:
none
;
}
}
.page-title
.new-issue-link
{
display
:
none
;
}
}
app/assets/stylesheets/sections/nav_sidebar.scss
View file @
a9872799
.page-with-sidebar
{
.page-with-sidebar
{
background
:
#F5F5F5
;
background
:
#F5F5F5
;
.sidebar-wrapper
{
position
:
fixed
;
top
:
0
;
left
:
0
;
height
:
100%
;
border-right
:
1px
solid
#EAEAEA
;
}
}
}
.sidebar-wrapper
{
.sidebar-wrapper
{
...
@@ -97,11 +105,6 @@
...
@@ -97,11 +105,6 @@
.sidebar-wrapper
{
.sidebar-wrapper
{
width
:
250px
;
width
:
250px
;
position
:
fixed
;
left
:
250px
;
height
:
100%
;
margin-left
:
-250px
;
border-right
:
1px
solid
#EAEAEA
;
.nav-sidebar
{
.nav-sidebar
{
margin-top
:
20px
;
margin-top
:
20px
;
...
@@ -123,11 +126,6 @@
...
@@ -123,11 +126,6 @@
.sidebar-wrapper
{
.sidebar-wrapper
{
width
:
52px
;
width
:
52px
;
position
:
fixed
;
top
:
0
;
left
:
0
;
height
:
100%
;
border-right
:
1px
solid
#EAEAEA
;
overflow-x
:
hidden
;
overflow-x
:
hidden
;
.nav-sidebar
{
.nav-sidebar
{
...
@@ -157,5 +155,3 @@
...
@@ -157,5 +155,3 @@
@media
(
min-width
:
$screen-sm-max
)
{
@media
(
min-width
:
$screen-sm-max
)
{
@include
expanded-sidebar
;
@include
expanded-sidebar
;
}
}
app/assets/stylesheets/sections/projects.scss
View file @
a9872799
...
@@ -296,20 +296,6 @@ ul.nav.nav-projects-tabs {
...
@@ -296,20 +296,6 @@ ul.nav.nav-projects-tabs {
}
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
.project-home-panel
{
.star-fork-buttons
{
padding-top
:
10px
;
padding-right
:
15px
;
}
}
.project-home-links
{
display
:
none
;
}
}
table
.table.protected-branches-list
tr
.no-border
{
table
.table.protected-branches-list
tr
.no-border
{
th
,
td
{
th
,
td
{
border
:
0
;
border
:
0
;
...
...
app/views/projects/_issues_nav.html.haml
View file @
a9872799
...
@@ -19,11 +19,6 @@
...
@@ -19,11 +19,6 @@
Labels
Labels
-
if
current_controller?
(
:milestones
)
%li
.pull-right
%button
.btn.btn-default.sidebar-expand-button
%i
.icon.fa.fa-list
-
if
current_controller?
(
:issues
)
-
if
current_controller?
(
:issues
)
-
if
current_user
-
if
current_user
%li
.hidden-xs
%li
.hidden-xs
...
@@ -32,9 +27,6 @@
...
@@ -32,9 +27,6 @@
%li
.pull-right
%li
.pull-right
.pull-right
.pull-right
%button
.btn.btn-default.sidebar-expand-button
%i
.icon.fa.fa-list
.pull-left
.pull-left
=
form_tag
project_issues_path
(
@project
),
method: :get
,
id:
"issue_search_form"
,
class:
'pull-left issue-search-form'
do
=
form_tag
project_issues_path
(
@project
),
method: :get
,
id:
"issue_search_form"
,
class:
'pull-left issue-search-form'
do
.append-right-10.hidden-xs.hidden-sm
.append-right-10.hidden-xs.hidden-sm
...
@@ -53,9 +45,6 @@
...
@@ -53,9 +45,6 @@
-
if
current_controller?
(
:merge_requests
)
-
if
current_controller?
(
:merge_requests
)
%li
.pull-right
%li
.pull-right
.pull-right
.pull-right
%button
.btn.btn-default.sidebar-expand-button
%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:
"btn btn-new pull-left"
,
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
...
...
app/views/projects/issues/show.html.haml
View file @
a9872799
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
.pull-right
.pull-right
-
if
can?
(
current_user
,
:write_issue
,
@project
)
-
if
can?
(
current_user
,
:write_issue
,
@project
)
=
link_to
new_project_issue_path
(
@project
),
class:
"btn btn-grouped"
,
title:
"New Issue"
,
id:
"new_issue_link"
do
=
link_to
new_project_issue_path
(
@project
),
class:
"btn btn-grouped
new-issue-link
"
,
title:
"New Issue"
,
id:
"new_issue_link"
do
%i
.fa.fa-plus
%i
.fa.fa-plus
New Issue
New Issue
-
if
can?
(
current_user
,
:modify_issue
,
@issue
)
-
if
can?
(
current_user
,
:modify_issue
,
@issue
)
...
...
app/views/shared/_milestones_filter.html.haml
View file @
a9872799
.fixed.sidebar-expand-button.hidden-lg.hidden-md
.milestones-filters.append-bottom-10
%i
.fa.fa-list.fa-2x
.responsive-side.milestones-filters.append-bottom-10
%ul
.nav.nav-pills.nav-compact
%ul
.nav.nav-pills.nav-compact
%li
{
class:
(
"active"
if
params
[
:state
].
blank?
||
params
[
:state
]
==
'opened'
)}
%li
{
class:
(
"active"
if
params
[
:state
].
blank?
||
params
[
:state
]
==
'opened'
)}
=
link_to
milestones_filter_path
(
state:
'opened'
)
do
=
link_to
milestones_filter_path
(
state:
'opened'
)
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