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
5f1c99b7
Commit
5f1c99b7
authored
Oct 22, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix alignment of the filter counter for Issuables
parent
7924dd5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
5 deletions
+16
-5
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+8
-0
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/_issues.html.haml
+4
-3
app/views/projects/merge_requests/_merge_requests.html.haml
app/views/projects/merge_requests/_merge_requests.html.haml
+4
-2
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
5f1c99b7
...
@@ -80,3 +80,11 @@
...
@@ -80,3 +80,11 @@
}
}
}
}
}
}
.issuable-filter-count
{
span
{
display
:
block
;
margin-bottom
:
-16px
;
padding
:
13px
0
;
}
}
app/views/projects/issues/_issues.html.haml
View file @
5f1c99b7
...
@@ -5,8 +5,9 @@
...
@@ -5,8 +5,9 @@
.nothing-here-block
No issues to show
.nothing-here-block
No issues to show
-
if
@issues
.
present?
-
if
@issues
.
present?
.pull-right
.issuable-filter-count
%span
.issue_counter
#{
@issues
.
total_count
}
%span
.pull-right
issues for this filter
=
@issues
.
total_count
issues for this filter
=
paginate
@issues
,
theme:
"gitlab"
=
paginate
@issues
,
theme:
"gitlab"
app/views/projects/merge_requests/_merge_requests.html.haml
View file @
5f1c99b7
...
@@ -5,8 +5,10 @@
...
@@ -5,8 +5,10 @@
.nothing-here-block
No merge requests to show
.nothing-here-block
No merge requests to show
-
if
@merge_requests
.
present?
-
if
@merge_requests
.
present?
.pull-right
.issuable-filter-count
%span
.cgray.pull-right
#{
@merge_requests
.
total_count
}
merge requests for this filter
%span
.pull-right
=
@merge_requests
.
total_count
merge requests for this filter
=
paginate
@merge_requests
,
theme:
"gitlab"
=
paginate
@merge_requests
,
theme:
"gitlab"
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