fix merge
This commit is contained in:
@@ -14,16 +14,16 @@
|
||||
|
||||
// Globe
|
||||
.globe {
|
||||
margin-top: -96px;
|
||||
margin-bottom: -160px;
|
||||
// margin-top: -96px;
|
||||
// margin-bottom: -160px;
|
||||
|
||||
@include breakpoint (sm) {
|
||||
margin-bottom: calc(-120px - 6vw);
|
||||
}
|
||||
@include breakpoint (xl) {
|
||||
margin-top: -176px;
|
||||
margin-bottom: -240px;
|
||||
}
|
||||
// @include breakpoint (sm) {
|
||||
// margin-bottom: calc(-120px - 6vw);
|
||||
// }
|
||||
// @include breakpoint (xl) {
|
||||
// margin-top: -176px;
|
||||
// margin-bottom: -240px;
|
||||
// }
|
||||
}
|
||||
|
||||
// Browse
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
transition: opacity 0.4s $ease-quart;
|
||||
transition: opacity 0.3s $ease-quart;
|
||||
will-change: opacity;
|
||||
|
||||
&.is-transitioning {
|
||||
|
||||
Reference in New Issue
Block a user