Revert "Merge branch 'caffinatedmonkey-styles't push origin master"

This reverts commit 1cff51d4ac, reversing
changes made to 5bfb675602.
This commit is contained in:
An Phan 2016-05-22 20:05:25 +08:00
parent 1cff51d4ac
commit 19585bcdc4
4 changed files with 11 additions and 15 deletions

View file

@ -110,6 +110,7 @@
padding: 24px 16px $footerHeight;
background: $colorExtraBgr;
max-height: calc(100vh - #{$headerHeight + $footerHeight});
display: none;
color: $color2ndText;
overflow: auto;
-ms-overflow-style: -ms-autohiding-scrollbar;
@ -175,18 +176,16 @@
@media only screen and (max-width : 1024px) {
position: fixed;
top: $headerHeight;
right: 0;
height: calc(100vh - #{$headerHeight + $footerHeight});
width: $extraPanelWidth;
padding-bottom: $footerHeight; // make sure the footer can never overlap the content
width: $extraPanelWidth;
z-index: 5;
transform: translateX(100%);
transition: transform .3s $slideAnimation;
top: $headerHeight;
right: -100%;
transition: right .3s ease-in;
&.showing {
transform: translateX(0);
right: 0;
}
}

View file

@ -105,7 +105,6 @@
align-items: center;
align-content: stretch;
display: flex;
line-height: 1em;
span:first-child {
flex: 1;

View file

@ -263,17 +263,16 @@
@media only screen and (max-width : 667px) {
position: fixed;
top: $headerHeight;
height: calc(100vh - #{$headerHeight + $footerHeight});
width: 100%;
padding-bottom: $footerHeight; // make sure the footer can never overlap the content
width: 100%;
z-index: 99;
transform: translateX(-100%);
transition: transform .3s $slideAnimation;
top: $headerHeight;
left: -100%;
transition: left .3s ease-in;
&.showing {
transform: translateX(0);
left: 0;
}
}
}

View file

@ -35,4 +35,3 @@ $footerHeight: 64px;
$mainHeadingHeight: 64px;
$extraPanelWidth: 334px;
$slideAnimation: cubic-bezier(0,0,0.3,1);