Skip to content

Commit 390d559

Browse files
committed
[design] improve menu layout
1 parent 465e5e9 commit 390d559

File tree

4 files changed

+69
-64
lines changed

4 files changed

+69
-64
lines changed

‎css/base.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
--gray-19:#edeff2;
2323
--gray-20:#fafafa;
2424
--root-font-size:14px;
25-
--radius:2px;
25+
--radius:3px;
2626
--accent:0,255,0;
2727
--line-width:3px;
2828
--background:var(--gray-01);

‎css/menu.css‎

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,78 +2,91 @@
22
background-color:var(--gray-02);
33
border-radius:var(--radius);
44
position: fixed;
5-
bottom:1em;
6-
left:1em;
7-
width:calc(100%-2em);
8-
height:calc(70vh-2em);
5+
top:1em;
6+
right:1em;
7+
width:calc(100vw-2em);
8+
max-height:calc(80vh-2em);
99
overflow-y: scroll;
1010
z-index:3000;
11-
transform:translateY(calc(100%+2em));
11+
transform:translateY(calc(-100%-2em));
1212
transition: transform var(--animation-speed-fast) ease-in-out;
13-
/* display: grid;
14-
grid-template-columns: repeat(auto-fit, minmax(20em, 1fr));
15-
grid-gap: var(--line-width); */
1613
}
1714

1815
.is-menu-open .menu{
1916
transform:translateY(0);
2017
}
2118

22-
.menu-nav:not(:last-child){
23-
margin:0;
24-
}
25-
2619
.menu-area{
27-
display: none;
20+
display: flex;
21+
flex-direction: column;
2822
}
2923

30-
.menu-area.active{
31-
display: block;
24+
.menu-nav{
25+
display: flex;
26+
flex-direction: column;
3227
}
3328

34-
.menu-nav-button{
29+
.menu-nav:not(:last-child){
3530
margin:0;
36-
padding:1.5em2em;
37-
border-radius:0;
3831
}
3932

40-
.menu-nav-button.active{
41-
background-color:var(--gray-04);
42-
color:var(--white);
33+
.menu-nav-item:not(:last-child){
34+
margin:0;
4335
}
4436

4537
.menu-content{
4638
padding:2em;
4739
}
4840

49-
.menu-sub-area{
41+
.menu-content-area{
5042
display: grid;
51-
grid-template-columns:repeat(auto-fill,minmax(14em,1fr));
43+
grid-template-columns:repeat(auto-fill,1fr);
5244
grid-gap:2em;
5345
}
5446

5547
.menu-header{
56-
border-top:var(--line-width) solid var(--gray-04);
5748
padding-top:1em;
49+
border-top:var(--line-width) solid var(--gray-04);
50+
}
51+
52+
.menu-nav-button{
53+
margin:0;
54+
padding:1.5em2em;
55+
border-radius:0;
56+
}
57+
58+
.menu-nav-button.active{
59+
background-color:var(--gray-04);
60+
color:var(--white);
5861
}
5962

6063
@media (min-width:550px){
6164
.menu{
62-
height:calc(70vh-2em);
65+
max-height:calc(90vh-2em);
66+
}
67+
68+
.menu-header{
69+
padding-top:0;
70+
padding-bottom:1em;
71+
border-top:0;
72+
border-bottom:var(--line-width) solid var(--gray-04);
6373
}
6474

6575
.menu-nav{
66-
display: flex;
76+
flex-direction: row;
77+
}
78+
79+
.menu-content-area{
80+
grid-template-columns:repeat(auto-fill,minmax(12em,1fr));
6781
}
6882
}
6983

7084
@media (min-width:900px){
71-
.menu-nav{
72-
display: flex;
85+
.menu{
86+
width:calc(50vw-2em);
7387
}
7488

75-
.menu-sub-area{
76-
display: grid;
89+
.menu-content-area{
7790
grid-template-columns:repeat(auto-fill,minmax(20em,1fr));
7891
}
7992
}

‎index.html‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,21 @@
8181
</section>
8282

8383
<sectionclass="menu">
84-
<ulclass="menu-nav u-list-unstyled">
85-
<liclass="menu-nav-item">
86-
<buttonclass="menu-nav-button button button-block button-large active" data-target=".menu-area-header">Header</button>
87-
</li>
88-
<liclass="menu-nav-item">
89-
<buttonclass="menu-nav-button button button-block button-large" data-target=".menu-area-bookmarks">Bookmarks</button>
90-
</li>
91-
<liclass="menu-nav-item">
92-
<buttonclass="menu-nav-button button button-block button-large" data-target=".menu-area-layout">Layout</button>
93-
</li>
94-
</ul>
95-
<divclass="menu-content">
96-
<divclass="menu-area menu-area-header active">
97-
<divclass="menu-sub-area">
84+
<divclass="menu-area">
85+
86+
<ulclass="menu-nav u-list-unstyled">
87+
<liclass="menu-nav-item">
88+
<buttonclass="menu-nav-button button button-block button-large active" data-target=".menu-content-area-header">Header</button>
89+
</li>
90+
<liclass="menu-nav-item">
91+
<buttonclass="menu-nav-button button button-block button-large" data-target=".menu-content-area-bookmarks">Bookmarks</button>
92+
</li>
93+
<liclass="menu-nav-item">
94+
<buttonclass="menu-nav-button button button-block button-large" data-target=".menu-content-area-layout">Layout</button>
95+
</li>
96+
</ul>
97+
<divclass="menu-content">
98+
<divclass="menu-content-area menu-content-area-header">
9899
<divclass="menu-item">
99100
<h1class="menu-header">Clock</h1>
100101
<divclass="checkbox-wrap">
@@ -132,9 +133,6 @@ <h1 class="menu-header">Search</h1>
132133
<inputid="control-header-search-grow" class="control-header-search-grow" type="checkbox" tabindex="1">
133134
<labelfor="control-header-search-grow"><spanclass="label-icon"></span>Fill</label>
134135
</div>
135-
</div>
136-
<divclass="menu-item">
137-
<h1class="menu-header">Engine</h1>
138136
<divclass="radio-wrap">
139137
<inputid="control-header-search-engine-google" class="control-header-search-engine-google" type="radio" tabindex="1" name="control-header-search-engine" value="google">
140138
<labelfor="control-header-search-engine-google"><spanclass="label-icon"></span>Google</label>
@@ -157,17 +155,14 @@ <h1 class="menu-header">Engine</h1>
157155
</div>
158156
</div>
159157
<divclass="menu-item">
160-
<h1class="menu-header">Edit/Add</h1>
158+
<h1class="menu-header">Buttons</h1>
161159
<divclass="checkbox-wrap">
162160
<inputid="control-header-edit-add-active" class="control-header-edit-add-active" type="checkbox" tabindex="1">
163-
<labelfor="control-header-edit-add-active"><spanclass="label-icon"></span>Show</label>
161+
<labelfor="control-header-edit-add-active"><spanclass="label-icon"></span>Show Edit/Add</label>
164162
</div>
165-
</div>
166-
<divclass="menu-item">
167-
<h1class="menu-header">Accent</h1>
168163
<divclass="checkbox-wrap">
169164
<inputid="control-header-accent-active" class="control-header-accent-active" type="checkbox" tabindex="1">
170-
<labelfor="control-header-accent-active"><spanclass="label-icon"></span>Show</label>
165+
<labelfor="control-header-accent-active"><spanclass="label-icon"></span>Show Accent</label>
171166
</div>
172167
</div>
173168
<divclass="menu-item">
@@ -186,9 +181,7 @@ <h1 class="menu-header">Alignment</h1>
186181
</div>
187182
</div>
188183
</div>
189-
</div>
190-
<divclass="menu-area menu-area-bookmarks">
191-
<divclass="menu-sub-area">
184+
<divclass="menu-content-area menu-content-area-bookmarks is-hidden">
192185
<divclass="menu-item">
193186
<h1class="menu-header">Open</h1>
194187
<divclass="checkbox-wrap">
@@ -223,9 +216,7 @@ <h1 class="menu-header">Sort</h1>
223216
</div>
224217
</div>
225218
</div>
226-
</div>
227-
<divclass="menu-area menu-area-layout">
228-
<divclass="menu-sub-area">
219+
<divclass="menu-content-area menu-content-area-layout is-hidden">
229220
<divclass="menu-item">
230221
<h1class="menu-header">Width</h1>
231222
<divclass="radio-wrap">
@@ -250,6 +241,7 @@ <h1 class="menu-header">Page</h1>
250241
</div>
251242
</div>
252243
</div>
244+
253245
</div>
254246
</section>
255247

‎js/menu.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ var menu = (function(){
1111

1212
var_tab=function(button){
1313
varallMenuNavButton=helper.eA(".menu-nav-button");
14-
varallMenuArea=helper.eA(".menu-area");
14+
varallMenuContentArea=helper.eA(".menu-content-area");
1515
vartarget=helper.e(button.dataset.target);
1616
allMenuNavButton.forEach(function(arrayItem,index){
1717
helper.removeClass(arrayItem,"active");
1818
});
19-
allMenuArea.forEach(function(arrayItem,index){
20-
helper.removeClass(arrayItem,"active");
19+
allMenuContentArea.forEach(function(arrayItem,index){
20+
helper.addClass(arrayItem,"is-hidden");
2121
});
2222
helper.addClass(button,"active");
23-
helper.addClass(target,"active");
23+
helper.removeClass(target,"is-hidden");
2424
};
2525

2626
varclose=function(){

0 commit comments

Comments
(0)