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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
1760e377
Commit
1760e377
authored
Nov 05, 2017
by
Travis Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add edit button to mobile file view
parent
aa1f218a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
1 deletion
+30
-1
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+12
-0
app/views/projects/blob/_header.html.haml
app/views/projects/blob/_header.html.haml
+1
-1
changelogs/unreleased/28377-add-edit-button-to-mobile-file-view.yml
.../unreleased/28377-add-edit-button-to-mobile-file-view.yml
+5
-0
spec/features/projects/blobs/blob_show_spec.rb
spec/features/projects/blobs/blob_show_spec.rb
+12
-0
No files found.
app/assets/stylesheets/framework/files.scss
View file @
1760e377
...
@@ -364,6 +364,18 @@ span.idiff {
...
@@ -364,6 +364,18 @@ span.idiff {
float
:
none
;
float
:
none
;
}
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
display
:
block
;
.file-actions
{
white-space
:
normal
;
.btn-group
{
padding-top
:
5px
;
}
}
}
}
}
.is-stl-loading
{
.is-stl-loading
{
...
...
app/views/projects/blob/_header.html.haml
View file @
1760e377
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.js-file-title.file-title-flex-parent
.js-file-title.file-title-flex-parent
=
render
'projects/blob/header_content'
,
blob:
blob
=
render
'projects/blob/header_content'
,
blob:
blob
.file-actions
.hidden-xs
.file-actions
=
render
'projects/blob/viewer_switcher'
,
blob:
blob
unless
blame
=
render
'projects/blob/viewer_switcher'
,
blob:
blob
unless
blame
.btn-group
{
role:
"group"
}
<
.btn-group
{
role:
"group"
}
<
...
...
changelogs/unreleased/28377-add-edit-button-to-mobile-file-view.yml
0 → 100644
View file @
1760e377
---
title
:
Add edit button to mobile file view
merge_request
:
15199
author
:
Travis Miller
type
:
added
spec/features/projects/blobs/blob_show_spec.rb
View file @
1760e377
require
'spec_helper'
require
'spec_helper'
feature
'File blob'
,
:js
do
feature
'File blob'
,
:js
do
include
MobileHelpers
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
def
visit_blob
(
path
,
anchor:
nil
,
ref:
'master'
)
def
visit_blob
(
path
,
anchor:
nil
,
ref:
'master'
)
...
@@ -30,6 +32,16 @@ feature 'File blob', :js do
...
@@ -30,6 +32,16 @@ feature 'File blob', :js do
expect
(
page
).
to
have_link
(
'Open raw'
)
expect
(
page
).
to
have_link
(
'Open raw'
)
end
end
end
end
it
'displays file actions on all screen sizes'
do
file_actions_selector
=
'.file-actions'
resize_screen_sm
expect
(
page
).
to
have_selector
(
file_actions_selector
,
visible:
true
)
resize_screen_xs
expect
(
page
).
to
have_selector
(
file_actions_selector
,
visible:
true
)
end
end
end
context
'Markdown file'
do
context
'Markdown file'
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