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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
3c2cb28e
Commit
3c2cb28e
authored
Dec 01, 2016
by
Dimitrie Hoekstra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added lighter count badge background-color for on white backgrounds
parent
507abdb7
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
8 deletions
+16
-8
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+5
-1
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+1
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+1
-1
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+1
-1
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+2
-2
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+2
-2
changelogs/unreleased/badge-color-on-white-bg.yml
changelogs/unreleased/badge-color-on-white-bg.yml
+4
-0
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
3c2cb28e
...
@@ -75,10 +75,14 @@
...
@@ -75,10 +75,14 @@
.badge
{
.badge
{
font-weight
:
normal
;
font-weight
:
normal
;
background-color
:
#
eee
;
background-color
:
#
f3f3f3
;
color
:
$btn-transparent-color
;
color
:
$btn-transparent-color
;
vertical-align
:
baseline
;
vertical-align
:
baseline
;
}
}
.badge-dark
{
background-color
:
#eee
;
}
}
}
&
.sub-nav
{
&
.sub-nav
{
...
...
app/assets/stylesheets/pages/environments.scss
View file @
3c2cb28e
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
.badge
{
.badge
{
font-weight
:
normal
;
font-weight
:
normal
;
background-color
:
$gray-darker
;
background-color
:
#f3f3f3
;
color
:
$gl-placeholder-color
;
color
:
$gl-placeholder-color
;
vertical-align
:
baseline
;
vertical-align
:
baseline
;
}
}
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
3c2cb28e
...
@@ -507,7 +507,7 @@
...
@@ -507,7 +507,7 @@
}
}
.badge
{
.badge
{
background-color
:
$gray-darker
;
background-color
:
#f3f3f3
;
color
:
$gl-text-color-light
;
color
:
$gl-text-color-light
;
font-weight
:
normal
;
font-weight
:
normal
;
margin-left
:
$btn-xs-side-margin
;
margin-left
:
$btn-xs-side-margin
;
...
...
app/views/layouts/nav/_admin.html.haml
View file @
3c2cb28e
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
=
link_to
admin_abuse_reports_path
,
title:
"Abuse Reports"
do
=
link_to
admin_abuse_reports_path
,
title:
"Abuse Reports"
do
%span
%span
Abuse Reports
Abuse Reports
%span
.badge.count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
%span
.badge.
badge-dark.
count
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
-
if
askimet_enabled?
-
if
askimet_enabled?
=
nav_link
(
controller: :spam_logs
)
do
=
nav_link
(
controller: :spam_logs
)
do
...
...
app/views/layouts/nav/_group.html.haml
View file @
3c2cb28e
...
@@ -26,13 +26,13 @@
...
@@ -26,13 +26,13 @@
%span
%span
Issues
Issues
-
issues
=
IssuesFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
-
issues
=
IssuesFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
%span
.badge.count
=
number_with_delimiter
(
issues
.
count
)
%span
.badge.
badge-dark.
count
=
number_with_delimiter
(
issues
.
count
)
=
nav_link
(
path:
'groups#merge_requests'
)
do
=
nav_link
(
path:
'groups#merge_requests'
)
do
=
link_to
merge_requests_group_path
(
@group
),
title:
'Merge Requests'
do
=
link_to
merge_requests_group_path
(
@group
),
title:
'Merge Requests'
do
%span
%span
Merge Requests
Merge Requests
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
%span
.badge.
badge-dark.
count
=
number_with_delimiter
(
merge_requests
.
count
)
=
nav_link
(
controller:
[
:group_members
])
do
=
nav_link
(
controller:
[
:group_members
])
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
%span
...
...
app/views/layouts/nav/_project.html.haml
View file @
3c2cb28e
...
@@ -70,14 +70,14 @@
...
@@ -70,14 +70,14 @@
%span
%span
Issues
Issues
-
if
@project
.
default_issues_tracker?
-
if
@project
.
default_issues_tracker?
%span
.badge.count.issue_counter
=
number_with_delimiter
(
IssuesFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
count
)
%span
.badge.
badge-dark.
count.issue_counter
=
number_with_delimiter
(
IssuesFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
count
)
-
if
project_nav_tab?
:merge_requests
-
if
project_nav_tab?
:merge_requests
=
nav_link
(
controller: :merge_requests
)
do
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
=
link_to
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
%span
%span
Merge Requests
Merge Requests
%span
.badge.count.merge_counter
=
number_with_delimiter
(
@project
.
merge_requests
.
opened
.
count
)
%span
.badge.
badge-dark.
count.merge_counter
=
number_with_delimiter
(
@project
.
merge_requests
.
opened
.
count
)
-
if
project_nav_tab?
:wiki
-
if
project_nav_tab?
:wiki
=
nav_link
(
controller: :wikis
)
do
=
nav_link
(
controller: :wikis
)
do
...
...
changelogs/unreleased/badge-color-on-white-bg.yml
0 → 100644
View file @
3c2cb28e
---
title
:
Added lighter count badge background-color for on white backgrounds
merge_request
:
7873
author
:
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