Commit d8626b7e authored by Joel Collins's avatar Joel Collins
Browse files

Improved settings layout

parent a9506c4a

src/components/viewComponents/settingsComponents/microscopeSettings.vue

+3 −3
Original line number Diff line number Diff line 
<template>

  <div v-if="settings" id="microscopeSettings">

    <form @submit.prevent="applyConfigRequest">

      <h4>Stage</h4>



      <label class="uk-form-label" for="form-stacked-text"

        >Backlash compensation</label

      >
@@ -41,7 +39,7 @@ 
        </div>

      </div>



      <h4>Microscope</h4>

      <br />



      <div>

        <label class="uk-form-label" for="form-stacked-text"
@@ -55,6 +53,8 @@ 
        />

      </div>



      <br />



      <button

        type="submit"

        class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1"

src/components/viewComponents/settingsComponents/streamSettings.vue

+14 −18
Original line number Diff line number Diff line
@@ -7,14 +7,11 @@ 
      >

    </p>



    <div class="uk-child-width-1-2" uk-grid>

    <hr />



    <p>

      <label :class="[{ 'uk-disabled': !this.$store.getters.ready }]"

          ><input

            v-model="autoGpuPreview"

            class="uk-checkbox"

            type="checkbox"

          />

        ><input v-model="autoGpuPreview" class="uk-checkbox" type="checkbox" />

        GPU preview</label

      >

    </p>
@@ -25,7 +22,6 @@ 
      >

    </p>

  </div>

  </div>

</template>



<script>

src/components/viewComponents/settingsDisplay.vue

+21 −11
Original line number Diff line number Diff line 
<template>

  <div id="settingsDisplay" class="uk-padding">

    <div class="uk-child-width-expand@m" uk-grid>

      <div>

  <div id="settingsDisplay" class="uk-padding uk-height-1-1">

    <div class="uk-height-1-1 uk-child-width-expand@m" uk-grid>

      <div class="uk-padding-remove">

        <div class="settings-pane uk-padding-small">

          <h3>System settings</h3>

          <appSettings />

          <hr />

          <streamSettings />

        </div>

      <div>

        <div v-if="$store.getters.ready">

      </div>

      <div class="uk-padding-remove">

        <div v-if="$store.getters.ready" class="settings-pane uk-padding-small">

          <h3>Camera settings</h3>

          <cameraSettings />

        </div>

      </div>

      <div>

        <div v-if="$store.getters.ready">

      <div class="uk-padding-remove">

        <div v-if="$store.getters.ready" class="settings-pane uk-padding-small">

          <h3>Microscope settings</h3>

          <microscopeSettings />

        </div>
@@ -41,4 +44,11 @@ export default { 
};

</script>



<style lang="less"></style>
 
<style lang="less">

.settings-pane {

  border-width: 0 1px 0 0;

  border-style: solid;

  border-color: rgba(180, 180, 180, 0.25);

  min-height: 100%;

}

</style>