Skip to content

Commit b8ff238

Browse files
khangonntthitrinh
authored andcommitted
feature 9125: Fix top menu for mobile screens (#9143)
* feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens --------- Co-authored-by: ntthitrinh <[email protected]>
1 parent cc40e2e commit b8ff238

File tree

4 files changed

+286
-85
lines changed

4 files changed

+286
-85
lines changed

app/components/nav-bar.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,23 @@ export default class NavBar extends Component {
8686
return !(String(this.session.currentRouteName).includes('events.view'));
8787
}
8888

89+
@computed('isNotPublicPageRoute')
90+
get checkShowClassCssPublic() {
91+
if (this.session.isAuthenticated) {
92+
if (this.isNotPublicPageRoute) {
93+
return 'au-home-page';
94+
} else {
95+
return 'au-public-page';
96+
}
97+
} else {
98+
if (this.isNotPublicPageRoute) {
99+
return 'un-home-page';
100+
} else {
101+
return 'un-public-page';
102+
}
103+
}
104+
}
105+
89106
@action
90107
handleKeyPress() {
91108
if (event.keyCode === 13 || event.which === 13) {
@@ -120,6 +137,7 @@ export default class NavBar extends Component {
120137
});
121138
}
122139

140+
123141
@action
124142
handleClick() {
125143
this.router.replaceWith('public.index', this.globalData.idEvent);

app/styles/pages/public-event.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -228,17 +228,11 @@
228228
}
229229

230230
.logo-event {
231-
margin: 10px !important;
232-
width: 56px !important;
231+
// margin: 10px !important;
232+
// width: 56px !important;
233233
height: auto;
234234
}
235235

236-
.btn-un-bd {
237-
border: unset;
238-
padding: unset !important;
239-
height: 46px !important;
240-
}
241-
242236
.public-social-links {
243237
margin-top: 1.5rem !important;
244238
}

app/styles/partials/nav-bar.scss

Lines changed: 180 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@
3434
}
3535

3636
.menu-item-public {
37+
height: 100%;
3738
padding-left: unset !important;
3839
padding-right: unset !important;
39-
font-size: 12px;
40+
font-size: 10px;
4041
}
4142

4243
.item-exhibition {
@@ -45,12 +46,8 @@
4546
}
4647
}
4748

48-
.rm-pd-l {
49-
width: 100% !important;
50-
}
51-
5249
.item-public {
53-
font-size: .85714286rem !important;
50+
font-size: 9px !important;
5451
}
5552

5653
.item-menu-right {
@@ -62,6 +59,181 @@
6259
}
6360

6461
.item-padding {
65-
padding-left: 8px !important;
66-
padding-right: 8px !important;
62+
padding-left: 16px !important;
63+
padding-right: 16px !important;
64+
}
65+
66+
.header-mobile > .layout-header-mobile > .row > .two.wide.column.bl-six {
67+
width: 14.5% !important;
68+
}
69+
70+
.layout-header-mobile {
71+
72+
.row {
73+
position: absolute;
74+
}
75+
76+
77+
.reset-pd {
78+
padding: unset !important;
79+
}
80+
81+
.bl-one {
82+
display: flex !important;
83+
margin-right: -22px !important;
84+
padding-left: 18px !important;
85+
border-left: 1px solid rgba(34, 36, 38, .15) !important;
86+
87+
.item-bl-one {
88+
width: calc(100% - 44px);
89+
}
90+
}
91+
92+
.bl-two {
93+
margin-left: 9px !important;
94+
border-left: 1px solid rgba(34, 36, 38, .15);
95+
font-size: 14px;
96+
97+
.item-bl-two-login {
98+
border-right: 1px solid rgba(34, 36, 38, .15) !important;
99+
height: 100%;
100+
display: flex !important;
101+
justify-content: center;
102+
align-items: center;
103+
}
104+
105+
.btn-un-bd {
106+
border: unset;
107+
padding: unset !important;
108+
height: 46px !important;
109+
width: 100%;
110+
margin: auto !important;
111+
text-align: center;
112+
display: flex;
113+
justify-content: center;
114+
align-items: center;
115+
116+
img {
117+
width: 80%;
118+
}
119+
}
120+
}
121+
122+
.bl-three {
123+
display: flex !important;
124+
text-align: center;
125+
justify-content: center;
126+
}
127+
128+
.bl-three-border {
129+
border-right: 1px solid rgba(34, 36, 38, .15);
130+
}
131+
132+
.bl-four {
133+
display: flex !important;
134+
text-align: center;
135+
justify-content: center;
136+
137+
.menu-speakers {
138+
padding-left: 8px !important;
139+
padding-right: 8px !important;
140+
}
141+
}
142+
143+
.bl-six {
144+
border-right: 1px solid rgba(34, 36, 38, .15);
145+
146+
.au-public-page {
147+
justify-content: center;
148+
}
149+
150+
.un-public-page {
151+
display: flex;
152+
justify-content: center;
153+
align-items: center;
154+
}
155+
}
156+
157+
.bl-six-border {
158+
border-left: 1px solid rgba(34, 36, 38, .15);
159+
}
160+
161+
.bl-seven-au-public-page {
162+
margin-right: auto !important;
163+
margin-left: auto !important;
164+
165+
.au-public-page-text {
166+
text-align: center !important;
167+
justify-content: center;
168+
}
169+
}
170+
171+
.au-home-page-text {
172+
justify-content: center;
173+
}
174+
175+
.bl-seven-au-home-page {
176+
.text-home-page {
177+
display: flex !important;
178+
justify-content: center;
179+
}
180+
}
181+
182+
.bl-seven {
183+
left: 3px;
184+
width: 18.5% !important;
185+
margin: unset !important;
186+
display: flex !important;
187+
text-align: center;
188+
justify-content: center;
189+
align-items: center;
190+
191+
a {
192+
width: calc(100% - 4px);
193+
background-color: #fff !important;
194+
}
195+
196+
.tag-a-not-login {
197+
display: flex;
198+
justify-content: center;
199+
align-items: center;
200+
padding: unset !important;
201+
}
202+
203+
.a-login-public {
204+
display: flex;
205+
justify-content: center;
206+
align-items: center;
207+
padding: unset !important;
208+
}
209+
}
210+
211+
.bl-six-login {
212+
button {
213+
padding-left: 7px !important;
214+
}
215+
}
216+
217+
.bl-seven-not-login {
218+
margin-right: unset !important;
219+
}
220+
221+
.item {
222+
&::before {
223+
position: unset !important;
224+
content: unset !important;
225+
top: unset !important;
226+
right: unset !important;
227+
height: unset !important;
228+
width: unset !important;
229+
background: unset !important;
230+
}
231+
}
232+
}
233+
234+
.set-bd-home {
235+
padding-left: 21px !important;
236+
padding-top: unset !important;
237+
padding-right: unset !important;
238+
padding-bottom: unset !important;
67239
}

0 commit comments

Comments
 (0)