Skip to content

Commit 13b45cd

Browse files
author
Chasen Le Hara
committed
Revert "Fix scrolling issues"
This reverts commit 272cf80.
1 parent c5775bb commit 13b45cd

File tree

6 files changed

+78
-39
lines changed

6 files changed

+78
-39
lines changed

static/base.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
body {
22
height: 100%;
3+
overflow: hidden;
34
margin: 0px;
45
}
56
html {

static/header.less

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@
88
}
99
}
1010
.header {
11-
position: fixed;
12-
background-color: #FFFFFF;
13-
width: 100%;
14-
box-shadow: 0 0 5px 0 rgba(0,0,0,0.25);
1511
display: flex;
1612
align-items: center;
1713
flex-shrink: 0;
1814
padding: 0 @gutter*2;
1915
@media screen and (max-width: 499px){
2016
padding: 0 @gutter;
2117
}
22-
z-index: 101;
18+
background-color: #FFFFFF;
19+
z-index: 1;
20+
box-shadow: 0 0 5px 0 rgba(0,0,0,0.25);
2321
}
2422
.brand {
2523
display: flex;
@@ -51,6 +49,7 @@
5149
display: none;
5250
}
5351
}
52+
5453
// ----- CANJS LOGO AND VERSION DESKTOP -----
5554
@media screen and (min-width: @breakpoint) {
5655
.brand {

static/layout.less

Lines changed: 59 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,69 @@
1+
#everything {
2+
.flex;
3+
-webkit-flex-flow: row wrap;
4+
justify-content: flex-start;
5+
align-items: stretch;
6+
flex-wrap: nowrap;
7+
box-sizing: border-box;
8+
height: 100%;
9+
-webkit-overflow-scrolling: touch;
10+
padding-bottom: 0;
11+
transition: padding-bottom @transition-speed ease;
12+
}
113
#left {
214
position: fixed;
3-
float: left;
15+
scroll-behavior: smooth;
416
width: @sidebar-width;
5-
height: 100%;
6-
margin-top: @brand-height;
7-
padding-bottom: @gutter*2;
8-
z-index: 51;
9-
overflow-y: auto;
17+
min-width: 0;
18+
transition: min-width @transition-speed ease;
19+
border-right: 3px solid #F4F4F4;
20+
@media screen and (min-width: @breakpoint){
21+
flex-shrink: 0;
22+
padding: 0px;
23+
position: relative;
24+
width: auto;
25+
}
1026
}
1127
#right {
28+
height: 100%;
29+
min-height: 100%;
30+
max-height: 100%;
31+
background: white;
32+
overflow-x: hidden;
33+
// z-index: 90;
1234
position: relative;
13-
float: right;
14-
width: ~"calc(100% - " @sidebar-width ~")";
15-
margin-top: @brand-height;
16-
z-index: 1;
35+
left: 0;
36+
.transition-left;
37+
flex-grow: 1;
38+
@media screen and (min-width: @breakpoint){
39+
display: flex;
40+
flex-grow: 1;
41+
}
42+
}
43+
.column {
44+
height: 100%;
45+
overflow-y: auto;
46+
box-sizing: border-box;
47+
.flex;
48+
justify-content: flex-start;
49+
align-items: stretch;
50+
flex-wrap: nowrap;
51+
flex-direction: column;
1752
}
18-
@media screen and (max-width: @breakpoint){
19-
#right {
53+
54+
@media screen and (min-width: @breakpoint){
55+
.top-left {
2056
width: 100%;
57+
height: auto;
58+
}
59+
}
60+
.top-right {
61+
flex-shrink: 0;
62+
flex-wrap: nowrap;
63+
height: auto;
64+
width: 100%;
65+
.border-bottom;
66+
@media screen and (min-width: @breakpoint){
67+
border: none;
2168
}
2269
}

static/mobile.less

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,21 @@ label[for="nav-trigger"] {
2424
label:hover{
2525
background: @border-color;
2626
}
27-
28-
@media screen and (max-width: @breakpoint){
29-
.nav-trigger:not(:checked) ~ #everything #left {
30-
left: -@sidebar-width;
31-
overflow-x: hidden;
32-
transition: left .5s ease-in-out;
33-
}
34-
.nav-trigger:checked ~ #everything #left {
35-
left: 0;
36-
transition: left .5s ease-in-out;
37-
}
38-
.nav-trigger:not(:checked) ~ #everything #right {
39-
left: 0;
40-
overflow-x: hidden;
41-
transition: left .5s ease-in-out;
42-
}
43-
.nav-trigger:checked ~ #everything #right {
27+
.nav-trigger ~ #everything #right {
28+
width: 100%;
29+
}
30+
.nav-trigger:checked ~ #everything #right {
31+
@media screen and (max-width: @breakpoint){
32+
flex-shrink: 0;
33+
width: auto;
34+
position: fixed;
4435
left: @sidebar-width;
4536
overflow-x: hidden;
46-
transition: left .5s ease-in-out;
37+
}
38+
}
39+
@media screen and (max-width: 999px) {
40+
.nav-trigger:not(:checked) ~ #everything #left {
41+
visibility: hidden;
4742
}
4843
}
4944
.nav-trigger + label {

static/sidebar.less

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ img.social-icon-small{
5656
#left {
5757
display: none;
5858
}
59-
#right {
60-
width: 100%;
61-
}
6259
}
6360
}
6461
#left {

static/variables.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@brand-height: 53px;
1515
@breakpoint: 1000px;
1616
@gutter: 15px;
17-
@sidebar-width: 275px;
17+
@sidebar-width: 274px;
1818
@transition-speed: .25s;
1919

2020
/*----- TYPE -----*/

0 commit comments

Comments
 (0)