Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Essem
Sharkey
Commits
08a15102
Commit
08a15102
authored
7 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
✌️
parent
8f51ec39
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/web/app/app.styl
+3
-0
3 additions, 0 deletions
src/web/app/app.styl
src/web/app/desktop/tags/ui.tag
+15
-3
15 additions, 3 deletions
src/web/app/desktop/tags/ui.tag
webpack/module/rules/fa.ts
+1
-1
1 addition, 1 deletion
webpack/module/rules/fa.ts
with
19 additions
and
4 deletions
src/web/app/app.styl
+
3
−
0
View file @
08a15102
...
...
@@ -168,3 +168,6 @@ mk-locker
width 100%
height 100%
cursor wait
[data-fa]
display inline-block
This diff is collapsed.
Click to expand it.
src/web/app/desktop/tags/ui.tag
+
15
−
3
View file @
08a15102
...
...
@@ -124,7 +124,8 @@
<mk-ui-header-search>
<form class="search" onsubmit={ onsubmit }>
<input ref="q" type="search" placeholder=" %i18n:desktop.tags.mk-ui-header-search.placeholder%"/>
%fa:search%
<input ref="q" type="search" placeholder="%i18n:desktop.tags.mk-ui-header-search.placeholder%"/>
<div class="result"></div>
</form>
<style>
...
...
@@ -134,11 +135,22 @@
display block
float left
> [data-fa]
display block
position absolute
top 0
left 0
width 48px
text-align center
line-height 48px
color #9eaba8
pointer-events none
> input
user-select text
cursor auto
margin 8px 0 0 0
padding 6px 18px
padding 6px 18px
6px 36px
width 14em
height 32px
font-size 1em
...
...
@@ -150,7 +162,7 @@
transition color 0.5s ease, border 0.5s ease
font-family FontAwesome, sans-serif
&:
:-webkit-input-
placeholder
&:placeholder
-shown
color #9eaba8
&:hover
...
...
This diff is collapsed.
Click to expand it.
webpack/module/rules/fa.ts
+
1
−
1
View file @
08a15102
...
...
@@ -49,7 +49,7 @@ export default () => ({
if
(
icon
)
{
icon
.
transform
=
fontawesome
.
parse
.
transform
(
transform
);
return
`<i data-fa
style="display:inline-block"
class="
${
name
}
">
${
icon
.
html
[
0
]}
</i>`
;
return
`<i data-fa class="
${
name
}
">
${
icon
.
html
[
0
]}
</i>`
;
}
else
{
console
.
warn
(
`'
${
name
}
' not found in fa`
);
return
''
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment