Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

navigation style fixes (fix icon background and allow to customize header text color) #360

Merged
merged 3 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ E.g., if it was used in a menu and the menu is red, the circle would be red.
## Changelog
### **WORK IN PROGRESS**
* (foxriver76) apply default overflow correctly
* (foxriver76) navigation style fixes (fix icon background and allow to customize header text color)

### 2.9.30 (2024-02-06)
* (foxriver76) global css will no longer be deleted on adapter upload/update
Expand Down
3 changes: 3 additions & 0 deletions src/src/Attributes/View.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,9 @@ const View = props => {
{
type: 'color', name: 'Text color if selected', field: 'navigationSelectedColor', notStyle: true, hidden: '!data.navigation || data.navigationOrientation === "horizontal"', applyToAll: true,
},
{
type: 'color', name: 'Menu header text color', field: 'navigationHeaderTextColor', notStyle: true, hidden: '!data.navigation',
},
{
type: 'color', name: 'Text color', field: 'navigationColor', notStyle: true, hidden: '!data.navigation || data.navigationOrientation === "horizontal"', applyToAll: true,
},
Expand Down
3 changes: 2 additions & 1 deletion src/src/Vis/visNavigation.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ class VisNavigation extends React.Component {
)}
>
<div
style={{ color: settings.navigationHeaderTextColor || undefined }}
className={Utils.clsx(
this.props.classes.menuToolbar,
this.props.menuWidth === 'full' && this.props.classes.menuToolbarFull,
Expand Down Expand Up @@ -300,7 +301,7 @@ class VisNavigation extends React.Component {
<ListItemIcon>
{item.icon ? <Icon
src={item.icon}
style={{ color: this.props.activeView === item.view ? settings.navigationSelectedColor : settings.navigationColor }}
style={{ color: this.props.activeView === item.view ? settings.navigationSelectedColor : settings.navigationColor, backgroundColor: 'rgba(1,1,1,0)' }}
className={Utils.clsx(
this.props.classes.listItemIcon,
this.props.activeView === item.view && this.props.classes.selectedMenu,
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Projekte",
"Manage views": "Seiten",
"Menu header text": "Kopfzeilentext des Menüs",
"Menu header text color": "Textfarbe des Kopfzeilentexts",
"Message": "Nachricht",
"Mo": "Mo",
"Modify": "Ändern",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Projects",
"Manage views": "Views",
"Menu header text": "Menu header text",
"Menu header text color": "Menu header text color",
"Message": "Message",
"Mo": "Mo",
"Modify": "Modify",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Administrar proyectos",
"Manage views": "Administrar vistas",
"Menu header text": "Texto del encabezado del menú",
"Menu header text color": "Color del texto del encabezado del menú",
"Message": "Mensaje",
"Mo": "Mes",
"Modify": "Modificar",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Gérer des projets",
"Manage views": "Gérer les vues",
"Menu header text": "Texte d'en-tête de menu",
"Menu header text color": "Couleur du texte de l’en-tête du menu",
"Message": "Message",
"Mo": "Mo",
"Modify": "Modifier",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Gestisci progetti",
"Manage views": "Gestisci le visualizzazioni",
"Menu header text": "Testo dell'intestazione del menu",
"Menu header text color": "Colore del testo dell'intestazione del menu",
"Message": "Messaggio",
"Mo": "Mo",
"Modify": "Modificare",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Projecten beheren",
"Manage views": "Weergaven beheren",
"Menu header text": "Menukoptekst",
"Menu header text color": "Tekstkleur menukop",
"Message": "Bericht",
"Mo": "Mo",
"Modify": "Bewerken",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Zarządzaj projektami",
"Manage views": "Zarządzaj widokami",
"Menu header text": "Tekst nagłówka menu",
"Menu header text color": "Kolor tekstu nagłówka menu",
"Message": "Wiadomość",
"Mo": "Mo",
"Modify": "Modyfikować",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Gerenciar projetos",
"Manage views": "Gerenciar visualizações",
"Menu header text": "Texto do cabeçalho do menu",
"Menu header text color": "Cor do texto do cabeçalho do menu",
"Message": "Mensagem",
"Mo": "Mo",
"Modify": "Modificar",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Проекты",
"Manage views": "Страницы",
"Menu header text": "Текст заголовка меню",
"Menu header text color": "Цвет текста заголовка меню",
"Message": "Сообщение",
"Mo": "Пн",
"Modify": "Буду изменить",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "Керуйте проектами",
"Manage views": "Керувати переглядами",
"Menu header text": "Текст заголовка меню",
"Menu header text color": "Колір тексту заголовка меню",
"Message": "повідомлення",
"Mo": "пн",
"Modify": "Змінити",
Expand Down
1 change: 1 addition & 0 deletions src/src/i18n/zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"Manage projects": "管理项目",
"Manage views": "管理视图",
"Menu header text": "菜单标题文本",
"Menu header text color": "菜单标题文字颜色",
"Message": "信息",
"Mo": "莫",
"Modify": "调整",
Expand Down
Loading