Skip to content

Commit a076e4f

Browse files
authored
[design] improve menu with new grid
1 parent 5ebd94b commit a076e4f

File tree

6 files changed

+46
-33
lines changed

6 files changed

+46
-33
lines changed

‎css/base.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ body{
100100
height:100vh;
101101
}
102102

103+
.is-menu-openbody{
104+
overflow: hidden;
105+
}
106+
103107
.is-header-alignment-vertical-topbody{
104108
justify-content: flex-start;
105109
}

‎css/header.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525

2626
.is-header-shade-style-scroll .header .header-shade{
27-
transition: background-color var(--animation-speed-fast) ease-in-out;
27+
transition: background-color var(--animation-speed-slow) ease-in-out;
2828
animation: none;
2929
}
3030

‎css/menu.css‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
.menu{
2-
background-color:rgb(var(--gray-01));
3-
border-radius:var(--radius);
2+
padding:1em;
43
position: fixed;
5-
top:1em;
6-
right:1em;
7-
width:calc(100vw-2em);
8-
max-height:calc(80vh-2em);
9-
overflow-y: auto;
4+
top:0;
5+
right:0;
6+
width:100%;
7+
height:80vh;
108
transform:translateY(calc(-100%-2em));
119
transition: transform var(--animation-speed-fast) ease-in-out;
1210
z-index:var(--z-index-menu);
11+
pointer-events: none;
1312
}
1413

1514
.menu:focus{
@@ -21,18 +20,24 @@
2120
}
2221

2322
.menu-area{
24-
display: flex;
25-
flex-direction: column;
23+
background-color:rgb(var(--gray-01));
24+
border-radius:var(--radius);
25+
width:100%;
26+
height:100%;
27+
overflow-y: auto;
28+
pointer-events: all;
2629
}
2730

2831
.menu-nav{
2932
display: flex;
3033
flex-direction: column-reverse;
34+
flex-direction: row;
3135
}
3236

3337
.menu-nav-area{
3438
display: flex;
35-
flex-direction: column;
39+
flex-direction: row;
40+
flex-wrap: wrap;
3641
}
3742

3843
.menu-nav-area-grow{
@@ -44,7 +49,7 @@
4449
}
4550

4651
.menu-content{
47-
padding:2em;
52+
padding:2em2em20vh2em;
4853
}
4954

5055
.menu-content-area{
@@ -79,6 +84,7 @@
7984
padding-bottom:1em;
8085
border-radius:0;
8186
flex-grow:1;
87+
flex-basis:50%;
8288
}
8389

8490
.menu-nav-button:first-child{
@@ -94,27 +100,29 @@
94100

95101
@media (min-width:550px){
96102
.menu{
103+
width:80vw;
104+
height:100%;
97105
overflow-y: inherit;
98106
max-height: inherit;
99107
}
100108

101-
.menu-content{
102-
padding:2em;
103-
max-height:70vh;
104-
overflow-y: scroll;
105-
}
106-
107-
.menu-nav{
108-
flex-direction: row;
109+
.menu-area{
110+
overflow-y: inherit;
111+
display: grid;
112+
grid-template-columns:1fr;
113+
grid-template-rows:1fr100fr;
114+
grid-column-gap:0px;
115+
grid-row-gap:0px;
116+
justify-items: stretch;
117+
align-items: stretch;
109118
}
110119

111-
.menu-nav-area{
112-
flex-direction: row;
120+
.menu-content{
121+
overflow-y: auto;
113122
}
114123

115124
.menu-content-area{
116125
grid-template-columns:repeat(2,1fr);
117-
margin-bottom:10vh;
118126
}
119127

120128
.menu-nav-button{
@@ -124,15 +132,12 @@
124132

125133
@media (min-width:900px){
126134
.menu{
127-
width:calc(60vw-2em);
128-
max-height:calc(100vh-2em);
129-
max-width:40em;
135+
width:60vw;
130136
}
131137
}
132138

133139
@media (min-width:1100px){
134140
.menu{
135-
width:calc(50vw-2em);
136-
max-width:50em;
141+
width:50vw;
137142
}
138143
}

‎index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898

9999
<divclass="menu-nav">
100100
<divclass="menu-nav-area menu-nav-area-grow mb-0 list-unstyled">
101-
<buttonclass="menu-nav-button button button-block button-large active" data-target=".menu-content-area-header" tabindex="1">Header</button>
102-
<buttonclass="menu-nav-button button button-block button-large" data-target=".menu-content-area-bookmarks" tabindex="1">Bookmarks</button>
103-
<buttonclass="menu-nav-button button button-block button-large" data-target=".menu-content-area-layout" tabindex="1">Layout</button>
104-
<buttonclass="menu-nav-button button button-block button-large" data-target=".menu-content-area-background" tabindex="1">Background</button>
101+
<buttonclass="menu-nav-button button button-large active" data-target=".menu-content-area-header" tabindex="1">Header</button>
102+
<buttonclass="menu-nav-button button button-large" data-target=".menu-content-area-bookmarks" tabindex="1">Bookmarks</button>
103+
<buttonclass="menu-nav-button button button-large" data-target=".menu-content-area-layout" tabindex="1">Layout</button>
104+
<buttonclass="menu-nav-button button button-large" data-target=".menu-content-area-background" tabindex="1">Background</button>
105105
</div>
106106
<divclass="menu-nav-area">
107107
<buttonclass="menu-close button button-block button-large mb-0" tabindex="1"><spanclass="icon-close"></span></button>

‎js/update.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ var update = (function(){
187187
console.log("\trunning update",2.90);
188188
data=_update_290(data);
189189
};
190+
if(data.version<2.91){
191+
console.log("\trunning update",2.91);
192+
data.version=2.91;
193+
};
190194
// if (data.version < 3.00){
191195
// console.log("\t# running update", 3.00);
192196
// data = _update_300(data);

‎js/version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
varversion=(function(){
22

33
// version is normally bumped when the state needs changing or any new functionality is added
4-
varcurrent="2.9.0";
4+
varcurrent="2.9.1";
55

66
varget=function(){
77
varnumber=current.split(".");

0 commit comments

Comments
(0)