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
f150f262
Commit
f150f262
authored
Apr 18, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'"
This reverts merge request !18399
parent
923f5af2
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
144 additions
and
145 deletions
+144
-145
Gemfile.lock
Gemfile.lock
+142
-137
app/assets/stylesheets/framework/wells.scss
app/assets/stylesheets/framework/wells.scss
+0
-1
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+1
-1
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+1
-1
changelogs/unreleased/fix-size-and-position-for-fork-icon.yml
...gelogs/unreleased/fix-size-and-position-for-fork-icon.yml
+0
-5
No files found.
Gemfile.lock
View file @
f150f262
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/wells.scss
View file @
f150f262
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
.fork-svg
{
.fork-svg
{
margin-right
:
4px
;
margin-right
:
4px
;
vertical-align
:
bottom
;
}
}
}
}
...
...
app/assets/stylesheets/pages/commits.scss
View file @
f150f262
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
}
}
.branch-info
.commit-icon
{
.branch-info
.commit-icon
{
margin-right
:
8
px
;
margin-right
:
3
px
;
svg
{
svg
{
top
:
3px
;
top
:
3px
;
...
...
app/helpers/commits_helper.rb
View file @
f150f262
...
@@ -63,7 +63,7 @@ module CommitsHelper
...
@@ -63,7 +63,7 @@ module CommitsHelper
# Returns a link formatted as a commit branch link
# Returns a link formatted as a commit branch link
def
commit_branch_link
(
url
,
text
)
def
commit_branch_link
(
url
,
text
)
link_to
(
url
,
class:
'label label-gray ref-name branch-link'
)
do
link_to
(
url
,
class:
'label label-gray ref-name branch-link'
)
do
sprite_icon
(
'fork'
,
size:
1
2
,
css_class:
'fork-svg'
)
+
"
#{
text
}
"
sprite_icon
(
'fork'
,
size:
1
6
,
css_class:
'fork-svg'
)
+
"
#{
text
}
"
end
end
end
end
...
...
changelogs/unreleased/fix-size-and-position-for-fork-icon.yml
deleted
100644 → 0
View file @
923f5af2
---
title
:
Fix size and position for fork icon
merge_request
:
18399
author
:
George Tsiolis
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