From d0d65631dfda6b43339e5c3dd1f1c336040d6672 Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 26 Aug 2019 05:47:01 -0700 Subject: Fix the CSS Remove colors settings in global css and add the theme property to the menubar correctly (not via global prop anymore) Issue-ID: CLAMP-477 Change-Id: Ie0ba1ea350e393d452108b1dadb10e7dbe1dab23 Signed-off-by: sebdet --- .../OperationalPolicy/OperationalPolicy.css | 73 ---------------------- .../OperationalPolicy/OperationalPolicyModal.js | 2 - ui-react/src/components/menu/MenuBar.js | 48 +++++++++----- 3 files changed, 31 insertions(+), 92 deletions(-) delete mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css (limited to 'ui-react/src/components') diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css deleted file mode 100644 index 94a91c234..000000000 --- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css +++ /dev/null @@ -1,73 +0,0 @@ -.disabled { - background-color: #dddd; -} - -label { - text-align: right; - vertical-align: middle; -} - -.leftPolicyPanel { - padding: 0 10px 0 0; -} - -.idError { - color: red; - padding: 50px 0px; - text-align: center; - display: none; -} - -.policyPanel { - background-color: #f5f5f5; - padding: 15px 5px 0 5px; -} - -.form-group.clearfix { - display: -webkit-flex; - display: flex; - align-items: center; -} - -label { - margin-bottom: 0px; -} - -.withnote { - margin-bottom: 0px; -} - -.note { - font-size:10px; - margin-left: 250px; - font-weight: normal; -} - -#policyTable { - cursor: pointer; - width: 100%; -} - -#policyTable tr { - border-bottom: 1px solid #ddd; - border-collapse: collapse; - text-align: left; - font-size: 12px; - font-weight: normal; -} - -#policyTable td { - padding: 8px 10px; -} - -#policyTable tr.highlight { - background-color: #f5f5f5; - font-weight: bold; - font-size: 13px; -} - -#policyTableHolder { - height: 200px; - width: 100%; - overflow: auto; -} \ No newline at end of file diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js index 6db38fd23..7f349a10f 100644 --- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js +++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js @@ -78,7 +78,6 @@ export default class OperationalPolicyModal extends React.Component { setDefaultJsonEditorOptions() { JSONEditor.defaults.options.theme = 'bootstrap4'; - // JSONEditor.defaults.options.iconlib = 'bootstrap2'; JSONEditor.defaults.options.object_layout = 'grid'; JSONEditor.defaults.options.disable_properties = true; @@ -89,7 +88,6 @@ export default class OperationalPolicyModal extends React.Component { JSONEditor.defaults.options.array_controls_top=true; JSONEditor.defaults.options.show_errors = 'always'; JSONEditor.defaults.options.keep_oneof_values=false; - JSONEditor.defaults.options.ajax=true; JSONEditor.defaults.options.collapsed=true; //JSONEditor.defaults.options.template = 'default'; } diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js index 121787ffd..b68e2376a 100644 --- a/ui-react/src/components/menu/MenuBar.js +++ b/ui-react/src/components/menu/MenuBar.js @@ -27,10 +27,10 @@ import NavDropdown from 'react-bootstrap/NavDropdown'; import LoopUI from '../../LoopUI'; import 'bootstrap-css-only/css/bootstrap.min.css'; import styled from 'styled-components'; -import { Link } from 'react-router-dom' +import { Link } from 'react-router-dom'; const StyledLink = styled(Link)` - color: ${props => props.theme.menuColor}; + color: ${props => props.theme.menuFontColor}; background-color: ${props => props.theme.menuBackgroundColor}; font-weight: normal; display: block; @@ -41,21 +41,34 @@ const StyledLink = styled(Link)` white-space: nowrap; border: 0; :hover { - text-decoration: none; - background-color: ${props => props.theme.loopViewerHeaderBackgroundColor}; - color: ${props => props.theme.loopViewerHeaderFontColor}; + text-decoration: none; + background-color: ${props => props.theme.menuHighlightedBackgroundColor}; + color: ${props => props.theme.menuHighlightedFontColor}; } `; const StyledNavLink = styled(Nav.Link)` - color: ${props => props.theme.menuColor}; + color: ${props => props.theme.menuFontColor}; background-color: ${props => props.theme.menuBackgroundColor}; - font-weight: normal; + font-weight: normal; padding: .25rem 1.5rem; :hover { - background-color: ${props => props.theme.loopViewerHeaderBackgroundColor}; - color: ${props => props.theme.loopViewerHeaderFontColor} + background-color: ${props => props.theme.menuHighlightedBackgroundColor}; + color: ${props => props.theme.menuHighlightedFontColor}; + } +`; + +const StyledNavDropdown = styled(NavDropdown)` + color: ${props => props.theme.menuFontColor}; + & .dropdown-toggle { + color: ${props => props.theme.menuFontColor}; + background-color: ${props => props.theme.backgroundColor}; + font-weight: normal; + :hover { + font-weight: bold; + } } `; + export default class MenuBar extends React.Component { state = { loopName: this.props.loopName, @@ -72,28 +85,29 @@ export default class MenuBar extends React.Component { render () { return ( + - + Open CL Properties CL Close Model - - + + Submit Stop Restart Delete Deploy UnDeploy - - + + Refresh Status - - + + Wiki Contact Us User Info - + ); } -- cgit 1.2.3-korg