BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b329a467
Unverified
Commit
b329a467
authored
Feb 02, 2017
by
Nur Rony
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removes old css class from everywhere
parent
d4dd1fcf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
buttons.scss
app/assets/stylesheets/framework/buttons.scss
+0
-4
blob_helper.rb
app/helpers/blob_helper.rb
+2
-2
_file_actions.html.haml
...projects/merge_requests/conflicts/_file_actions.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
b329a467
...
...
@@ -330,10 +330,6 @@
}
}
.btn-file-option
{
background
:
linear-gradient
(
180deg
,
$white-light
25%
,
$gray-light
100%
);
}
.btn-build
{
margin-left
:
10px
;
...
...
app/helpers/blob_helper.rb
View file @
b329a467
...
...
@@ -21,7 +21,7 @@ module BlobHelper
options
[
:link_opts
])
if
!
on_top_of_branch?
(
project
,
ref
)
button_tag
"Edit"
,
class:
"btn disabled has-tooltip
btn-file-option
"
,
title:
"You can only edit files when you are on a branch"
,
data:
{
container:
'body'
}
button_tag
"Edit"
,
class:
"btn disabled has-tooltip"
,
title:
"You can only edit files when you are on a branch"
,
data:
{
container:
'body'
}
elsif
can_edit_blob?
(
blob
,
project
,
ref
)
link_to
"Edit"
,
edit_path
,
class:
'btn btn-sm'
elsif
can?
(
current_user
,
:fork_project
,
project
)
...
...
@@ -32,7 +32,7 @@ module BlobHelper
}
fork_path
=
namespace_project_forks_path
(
project
.
namespace
,
project
,
namespace_key:
current_user
.
namespace
.
id
,
continue:
continue_params
)
link_to
"Edit"
,
fork_path
,
class:
'btn
btn-file-option
'
,
method: :post
link_to
"Edit"
,
fork_path
,
class:
'btn'
,
method: :post
end
end
...
...
app/views/projects/merge_requests/conflicts/_file_actions.html.haml
View file @
b329a467
...
...
@@ -8,5 +8,5 @@
'@click'
=>
"onClickResolveModeButton(file, 'edit')"
,
type:
'button'
}
Edit inline
%a
.btn.view-file
.btn-file-option
{
":href"
=>
"file.blobPath"
}
%a
.btn.view-file
{
":href"
=>
"file.blobPath"
}
View file @{{conflictsData.shortCommitSha}}
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