Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Pleroma
admin-fe
Commits
5f9789bd
Commit
5f9789bd
authored
4 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Fix styles for settings header and add search in mobile version
parent
02f2f0e1
No related branches found
Branches containing commit
No related tags found
1 merge request
!195
Move Settings tab navigation to the main sidebar menu
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/views/moderation_log/index.vue
+0
-3
0 additions, 3 deletions
src/views/moderation_log/index.vue
src/views/settings/index.vue
+12
-4
12 additions, 4 deletions
src/views/settings/index.vue
src/views/settings/styles/main.scss
+15
-28
15 additions, 28 deletions
src/views/settings/styles/main.scss
with
27 additions
and
35 deletions
src/views/moderation_log/index.vue
+
0
−
3
View file @
5f9789bd
...
...
@@ -197,9 +197,6 @@ h1 {
.router-link
{
text-decoration
:
none
;
}
.search-container
{
text-align
:
right
;
}
.pagination
{
text-align
:
center
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/settings/index.vue
+
12
−
4
View file @
5f9789bd
...
...
@@ -4,7 +4,7 @@
<reboot-button/>
</div>
<div
v-if=
"isDesktop"
>
<div
:class=
"isSidebarOpen"
class=
"settings-header-container"
>
<div
:class=
"isSidebarOpen"
>
<h1
class=
"settings-header"
>
{{
$t
(
'
settings.settings
'
)
}}
</h1>
<div
class=
"docs-search-container"
>
<el-link
...
...
@@ -34,8 +34,6 @@
<div
v-if=
"isMobile || isTablet"
>
<div
:class=
"isSidebarOpen"
class=
"settings-header-container"
>
<h1
class=
"settings-header"
>
{{
$t
(
'
settings.settings
'
)
}}
</h1>
</div>
<div
class=
"nav-container"
>
<el-link
:underline=
"false"
href=
"https://docs-develop.pleroma.social/backend/administration/CLI_tasks/config/"
...
...
@@ -48,7 +46,17 @@
</el-button>
</el-link>
</div>
<!--
<div
class=
"settings-search-input-container"
/>
-->
<div
class=
"settings-search-container"
>
<el-autocomplete
v-model=
"searchQuery"
:fetch-suggestions=
"querySearch"
:trigger-on-focus=
"false"
clearable
placeholder=
"Search"
prefix-icon=
"el-icon-search"
class=
"settings-search-input"
@
select=
"handleSearchSelect"
/>
</div>
<component
:is=
"componentName"
/>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/views/settings/styles/main.scss
+
15
−
28
View file @
5f9789bd
...
...
@@ -30,7 +30,8 @@
height
:
2px
;
}
.docs-search-container
{
float
:
right
;
display
:
flex
;
justify-content
:
flex-end
;
margin-right
:
30px
;
}
.editable-keyword-container
{
...
...
@@ -307,9 +308,6 @@
.header-sidebar-closed
{
max-width
:
1728px
;
}
.settings-header-container
{
height
:
87px
;
}
.settings-search-input
{
width
:
350px
;
margin-left
:
5px
;
...
...
@@ -488,13 +486,6 @@
.limit-input
{
width
:
45%
;
}
.nav-container
{
display
:
flex
;
height
:
36px
;
justify-content
:
space-between
;
align-items
:
center
;
margin
:
15px
;
}
.proxy-url-input
{
flex-direction
:
column
;
align-items
:
flex-start
;
...
...
@@ -540,15 +531,9 @@
display
:
inline-block
;
margin
:
10px
15px
15px
15px
;
}
.docs-search-container
{
float
:
right
;
}
.settings-search-input
{
width
:
100%
;
margin-left
:
0
;
}
.settings-search-input-container
{
margin
:
0
15px
15px
15px
;
margin
:
0
15px
25px
15px
;
width
:
stretch
;
}
.socks5-checkbox-container
{
width
:
100%
;
...
...
@@ -638,7 +623,9 @@
margin-right
:
5px
}
.settings-header-container
{
height
:
45px
;
display
:
flex
;
justify-content
:
space-between
;
margin-right
:
15px
;
}
.value-input
{
width
:
60%
;
...
...
@@ -677,13 +664,6 @@
display
:
flex
;
justify-content
:
space-between
;
}
.nav-container
{
display
:
flex
;
height
:
36px
;
justify-content
:
space-between
;
align-items
:
center
;
margin
:
15px
30px
15px
15px
;
}
.rate-limit-content
{
width
:
65%
;
}
...
...
@@ -694,7 +674,14 @@
float
:
right
;
}
.settings-header-container
{
height
:
36px
;
display
:
flex
;
justify-content
:
space-between
;
margin-right
:
15px
;
}
.settings-search-container
{
display
:
flex
;
justify-content
:
flex-end
;
margin-right
:
15px
;
}
.settings-search-input
{
width
:
250px
;
...
...
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