diff --git a/src/assets/graphics/hmenu-b.png b/src/assets/graphics/hmenu-b.png new file mode 100644 index 00000000..4386ba36 Binary files /dev/null and b/src/assets/graphics/hmenu-b.png differ diff --git a/src/assets/graphics/hmenu-close-b.png b/src/assets/graphics/hmenu-close-b.png new file mode 100644 index 00000000..58045dc6 Binary files /dev/null and b/src/assets/graphics/hmenu-close-b.png differ diff --git a/src/assets/graphics/hmenu-close-hover-b.png b/src/assets/graphics/hmenu-close-hover-b.png new file mode 100644 index 00000000..6286b512 Binary files /dev/null and b/src/assets/graphics/hmenu-close-hover-b.png differ diff --git a/src/assets/graphics/hmenu-hover-b.png b/src/assets/graphics/hmenu-hover-b.png new file mode 100644 index 00000000..0ef7f442 Binary files /dev/null and b/src/assets/graphics/hmenu-hover-b.png differ diff --git a/src/components/Menu.js b/src/components/Menu.js index 34402f6d..dcf3ebea 100644 --- a/src/components/Menu.js +++ b/src/components/Menu.js @@ -18,6 +18,12 @@ const MenuItem = ({active, text, url}) => (active : {text} ) +const MenuToggle = () => ( +
+ +
+) + const Menu = ({items}) => { const content = items.map((item, index) => (
  • { )) return ( -
    - ✕ -
    + {content}
    diff --git a/src/style/components/main-menu.scss b/src/style/components/main-menu.scss index 4d2e07e2..a81e1c53 100644 --- a/src/style/components/main-menu.scss +++ b/src/style/components/main-menu.scss @@ -24,7 +24,7 @@ & > li { display: inline-block; - padding: 0.3em 0.2em 0.5em; + padding: 0.3em 0.2em 0; margin: 0 0.5em; position: relative; diff --git a/src/style/hmenu.scss b/src/style/hmenu.scss index 1178380e..04ffbb27 100644 --- a/src/style/hmenu.scss +++ b/src/style/hmenu.scss @@ -1,3 +1,9 @@ +@import "variables"; + +$hmenu-margin: 6px; +$hmenu-icon-width: 32px; +$hmenu-icon-height: 32px; + .no-scroll { overflow: hidden; } @@ -9,18 +15,24 @@ width: 100%; height: 100%; + padding: 0 0 $half-margin; position: relative; list-style: none; } -.HMenu li { - margin: 0 1em .5em 0; +.HMenu--folded.HMenu--closed { + li { + margin: 0; + } } - - +.HMenu--folded.HMenu--open { + li { + margin: 0 0 $single-margin; + } +} .HMenu--folded.HMenu--closed { justify-content: center; @@ -41,16 +53,51 @@ .HMenu__toggle { position: absolute; - top: 0; left: 0; + height: $hmenu-icon-height; + + margin: $hmenu-margin; display: flex; - align-items: center; - height: 3em; - font-size: 1rem; + a { + text-decoration: none; + border: none; + + width: $hmenu-icon-width; + height: $hmenu-icon-height; + background-size: 100%; + } + + a:hover { + text-decoration: none; + border: none; + } } +.HMenu--folded.HMenu--closed { + .HMenu__toggle { + a { + background-image: url(/graphics/hmenu-b.png); + } + + a:hover { + background-image: url(/graphics/hmenu-hover-b.png); + } + } +} + +.HMenu--folded.HMenu--open { + .HMenu__toggle { + a { + background-image: url(/graphics/hmenu-close-b.png); + } + + a:hover { + background-image: url(/graphics/hmenu-close-hover-b.png); + } + } +} @@ -58,15 +105,16 @@ .HMenu--unfolded { margin-left: 1em; + + li { + margin: 0 1em .5em .5em; + } + + .HMenu__toggle { + display: none; + } } -.HMenu--unfolded .HMenu__toggle { - display: none; -} - - - - .HMenu--folded.HMenu--open { display: flex; @@ -104,19 +152,28 @@ margin-bottom: 2em; } +@media (max-width: $mobile-width) { + .HMenu--folded.HMenu--closed { + .HMenu__toggle { + a { + background-image: url(/graphics/hmenu-b.png); + } + a:hover { + background-image: url(/graphics/hmenu-b.png); + } + } + } + .HMenu--folded.HMenu--open { + .HMenu__toggle { + a { + background-image: url(/graphics/hmenu-close-b.png); + } - -.HMenu__toggle { - padding: 0 .5em; -} - -.HMenu__toggle a { - text-decoration: none; - border: none; -} - -.HMenu__toggle a:hover { - font-weight: bold; + a:hover { + background-image: url(/graphics/hmenu-close-b.png); + } + } + } } \ No newline at end of file diff --git a/src/style/style.scss b/src/style/style.scss index d7a8501d..fcb6003d 100644 --- a/src/style/style.scss +++ b/src/style/style.scss @@ -38,9 +38,6 @@ @import "tape-viewer"; @import "footer"; -@import "kazimir/video"; -@import "hmenu"; - // THEMES @import "themes/theme-default"; @@ -52,3 +49,6 @@ @import "themes/theme-accessibility-font-serif"; @import "themes/theme-accessibility-no-image"; @import "themes/theme-accessibility-kerning-big"; + +@import "kazimir/video"; +@import "hmenu";