Merge pull request #4 from KPMP/KPMP-535_Remove_Stain_Info

KPMP-535: Remove stains
KPMP · Dec 18, 2018 · 63b490e · 63b490e
2 parents 41cc759 + d8b1d70
commit 63b490e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 87 deletions.
diff --git a/src/components/Slides/Menu/Menu.js b/src/components/Slides/Menu/Menu.js
@@ -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 {
 
@@ -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"/>

diff --git a/src/components/Slides/Menu/StainInformation.js b/src/components/Slides/Menu/StainInformation.js
diff --git a/src/components/Slides/Menu/StainInformationContainer.js b/src/components/Slides/Menu/StainInformationContainer.js
diff --git a/src/menu.scss b/src/menu.scss
@@ -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 {
@@ -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;
-				}					
-			}
-		}
-	}
 }