Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
pleroma-fe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
absturztaube
pleroma-fe
Commits
a6ca923a
Commit
a6ca923a
authored
May 25, 2020
by
HJ
🐼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
icons update
parent
79c03984
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
2 deletions
+31
-2
src/components/settings_modal/settings_modal_content.vue
src/components/settings_modal/settings_modal_content.vue
+9
-0
src/components/tab_switcher/tab_switcher.js
src/components/tab_switcher/tab_switcher.js
+5
-2
src/components/tab_switcher/tab_switcher.scss
src/components/tab_switcher/tab_switcher.scss
+5
-0
static/fontello.json
static/fontello.json
+12
-0
No files found.
src/components/settings_modal/settings_modal_content.vue
View file @
a6ca923a
...
...
@@ -45,40 +45,47 @@
>
<div
:label=
"$t('settings.general')"
icon=
"wrench"
>
<GeneralTab
/>
</div>
<div
v-if=
"isLoggedIn"
:label=
"$t('settings.profile_tab')"
icon=
"user"
>
<ProfileTab
/>
</div>
<div
v-if=
"isLoggedIn"
:label=
"$t('settings.security_tab')"
icon=
"lock"
>
<SecurityTab
/>
</div>
<div
:label=
"$t('settings.filtering')"
icon=
"filter"
>
<FilteringTab
/>
</div>
<div
:label=
"$t('settings.theme')"
icon=
"brush"
>
<ThemeTab
/>
</div>
<div
v-if=
"isLoggedIn"
:label=
"$t('settings.notifications')"
icon=
"chat"
>
<NotificationsTab
/>
</div>
<div
v-if=
"isLoggedIn"
:label=
"$t('settings.data_import_export_tab')"
icon=
"download"
>
<DataImportExportTab
/>
</div>
...
...
@@ -87,11 +94,13 @@
:label=
"$t('settings.mutes_and_blocks')"
:fullHeight=
"true"
class=
"full-height"
icon=
"eye-off"
>
<MutesAndBlocksTab
/>
</div>
<div
:label=
"$t('settings.version.title')"
icon=
"info-circled"
>
<VersionTab
/>
</div>
...
...
src/components/tab_switcher/tab_switcher.js
View file @
a6ca923a
...
...
@@ -94,8 +94,11 @@ export default Vue.component('tab-switcher', {
<
button
disabled
=
{
slot
.
data
.
attrs
.
disabled
}
onClick
=
{
this
.
activateTab
(
index
)}
class
=
{
classesTab
.
join
(
'
'
)}
>
{
slot
.
data
.
attrs
.
label
}
<
/button
>
class
=
{
classesTab
.
join
(
'
'
)}
>
{
!
slot
.
data
.
attrs
.
icon
?
''
:
(
<
i
class
=
{
'
tab-icon icon-
'
+
slot
.
data
.
attrs
.
icon
}
/>
)
}
{
slot
.
data
.
attrs
.
label
}
<
/button
>
<
/div
>
)
})
...
...
src/components/tab_switcher/tab_switcher.scss
View file @
a6ca923a
...
...
@@ -3,6 +3,11 @@
.tab-switcher
{
display
:
flex
;
.tab-icon
{
font-size
:
2em
;
display
:
block
;
}
&
.top-tabs
{
flex-direction
:
column
;
>
.tabs
{
...
...
static/fontello.json
View file @
a6ca923a
...
...
@@ -363,6 +363,18 @@
"css"
:
"ok"
,
"code"
:
59431
,
"src"
:
"fontawesome"
},
{
"uid"
:
"4109c474ff99cad28fd5a2c38af2ec6f"
,
"css"
:
"filter"
,
"code"
:
61616
,
"src"
:
"fontawesome"
},
{
"uid"
:
"9a76bc135eac17d2c8b8ad4a5774fc87"
,
"css"
:
"download"
,
"code"
:
59429
,
"src"
:
"fontawesome"
}
]
}
\ No newline at end of file
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