diff --git a/src/components/Slides/Menu/Menu.js b/src/components/Slides/Menu/Menu.js old mode 100644 new mode 100755 index 879dc00..e58ef98 --- 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 { } customCrossIcon={ false } > - diff --git a/src/components/Slides/Menu/StainInformation.js b/src/components/Slides/Menu/StainInformation.js deleted file mode 100644 index 2e9a437..0000000 --- a/src/components/Slides/Menu/StainInformation.js +++ /dev/null @@ -1,27 +0,0 @@ -import React, { Component } from 'react'; -import { Col, Row } from 'reactstrap'; -import Parser from 'html-react-parser'; -import { noSlidesFound } from '../slideHelpers.js'; - -class StainInformation extends Component { - - render() { - if (!noSlidesFound(this.props.selectedPatient)) { - return( - - -
-
{Parser(this.props.selectedPatient.selectedSlide.slideName)}
-
{Parser(this.props.selectedPatient.selectedSlide.stain.title)}
-
{Parser(this.props.selectedPatient.selectedSlide.stain.description)}
-
- -
- ); - } else { - return null; - } - } -} - -export default StainInformation; \ No newline at end of file diff --git a/src/components/Slides/Menu/StainInformationContainer.js b/src/components/Slides/Menu/StainInformationContainer.js deleted file mode 100644 index f96a689..0000000 --- a/src/components/Slides/Menu/StainInformationContainer.js +++ /dev/null @@ -1,13 +0,0 @@ -import { connect } from 'react-redux'; -import StainInformation from './StainInformation'; - -const mapStateToProps = (state, props) => - ({ - selectedPatient: state.selectedPatient - }); - -const mapDispatchToProps = (dispatch, props) => - ({ - }); - -export default connect(mapStateToProps, mapDispatchToProps)(StainInformation); \ No newline at end of file diff --git a/src/menu.scss b/src/menu.scss old mode 100644 new mode 100755 index 3e8efac..a41b4e1 --- 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; - } - } - } - } } \ No newline at end of file