From e344e181659902bbdb762a24f8268a298d0e9597 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Sat, 3 Jun 2017 19:42:53 +0300 Subject: [PATCH] Hmenu Icons --- src/assets/graphics/hmenu-b.png | Bin 0 -> 137 bytes src/assets/graphics/hmenu-close-b.png | Bin 0 -> 500 bytes src/assets/graphics/hmenu-close-hover-b.png | Bin 0 -> 643 bytes src/assets/graphics/hmenu-hover-b.png | Bin 0 -> 147 bytes src/components/Menu.js | 10 +- src/style/components/main-menu.scss | 2 +- src/style/hmenu.scss | 111 +++++++++++++++----- src/style/style.scss | 6 +- 8 files changed, 95 insertions(+), 34 deletions(-) create mode 100644 src/assets/graphics/hmenu-b.png create mode 100644 src/assets/graphics/hmenu-close-b.png create mode 100644 src/assets/graphics/hmenu-close-hover-b.png create mode 100644 src/assets/graphics/hmenu-hover-b.png diff --git a/src/assets/graphics/hmenu-b.png b/src/assets/graphics/hmenu-b.png new file mode 100644 index 0000000000000000000000000000000000000000..4386ba369611e2fae249f6fdff7a3b4a8c68fff0 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=0iG_7Ar*7p-q^@_z<|fq(Xw0W zQpz%uMxR$_6gD_a*d6!b%0CXEx_{{@{OgL>bxnwU_uThyNk}Wmp!jbMs|0|I7pLU{ fM45n$3s>1a+~Zy%=d}e9gi0jMNt$*Q4~c{Dnvqm_;7#s0x~^0vu@k=5VNRjvDVHe#%;hKAD^CY zLt>cl^fJY>7#p{>*3QD?gki0njg8ylS%6GK;{+RUa%Sy?H}TAKn{XB{p1Bv^PR^`D zV+FUsr9wJqR;k+|cFsWtq$ntNuE7SRDlAuyC;GW&orqH1)qLssRwU;2f+Q5(8kEfShlZWClQ(kleFHQUl;`f=Ucl$qj((gq08vnGAs61(p&I84ZBT zLIFyNhs*}RHxuytz6fbbi0^Y3z*;*S%f~B7BY?;6J3m^MSgZ_KhzzF}UzY3!e6;}5 z^ey1`f;6QzOIZ#0@euT*W#>oBQkx~v*PsqUItr%@UiD$9>f>|CLA>1CGP~h_EZM#)94ib8V@B5Qe{5Wavyqu0X*RLg6}TIDjLqQY2SOBx{u%Ag)roNUlKPGq|zo0A(iy>xdv> z!P__U6lJ~!8s5(T2_A1|7lI%Nf*=TjAPD|LB=v(I-oN_}GTyY+qG_6koJE~VUDuOg z)!u?WeY*MjCS{Ez0bTgls$3#0w{3OhEupUK$wk%Pq0B^Bf&NU9P^Dd7#_YncQDzra zdso->ByFwp*$>~m~02&xMFG)18Eo z_0Qp0_&(Q67O-EChXjl8&{M#EVU`lC!b1iD`vqD^unZ5G1b~eM>+q0K0OXb65gsxN zfIJes!h?YT=qJH5JQxXpGzs3}!B7C4C!s`mFctu(NhlQ_90b725&%kt2PXk=L;`x> zl`$<59vlV0p#)i@Is%aHy?1zU766?D`SnAPsdg2Jf};0Z9n8H4D~SV<{%H5Q3ttXb z0e^OTWQxdI=)#MvL8ji5B`B~7{&$t|gPdVh2l3?BpopZt~A;GjAPC4FsOE4RV^f}vmN-!CTG!NUhx;pF~ zc29|<(W4pCClOZOW2{37BCHf1Q`hUY2b6qH=;QVED;-wf6dpg{e0l46?H~w(AP9mW d2!h~W=QjacGXq9NqFw+1002ovPDHLkV1jwP8L$8V literal 0 HcmV?d00001 diff --git a/src/assets/graphics/hmenu-hover-b.png b/src/assets/graphics/hmenu-hover-b.png new file mode 100644 index 0000000000000000000000000000000000000000..0ef7f44203bfdc8ec4f1dca9f26bef2f4bfb8eb3 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=QJyZ2Ar*7p-Z;qHV8Fw2(82ZH zey(yBQ=(dBmhjmsW$gp00i_>zopr0LFJOd;kCd literal 0 HcmV?d00001 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";