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
6ee20697
Commit
6ee20697
authored
Apr 06, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix lint errors
parent
04e798a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+3
-3
app/helpers/notes_helper.rb
app/helpers/notes_helper.rb
+2
-4
No files found.
app/assets/stylesheets/framework/files.scss
View file @
6ee20697
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
text-align
:
left
;
text-align
:
left
;
padding
:
10px
$gl-padding
;
padding
:
10px
$gl-padding
;
word-wrap
:
break-word
;
word-wrap
:
break-word
;
border-radius
:
3px
3px
0
px
0px
;
border-radius
:
3px
3px
0
0
;
.file-actions
{
.file-actions
{
float
:
right
;
float
:
right
;
...
...
app/assets/stylesheets/framework/variables.scss
View file @
6ee20697
...
@@ -81,7 +81,7 @@ $provider-btn-not-active-color: #4688f1;
...
@@ -81,7 +81,7 @@ $provider-btn-not-active-color: #4688f1;
$white-light
:
#fff
;
$white-light
:
#fff
;
$white-normal
:
#ededed
;
$white-normal
:
#ededed
;
$white-dark
:
#
ECECEC
;
$white-dark
:
#
ececec
;
$gray-light
:
#faf9f9
;
$gray-light
:
#faf9f9
;
$gray-normal
:
#f5f5f5
;
$gray-normal
:
#f5f5f5
;
...
@@ -203,8 +203,8 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
...
@@ -203,8 +203,8 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
/*
/*
* Buttons
* Buttons
*/
*/
$btn-active-gray
:
#
ECECEC
;
$btn-active-gray
:
#
ececec
;
$btn-placeholder-gray
:
#
C7C7C
7
;
$btn-placeholder-gray
:
#
c7c7c
7
;
$btn-white-active
:
#848484
;
$btn-white-active
:
#848484
;
/*
/*
...
...
app/helpers/notes_helper.rb
View file @
6ee20697
...
@@ -69,9 +69,7 @@ module NotesHelper
...
@@ -69,9 +69,7 @@ module NotesHelper
line_type:
line_type
line_type:
line_type
}
}
button_tag
class:
'btn btn-text-field js-discussion-reply-button'
,
button_tag
'Reply...'
,
class:
'btn btn-text-field js-discussion-reply-button'
,
data:
data
,
title:
'Add a reply'
do
data:
data
,
title:
'Add a reply'
link_text
=
'Reply...'
end
end
end
end
end
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