Commit 30cdcb77 authored by Francis Renaud's avatar Francis Renaud
Browse files

Fixed extra margin at the right of single view in DashboardContainer. Added... 

Fixed extra margin at the right of single view in DashboardContainer. Added white background to components that were still appearing as gray.
parent c7489ab1

js-apps/meep-frontend/src/js/containers/dashboard-container.js

+5 −4
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ const DashboardConfiguration = (props) => { 


  return (

    <Elevation z={2}

      className="component-style"

      style={{padding: 10, marginBottom: 10}}

    >
@@ -685,8 +686,8 @@ class DashboardContainer extends Component { 
        <Grid>



          {!view1Present ? null : (

            <GridCell span={span1} style={{paddingRight: 10}} className='chartContainer'>

              <Elevation z={2}

            <GridCell span={span1}  className='chartContainer'>

              <Elevation z={2} className="component-style"

                style={{padding: 10}}

              >

                {view1}
@@ -696,7 +697,7 @@ class DashboardContainer extends Component { 
          

          {!view2Present ? null : (

            <GridCell span={span2} style={{marginLeft: -10, paddingLeft: 10}} className='chartContainer'>

              <Elevation z={2}

              <Elevation z={2} className="component-style"

                style={{padding: 10}}

              >

                {view2}

js-apps/meep-frontend/src/js/containers/meep-container.js

+4 −4
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ import { 




// MEEP Controller REST API JS client

var basepath = 'http://' + location.host + location.pathname + 'v1';

// const basepath = 'http://10.3.16.73:30000/v1';

// var basepath = 'http://' + location.host + location.pathname + 'v1';

const basepath = 'http://10.3.16.73:30000/v1';



const metricsBasePath = 'http://' + location.hostname + ':30008/v1';

// const metricsBasePath = 'http://10.3.16.73:30008/v1';

// const metricsBasePath = 'http://' + location.hostname + ':30008/v1';

const metricsBasePath = 'http://10.3.16.73:30008/v1';



const TIME_FORMAT = moment.HTML5_FMT.DATETIME_LOCAL_MS;