Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KPMP-535: Remove stains #4

Merged
merged 1 commit into from
Dec 18, 2018
Merged

KPMP-535: Remove stains #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/components/Slides/Menu/Menu.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import SlideListContainer from './SlideListContainer';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faBars, faHome } from '@fortawesome/free-solid-svg-icons';
import { Link } from 'react-router-dom';
import StainInformationContainer from './StainInformationContainer';

class Menu extends Component {

Expand All @@ -27,7 +26,6 @@ class Menu extends Component {
<BurgerMenu isOpen={ this.state.isOpen } width={ '450px' } noOverlay customBurgerIcon={ <FontAwesomeIcon icon={faBars} /> }
customCrossIcon={ false } >
<SlideListContainer toggleMenu={this.toggleMenu}/>
<StainInformationContainer />
</BurgerMenu>
<Link id="btn-home" to="/">
<FontAwesomeIcon icon={faHome} size="2x"/>
Expand Down
27 changes: 0 additions & 27 deletions src/components/Slides/Menu/StainInformation.js
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/components/Slides/Menu/StainInformationContainer.js
View file
Open in desktop

This file was deleted.

48 changes: 3 additions & 45 deletions src/menu.scss
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ $menu-header-height: 80px;
#menu-slide-list {
background: white;
border-bottom: 1px solid silver;

.col {
padding-left: 0px;
padding-right: 0px;
}

#menu-slide-list-slides {
max-height: calc(60vh - #{$header-height});
min-height: calc(60vh - #{$header-height});
max-height: calc(100vh - (#{$header-height} + #{$menu-header-height}));
min-height: calc(100vh - (#{$header-height} + #{$menu-header-height}));
overflow: auto;

.slide-highlighted {
Expand Down Expand Up @@ -154,46 +154,4 @@ $menu-header-height: 80px;
}

}


#stain-information {
// for some reason, we need to remove a little more height
// so that we don't cut the bottom off the stain info box
min-height: calc(40vh - (#{$header-height} + 21px));
max-height: calc(40vh - (#{$header-height} + 21px) );
overflow-x: hidden;
overflow: auto;
padding-left: 10px;

.col {
padding-left: 0px;
padding-right: 10px;
}

#slide-stain-text {
.slide-name-stain-text {
padding-top: 10px;
padding-bottom: 15px;
font-weight: 700;
font-size: 14px;
}

.stain-title {
font-weight: 700;
font-size: 18px;
padding-bottom: 5px;
}

.stain-description {
a:hover {
text-decoration: underline;
color: $link-blue;
}
a {
text-decoration: none;
color: $link-blue;
}
}
}
}
}