From 760becabf40dbbaed36dac6c37275c7e31aa2509 Mon Sep 17 00:00:00 2001 From: ITML Date: Thu, 17 Feb 2022 09:57:12 +0000 Subject: [PATCH] refactor(header): adjust to volto in progress --- src/semantic.less | 4 + src/ui/Header/Header.jsx | 47 +- src/ui/Header/HeaderSearchPopUp.js | 8 +- theme/theme.config | 1 + theme/themes/eea/elements/button.overrides | 28 +- theme/themes/eea/elements/button.variables | 10 +- theme/themes/eea/elements/input.overrides | 32 + theme/themes/eea/extras/header.less | 1092 +++++++++++++++++++ theme/themes/eea/extras/header.variables | 52 + theme/themes/eea/globals/site.overrides | 1146 -------------------- 10 files changed, 1243 insertions(+), 1177 deletions(-) create mode 100644 theme/themes/eea/extras/header.less create mode 100644 theme/themes/eea/extras/header.variables diff --git a/src/semantic.less b/src/semantic.less index 213ac216ee..0972edd3fb 100644 --- a/src/semantic.less +++ b/src/semantic.less @@ -220,6 +220,10 @@ @import '@eeacms/volto-eea-design-system/../theme/themes/eea/extras/footer'; } +& { + @import '@eeacms/volto-eea-design-system/../theme/themes/eea/extras/header'; +} + & { @import '@eeacms/volto-eea-design-system/../theme/themes/eea/extras/inpageNavigation'; } diff --git a/src/ui/Header/Header.jsx b/src/ui/Header/Header.jsx index 628a1585bd..1e83b6a7ce 100644 --- a/src/ui/Header/Header.jsx +++ b/src/ui/Header/Header.jsx @@ -14,8 +14,6 @@ import HeaderSearchPopUp from './HeaderSearchPopUp'; import HeaderMenuPopUp from './HeaderMenuPopUp'; import Logo from '../Logo/Logo'; -import { Col } from '../Grid/Col'; - //import { Logo, Navigation } from '@plone/volto/components'; /** @@ -186,7 +184,7 @@ class Header extends Component { return (
- + eea flag - + eea flag
@@ -245,15 +242,16 @@ class Header extends Component { - -
+ +
@@ -262,7 +260,7 @@ class Header extends Component {
@@ -271,7 +269,7 @@ class Header extends Component {
@@ -281,7 +279,7 @@ class Header extends Component {
@@ -290,7 +288,7 @@ class Header extends Component {
@@ -299,7 +297,7 @@ class Header extends Component {
@@ -308,7 +306,7 @@ class Header extends Component {
@@ -317,7 +315,7 @@ class Header extends Component {
@@ -360,12 +358,11 @@ class Header extends Component { - - - {/* */} - - - + + + + +
{!this.state.activeSearch && !this.state.activeMenu && ( @@ -424,8 +421,8 @@ class Header extends Component {
- - + + {this.state.activeSearch && } {this.state.activeMenu && } @@ -444,7 +441,7 @@ const TopHeader = (props) => ( Header.TopHeader = TopHeader; const TopItem = (props) => ( -
+
{props.children}
); diff --git a/src/ui/Header/HeaderSearchPopUp.js b/src/ui/Header/HeaderSearchPopUp.js index db79229c79..876b6924a0 100644 --- a/src/ui/Header/HeaderSearchPopUp.js +++ b/src/ui/Header/HeaderSearchPopUp.js @@ -3,17 +3,17 @@ import { Container, Input, Button, Icon } from 'semantic-ui-react'; function HeaderSearchPopUp() { return ( -