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
79b964aa
Commit
79b964aa
authored
Oct 26, 2020
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update fa-chevron-up icons to GitLab SVG
- Update Vue / HAML - Remove CSS for chevron-up
parent
3be890c7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
11 deletions
+7
-11
app/assets/javascripts/notes/components/note_header.vue
app/assets/javascripts/notes/components/note_header.vue
+3
-3
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
ee/app/views/admin/licenses/_upload_trial_license.html.haml
ee/app/views/admin/licenses/_upload_trial_license.html.haml
+2
-2
spec/frontend/notes/components/note_header_spec.js
spec/frontend/notes/components/note_header_spec.js
+2
-2
No files found.
app/assets/javascripts/notes/components/note_header.vue
View file @
79b964aa
...
@@ -65,8 +65,8 @@ export default {
...
@@ -65,8 +65,8 @@ export default {
};
};
},
},
computed
:
{
computed
:
{
toggleChevron
Class
()
{
toggleChevron
IconName
()
{
return
this
.
expanded
?
'
fa-chevron-up
'
:
'
fa-
chevron-down
'
;
return
this
.
expanded
?
'
chevron-up
'
:
'
chevron-down
'
;
},
},
noteTimestampLink
()
{
noteTimestampLink
()
{
return
this
.
noteId
?
`#note_
${
this
.
noteId
}
`
:
undefined
;
return
this
.
noteId
?
`#note_
${
this
.
noteId
}
`
:
undefined
;
...
@@ -133,7 +133,7 @@ export default {
...
@@ -133,7 +133,7 @@ export default {
type=
"button"
type=
"button"
@
click=
"handleToggle"
@
click=
"handleToggle"
>
>
<
i
ref=
"chevronIcon"
:class=
"toggleChevronClass"
class=
"fa"
aria-hidden=
"true"
></i
>
<
gl-icon
ref=
"chevronIcon"
:name=
"toggleChevronIconName"
aria-hidden=
"true"
/
>
{{
__
(
'
Toggle thread
'
)
}}
{{
__
(
'
Toggle thread
'
)
}}
</button>
</button>
</div>
</div>
...
...
app/assets/stylesheets/fontawesome_custom.scss
View file @
79b964aa
...
@@ -109,10 +109,6 @@
...
@@ -109,10 +109,6 @@
content
:
'\f0da'
;
content
:
'\f0da'
;
}
}
.
fa-chevron-up
:
:
before
{
content
:
'\f077'
;
}
.
fa-exclamation-circle
:
:
before
{
.
fa-exclamation-circle
:
:
before
{
content
:
'\f06a'
;
content
:
'\f06a'
;
}
}
...
...
ee/app/views/admin/licenses/_upload_trial_license.html.haml
View file @
79b964aa
...
@@ -17,10 +17,10 @@
...
@@ -17,10 +17,10 @@
=
f
.
hidden_field
:data
,
value:
license_key
=
f
.
hidden_field
:data
,
value:
license_key
%a
#hide-license
.hide-license
{
href:
'#hide-license'
}
%a
#hide-license
.hide-license
{
href:
'#hide-license'
}
Show license key
Show license key
=
icon
(
'chevron-down'
)
=
sprite_
icon
(
'chevron-down'
)
%a
#show-license
.show-license
{
href:
'#show-license'
}
%a
#show-license
.show-license
{
href:
'#show-license'
}
Hide license key
Hide license key
=
icon
(
'chevron-up'
)
=
sprite_
icon
(
'chevron-up'
)
.card.trial-license-preview.gl-mt-5
.card.trial-license-preview.gl-mt-5
=
license_key
=
license_key
.modal-footer.form-actions
.modal-footer.form-actions
...
...
spec/frontend/notes/components/note_header_spec.js
View file @
79b964aa
...
@@ -78,7 +78,7 @@ describe('NoteHeader component', () => {
...
@@ -78,7 +78,7 @@ describe('NoteHeader component', () => {
expanded
:
true
,
expanded
:
true
,
});
});
expect
(
findChevronIcon
().
classes
()).
toContain
(
'
fa-
chevron-up
'
);
expect
(
findChevronIcon
().
props
(
'
name
'
)).
toBe
(
'
chevron-up
'
);
});
});
it
(
'
has chevron-down icon if expanded prop is false
'
,
()
=>
{
it
(
'
has chevron-down icon if expanded prop is false
'
,
()
=>
{
...
@@ -87,7 +87,7 @@ describe('NoteHeader component', () => {
...
@@ -87,7 +87,7 @@ describe('NoteHeader component', () => {
expanded
:
false
,
expanded
:
false
,
});
});
expect
(
findChevronIcon
().
classes
()).
toContain
(
'
fa-
chevron-down
'
);
expect
(
findChevronIcon
().
props
(
'
name
'
)).
toBe
(
'
chevron-down
'
);
});
});
});
});
...
...
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