Commit a2da58eb authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

monitoring page button layout fixes

parent 12c48acd

js-apps/meep-frontend/src/css/meep-controller.scss

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ select { 
.vis-network-div {

    display:inline-block;

    width:100%;

    height:60vh;

    height:100%;

    margin-top: 10px;

    background-color: #FFFFFF;

}

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

+4 −2
Original line number Diff line number Diff line
@@ -628,9 +628,11 @@ class CfgPageContainer extends Component { 
              <GridInner>

                <GridCell span={8}>

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

                    <div style={{ padding: 10 }}>

                    <div style={{ padding: 10, height: '70vh' }}>

                      <IDCVis

                        type={TYPE_CFG}

                        width='100%'

                        height='100%'

                        onEditElement={elem => this.onEditElement(elem)}

                      />

                    </div>

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

+9 −7
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ const ViewForName = ({ 
  switch (viewName) {

  case METRICS_VIEW:

    return (

      <div style={{ height: '70vh' }}>

      <div style={{ height: '80vh' }}>

        <Iframe

          url={dashboardUrl}

          id="myId"
@@ -170,12 +170,14 @@ const ViewForName = ({ 
    );

  case VIS_VIEW:

    return (

      <div style={{ height: '80vh' }}>

        <IDCVis

          type={TYPE_EXEC}

          width='100%'

          height='100%'

          onEditElement={() => { }}

        />

      </div>

    );

  default:

    return null;

js-apps/meep-frontend/src/js/containers/monitor/list-edit-pane.js

+20 −20
Original line number Diff line number Diff line
@@ -83,9 +83,8 @@ export const ListEditPane = props => { 
      })}



      <Grid style={{ marginTop: 20, marginBottom: 10 }}>

        <GridCell span={7}></GridCell>



        <GridCell span={5}>

        <GridCell span={12}>

          <div align={'right'}>

            <Button raised style={styles.button} onClick={props.cancelEditMode}>

              CANCEL

            </Button>
@@ -103,6 +102,7 @@ export const ListEditPane = props => { 
            <Button raised style={styles.button} onClick={props.saveItems}>

              SAVE

            </Button>

          </div>

        </GridCell>

      </Grid>

    </div>

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

+15 −13
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ const MonitorPageHeadlineBar = props => { 
                  scenarioName={props.scenarioName}

                />

              </GridCell>

              <GridCell span={3}>

              <GridCell span={4} align={'middle'}>

                <Select

                  style={{ width: '100%' }}

                  label="Dashboard"
@@ -122,7 +122,8 @@ const MonitorPageHeadlineBar = props => { 
                  data-cy={MON_DASHBOARD_SELECT}

                />

              </GridCell>

              <GridCell span={4} style={{ paddingTop: 8 }}>

              <GridCell span={3} align={'middle'}>

                <div align={'right'}>

                  <EditModeButton

                    isEditMode={props.isEditMode}

                    startEditMode={props.startEditMode}
@@ -135,6 +136,7 @@ const MonitorPageHeadlineBar = props => { 
                  >

                  OPEN GRAFANA

                  </Button>

                </div>

              </GridCell>

            </GridInner>

          </Elevation>