From 6b3520bdf3d3c900eb0d168c8ced381a874c90ef Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Thu, 7 Apr 2016 10:06:04 -0700 Subject: [PATCH] Started on prompt --- app/components/Sidebar.js | 4 ++-- app/components/base/Modal.js | 1 + app/components/base/PromptModal.js | 22 ++++++++++++++++++++++ app/css/components/modal.scss | 6 ++++-- app/css/layout/base.scss | 2 +- 5 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 app/components/base/PromptModal.js diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js index 9dd9da7d09..2955e541ae 100644 --- a/app/components/Sidebar.js +++ b/app/components/Sidebar.js @@ -67,7 +67,7 @@ class Sidebar extends Component { const isActive = activeRequest && filteredRequests.find(r => r.id == activeRequest.id); let folderIconClass = 'fa-folder'; - let expanded = !requestGroup.collapsed; + let expanded = !requestGroup.collapsed || activeFilter; folderIconClass += !expanded ? '' : '-open'; folderIconClass += isActive ? '' : '-o'; @@ -152,7 +152,7 @@ class Sidebar extends Component { diff --git a/app/components/base/Modal.js b/app/components/base/Modal.js index 4c225add5c..eb35370cf0 100644 --- a/app/components/base/Modal.js +++ b/app/components/base/Modal.js @@ -71,6 +71,7 @@ class Modal extends Component { if (!this.state.visible) { return null; } + console.log('render'); return (
diff --git a/app/components/base/PromptModal.js b/app/components/base/PromptModal.js new file mode 100644 index 0000000000..b18ad414f3 --- /dev/null +++ b/app/components/base/PromptModal.js @@ -0,0 +1,22 @@ +import React, {Component, PropTypes} from 'react'; +import {Modal, ModalHeader, ModalBody, ModalFooter} from './Modal' + +class PromptModal extends Component { + render () { + return ( + + {this.props.header} + + Footer + + ) + } +} + +PromptModal.propTypes = { + onSubmit: PropTypes.func.isRequired, + header: PropTypes.string.isRequired, + onClose: PropTypes.func +}; + +export default PromptModal; diff --git a/app/css/components/modal.scss b/app/css/components/modal.scss index 26b534e3b5..a790f41587 100644 --- a/app/css/components/modal.scss +++ b/app/css/components/modal.scss @@ -12,7 +12,8 @@ padding: $padding-xl; .modal__header { - border-radius: $radius-md; + border-top-left-radius: $radius-md; + border-top-right-radius: $radius-md; border-bottom: 1px solid $hl-md; } @@ -25,7 +26,8 @@ } .modal__footer { - border-radius: $radius-md; + border-bottom-left-radius: $radius-md; + border-bottom-right-radius: $radius-md; border-top: 1px solid $hl-md; } } diff --git a/app/css/layout/base.scss b/app/css/layout/base.scss index 4e9cf31ba4..9fd58590f5 100644 --- a/app/css/layout/base.scss +++ b/app/css/layout/base.scss @@ -81,7 +81,7 @@ i.fa { } .scrollable { - overflow: scroll; + overflow: auto; } .hover-scrollbars {