Skip to content

Commit 86aee68

Browse files
Updated Navbar
1 parent 22f0316 commit 86aee68

File tree

20 files changed

+480
-348
lines changed

20 files changed

+480
-348
lines changed
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
.overall_container{
1+
.overall_container {
22
display: flex;
33
.main_navigation {
4-
left: -1px;
5-
top: -1px;
6-
height: 100vh;
7-
border-right: 1px solid #CCCCCC;
8-
box-sizing: border-box;
4+
background: #f5f5f5;
5+
flex-grow: 1;
6+
border-right: solid 1px #dfe9f1;
7+
position: fixed;
8+
top: 0px;
9+
bottom: 0px;
10+
left: 0px;
11+
overflow-y: scroll;
912
}
1013
.org_settings_view {
14+
margin-left: 13vw;
1115
margin-top: 35px;
1216
.main_section {
1317
display: flex;
@@ -20,15 +24,15 @@
2024
height: 50%;
2125
margin-top: 16px;
2226
margin-left: 10px;
23-
.header_text {
24-
font-family: Inter;
25-
font-style: normal;
26-
font-weight: 500;
27-
font-size: 18px;
28-
line-height: 21px;
29-
letter-spacing: 0.25px;
30-
color: #9E9E9E;
31-
}
27+
.header_text {
28+
font-family: Inter;
29+
font-style: normal;
30+
font-weight: 500;
31+
font-size: 18px;
32+
line-height: 21px;
33+
letter-spacing: 0.25px;
34+
color: #9e9e9e;
35+
}
3236
}
3337

3438
.right_section {
@@ -40,29 +44,29 @@
4044
}
4145
}
4246
}
43-
// mobile
47+
// mobile
4448
@media screen and (max-width: 768px) {
45-
.overall_container{
49+
.overall_container {
4650
.org_settings_view {
47-
.main_section {
48-
.left_nav {
49-
.navigation {
50-
.list-group {
51-
.link {
52-
display: none;
53-
}
54-
.header_text {
55-
font-size: 10px;
56-
}
57-
}
58-
}
59-
}
60-
}
51+
.main_section {
52+
.left_nav {
53+
.navigation {
54+
.list-group {
55+
.link {
56+
display: none;
57+
}
58+
.header_text {
59+
font-size: 10px;
60+
}
61+
}
62+
}
63+
}
64+
}
6165
}
6266
}
6367
}
6468

65-
// tablet
69+
// tablet
6670
@media screen and (min-width: 768px) and (max-width: 1023px) {
6771
.overall_container {
6872
.org_settings_view {
@@ -79,4 +83,8 @@
7983
}
8084
}
8185
}
82-
}
86+
}
87+
88+
.main_navigation::-webkit-scrollbar {
89+
display: none;
90+
}

src/user/dashboard/dashboard.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
height: auto;
55
font-family: Muli, sans-serif;
66
.navigation {
7-
background: #f5f5f5;;
7+
background: #f5f5f5;
88
flex-grow: 1;
99
border-right: solid 1px #dfe9f1;
1010
position: fixed;
1111
top: 0px;
1212
bottom: 0px;
1313
left: 0px;
14+
overflow-y: scroll;
1415
}
1516
.news {
16-
margin-left: 10%;
17+
margin-left: 13vw;
1718
flex-grow: 4;
1819
.notify-user {
1920
display: flex;
@@ -27,3 +28,7 @@
2728
padding: 20px 12px 20px 0px;
2829
}
2930
}
31+
32+
.navigation::-webkit-scrollbar {
33+
display: none;
34+
}

0 commit comments

Comments
 (0)