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
e85362d5
Commit
e85362d5
authored
Aug 24, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update and fix resolvable note icons for easier recognition
parent
24244d03
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
6 deletions
+25
-6
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+11
-3
app/views/projects/notes/_actions.html.haml
app/views/projects/notes/_actions.html.haml
+6
-2
app/views/shared/icons/_icon_status_success.svg
app/views/shared/icons/_icon_status_success.svg
+1
-1
app/views/shared/icons/_icon_status_success_solid.svg
app/views/shared/icons/_icon_status_success_solid.svg
+1
-0
changelogs/unreleased/36582-fix-note-resolved-icon.yml
changelogs/unreleased/36582-fix-note-resolved-icon.yml
+5
-0
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
e85362d5
...
@@ -120,6 +120,7 @@ $gl-text-color-quaternary: #d6d6d6;
...
@@ -120,6 +120,7 @@ $gl-text-color-quaternary: #d6d6d6;
$gl-text-color-inverted
:
rgba
(
255
,
255
,
255
,
1
.0
);
$gl-text-color-inverted
:
rgba
(
255
,
255
,
255
,
1
.0
);
$gl-text-color-secondary-inverted
:
rgba
(
255
,
255
,
255
,
.85
);
$gl-text-color-secondary-inverted
:
rgba
(
255
,
255
,
255
,
.85
);
$gl-text-green
:
$green-600
;
$gl-text-green
:
$green-600
;
$gl-text-green-hover
:
$green-700
;
$gl-text-red
:
$red-500
;
$gl-text-red
:
$red-500
;
$gl-text-orange
:
$orange-600
;
$gl-text-orange
:
$orange-600
;
$gl-link-color
:
$blue-600
;
$gl-link-color
:
$blue-600
;
...
...
app/assets/stylesheets/pages/notes.scss
View file @
e85362d5
...
@@ -766,17 +766,25 @@ ul.notes {
...
@@ -766,17 +766,25 @@ ul.notes {
background-color
:
transparent
;
background-color
:
transparent
;
border
:
none
;
border
:
none
;
outline
:
0
;
outline
:
0
;
transition
:
color
$general-hover-transition-duration
$general-hover-transition-curve
;
&
.is-disabled
{
&
.is-disabled
{
cursor
:
default
;
cursor
:
default
;
}
}
&
:not
(
.is-disabled
)
:hover
,
&
:not
(
.is-disabled
)
{
&
:hover
,
&
:focus
{
color
:
$gl-text-green
;
}
}
&
.is-active
{
&
.is-active
{
color
:
$gl-text-green
;
color
:
$gl-text-green
;
svg
{
&
:hover
,
fill
:
$gl-text-green
;
&
:focus
{
color
:
$gl-text-green-hover
;
}
}
}
}
...
...
app/views/projects/notes/_actions.html.haml
View file @
e85362d5
...
@@ -26,8 +26,12 @@
...
@@ -26,8 +26,12 @@
":title"
=>
"buttonText"
,
":title"
=>
"buttonText"
,
":ref"
=>
"'button'"
}
":ref"
=>
"'button'"
}
=
icon
(
'spin spinner'
,
'v-show'
=>
'loading'
,
class:
'loading'
,
'aria-hidden'
=>
'true'
,
'aria-label'
=>
'Loading'
)
=
icon
(
'spin spinner'
,
'v-if'
=>
'loading'
,
class:
'loading'
,
'aria-hidden'
=>
'true'
,
'aria-label'
=>
'Loading'
)
%div
{
'v-show'
=>
'!loading'
}=
render
'shared/icons/icon_status_success.svg'
%div
{
'v-else'
=>
''
}
%template
{
'v-if'
=>
'isResolved'
}
=
render
'shared/icons/icon_status_success_solid.svg'
%template
{
'v-else'
=>
''
}
=
render
'shared/icons/icon_status_success.svg'
-
if
current_user
-
if
current_user
-
if
note
.
emoji_awardable?
-
if
note
.
emoji_awardable?
...
...
app/views/shared/icons/_icon_status_success.svg
View file @
e85362d5
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><
g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M6.278 7.697L5.045 6.464a.296.296 0 0 0-.42-.002l-.613.614a.298.298 0 0 0 .002.42l1.91 1.909a.5.5 0 0 0 .703.005l.265-.265L9.997 6.04a.291.291 0 0 0-.009-.408l-.614-.614a.29.29 0 0 0-.408-.009L6.278 7.697z"
/></g
></svg>
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><
path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill-rule=
"evenodd"
/><path
d=
"M6.278 7.697L5.045 6.464a.296.296 0 0 0-.42-.002l-.613.614a.298.298 0 0 0 .002.42l1.91 1.909a.5.5 0 0 0 .703.005l.265-.265L9.997 6.04a.291.291 0 0 0-.009-.408l-.614-.614a.29.29 0 0 0-.408-.009L6.278 7.697z"
/
></svg>
app/views/shared/icons/_icon_status_success_solid.svg
0 → 100644
View file @
e85362d5
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z M6.278 7.697L5.045 6.464a.296.296 0 0 0-.42-.002l-.613.614a.298.298 0 0 0 .002.42l1.91 1.909a.5.5 0 0 0 .703.005l.265-.265L9.997 6.04a.291.291 0 0 0-.009-.408l-.614-.614a.29.29 0 0 0-.408-.009L6.278 7.697z"
fill-rule=
"evenodd"
/></svg>
changelogs/unreleased/36582-fix-note-resolved-icon.yml
0 → 100644
View file @
e85362d5
---
title
:
Update and fix resolvable note icons for easier recognition
merge_request
:
author
:
type
:
changed
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