scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 05:02:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5378 from artoscinote/ma_SCI_8324

Browse source 
Fix main navigation issues [SCI-8324]
This commit is contained in:
artoscinote 2023-05-11 11:26:30 +02:00 committed by GitHub
commit 566b302ce1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/navigation/top_menu.scss
View file

@ -38,6 +38,14 @@
margin-left: auto; margin-left: auto;
margin-right: 1em; margin-right: 1em;
width: 240px; width: 240px;
input {
border-color: $color-alto;
}
.fas {
color: $color-silver-chalice;
}
} }
.sci--navigation--top-menu-user { .sci--navigation--top-menu-user {

2
app/assets/stylesheets/shared/comments_sidebar.scss
View file

@ -9,7 +9,7 @@
top: var(--top-navigation-height); top: var(--top-navigation-height);
transition: width .3s; transition: width .3s;
width: 0; width: 0;
z-index: 10000; z-index: 609;
&.open { &.open {
width: var(--comments-sidebar-width); width: var(--comments-sidebar-width);

12
app/javascript/vue/navigation/top_menu.vue
View file

@ -25,8 +25,8 @@
<i class="fas fa-question-circle"></i> <i class="fas fa-question-circle"></i>
</button> </button>
<ul v-if="user" class="dropdown-menu dropdown-menu-right"> <ul v-if="user" class="dropdown-menu dropdown-menu-right">
<li v-for="(item, i) in helpMenu"> <li v-for="(item, i) in helpMenu" :key="i">
<a :key="i" :href="item.url"> <a :href="item.url" target="_blank">
{{ item.name }} {{ item.name }}
</a> </a>
</li> </li>
@ -37,8 +37,8 @@
<i class="fas fa-cog"></i> <i class="fas fa-cog"></i>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li v-for="(item, i) in settingsMenu"> <li v-for="(item, i) in settingsMenu" :key="i">
<a :key="i" :href="item.url"> <a :href="item.url">
{{ item.name }} {{ item.name }}
</a> </a>
</li> </li>
@ -71,8 +71,8 @@
<img class="avatar" :src="user.avatar_url"> <img class="avatar" :src="user.avatar_url">
</div> </div>
<div class="dropdown-menu dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-right">
<li v-for="(item, i) in userMenu"> <li v-for="(item, i) in userMenu" :key="i">
<a :key="i" :href="item.url"> <a :href="item.url">
{{ item.name }} {{ item.name }}
</a> </a>
</li> </li>

4
config/locales/en.yml
View file

@ -262,7 +262,7 @@ en:
notifications: notifications:
title: "Notifications" title: "Notifications"
all: "All" all: "All"
message: "Message" message: "Messages"
system: "System" system: "System"
today: "Today" today: "Today"
older: "Older" older: "Older"
@ -2412,7 +2412,7 @@ en:
profile: "My profile" profile: "My profile"
preferences: "My preferences" preferences: "My preferences"
addons: "Add-ons" addons: "Add-ons"
connected_accounts: "Connected Accounts" connected_accounts: "Connected accounts"
account: account:
preferences: preferences:
head_title: "Settings | My preferences" head_title: "Settings | My preferences"