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
220b82a4
Commit
220b82a4
authored
Jul 28, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use default amount of padding before and after “N/M resolved” widget
parent
27471d01
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-1
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
220b82a4
...
@@ -398,7 +398,6 @@ ul.notes {
...
@@ -398,7 +398,6 @@ ul.notes {
.line-resolve-all
{
.line-resolve-all
{
display
:
inline-block
;
display
:
inline-block
;
margin-top
:
10px
;
padding
:
5px
10px
;
padding
:
5px
10px
;
background-color
:
$background-color
;
background-color
:
$background-color
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
220b82a4
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
=
succeed
'.'
do
=
succeed
'.'
do
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
#resolve-count-app
.line-resolve-all-container
{
"v-cloak"
=>
true
}
#resolve-count-app
.line-resolve-all-container
.prepend-top-default.append-bottom-default
{
"v-cloak"
=>
true
}
%resolve-count
{
"inline-template"
=>
true
}
%resolve-count
{
"inline-template"
=>
true
}
.line-resolve-all
{
"v-show"
=>
"discussionCount > 0"
,
.line-resolve-all
{
"v-show"
=>
"discussionCount > 0"
,
":class"
=>
"{ 'has-next-btn': resolved !== discussionCount }"
}
":class"
=>
"{ 'has-next-btn': resolved !== discussionCount }"
}
...
...
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