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
9a998139
Commit
9a998139
authored
Jul 08, 2020
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix single file editor with long branch name
- Moved max-width from media query to default ruleset
parent
0382457b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+1
-4
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+1
-1
changelogs/unreleased/ps-fix-single-file-editor-long-branch.yml
...logs/unreleased/ps-fix-single-file-editor-long-branch.yml
+5
-0
No files found.
app/assets/stylesheets/pages/editor.scss
View file @
9a998139
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
display
:
block
;
display
:
block
;
float
:
left
;
float
:
left
;
margin-right
:
10px
;
margin-right
:
10px
;
max-width
:
250px
;
}
}
.new-file-name
,
.new-file-name
,
...
@@ -139,10 +140,6 @@
...
@@ -139,10 +140,6 @@
clear
:
both
;
clear
:
both
;
}
}
}
}
.editor-ref
{
max-width
:
250px
;
}
}
}
}
}
...
...
app/views/projects/blob/_editor.html.haml
View file @
9a998139
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.file-holder-bottom-radius.file-holder.file.gl-mb-3
.file-holder-bottom-radius.file-holder.file.gl-mb-3
.js-file-title.file-title.align-items-center.clearfix
{
data:
{
current_action:
action
}
}
.js-file-title.file-title.align-items-center.clearfix
{
data:
{
current_action:
action
}
}
.editor-ref.block-truncated
.editor-ref.block-truncated
.has-tooltip
{
title:
ref
}
=
sprite_icon
(
'fork'
,
size:
12
)
=
sprite_icon
(
'fork'
,
size:
12
)
=
ref
=
ref
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
...
...
changelogs/unreleased/ps-fix-single-file-editor-long-branch.yml
0 → 100644
View file @
9a998139
---
title
:
Fix single file editor with long branch name
merge_request
:
36371
author
:
type
:
fixed
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