Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): labels and mobile view #413

Merged
merged 13 commits into from
Feb 3, 2021
Merged

fix(ui): labels and mobile view #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ad5d3d5
fix: better values labels
robertsLando Feb 1, 2021
28fb947
fix(ui): restore data table mobile breakpoint
robertsLando Feb 1, 2021
fb5f335
fix: hass devices table
robertsLando Feb 1, 2021
2e8dc25
fix: pass isMobile prop down to expanded node
robertsLando Feb 1, 2021
664eb5b
fix(ui): set max v-select width
robertsLando Feb 1, 2021
7b07123
fix: use v-col v-row
robertsLando Feb 1, 2021
0a0b1df
fix: lint issues
robertsLando Feb 1, 2021
86dd911
fix: hass row selection
robertsLando Feb 1, 2021
0ee83f6
Merge branch 'master' into ui-fixes
robertsLando Feb 2, 2021
939d9a6
fix(ui): switch to new grid system
robertsLando Feb 2, 2021
2578635
fix(ui): some broken things after the switch
robertsLando Feb 2, 2021
e02323e
fix: lint issues
robertsLando Feb 2, 2021
7fe5e5f
Merge branch 'master' into ui-fixes
robertsLando Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/components/Confirm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
}}</v-card-text>
<v-card-text v-else class="pa-4">
<v-container grid-list-md>
<v-layout wrap>
<v-flex v-for="(input, index) in options.inputs" :key="index" xs12>
<v-row>
<v-col
v-for="(input, index) in options.inputs"
:key="index"
cols="12"
>
<v-text-field
v-if="input.type === 'text' || input.type === 'number'"
v-model="values[input.key]"
Expand Down Expand Up @@ -44,8 +48,8 @@
:hint="input.hint"
:required="input.required"
></v-select>
</v-flex>
</v-layout>
</v-col>
</v-row>
</v-container>
</v-card-text>

Expand Down
2 changes: 1 addition & 1 deletion src/components/ControlPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</v-col>
</v-row>

<v-row justify="start">
<v-row>
<v-col cols="12" sm="6" md="3">
<v-text-field
label="Controller status"
Expand Down
12 changes: 6 additions & 6 deletions src/components/Debug.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<template>
<v-container grid-list-md>
<v-layout wrap>
<v-flex xs12>
<v-row>
<v-col cols="12">
<v-btn color="green darken-1" text @click="debugActive = true"
>Start</v-btn
>
<v-btn color="red darken-1" text @click="debugActive = false"
>Stop</v-btn
>
<v-btn color="blue darken-1" text @click="debug = []">Clear</v-btn>
</v-flex>
</v-col>

<v-flex xs12>
<v-col cols="12">
<div
id="debug_window"
style="height:800px;width:100%;overflow-y:scroll;border: 1px solid grey; padding: 10px;"
class="body-1"
v-html="debug.join('')"
></div>
</v-flex>
</v-layout>
</v-col>
</v-row>
</v-container>
</template>
<script>
Expand Down
24 changes: 12 additions & 12 deletions src/components/Mesh.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@
<v-container fluid>
<v-card>
<v-container grid-list-md>
<v-layout row wrap>
<v-flex xs2 md2>
<v-row>
<v-col cols="3" md="2">
<v-text-field
label="Nodes size"
v-model.number="nodeSize"
min="10"
type="number"
></v-text-field>
</v-flex>
<v-flex xs2 md2>
</v-col>
<v-col cols="3" md="2">
<v-text-field
label="Font size"
v-model.number="fontSize"
min="10"
type="number"
></v-text-field>
</v-flex>
<v-flex xs3 md2>
</v-col>
<v-col cols="3" md="2">
<v-text-field
label="Distance"
v-model.number="force"
min="100"
type="number"
></v-text-field>
</v-flex>
<v-flex xs3 md2>
</v-col>
<v-col cols="3" md="2">
<v-switch label="Show location" v-model="showLocation"></v-switch>
</v-flex>
<v-flex xs5 md6>
</v-col>
<v-col cols="5" md="6">
<v-btn color="success" @click="downloadSVG">Download SVG</v-btn>
</v-flex>
</v-layout>
</v-col>
</v-row>
</v-container>

<d3-network
Expand Down
20 changes: 10 additions & 10 deletions src/components/Scenes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-container grid-list-md>
<v-layout wrap>
<v-flex xs12>
<v-row>
<v-col cols="12">
<v-btn text @click="importScenes">
Import
<v-icon right dark color="primary">file_upload</v-icon>
Expand All @@ -10,37 +10,37 @@
Export
<v-icon right dark color="primary">file_download</v-icon>
</v-btn>
</v-flex>
</v-col>

<v-flex xs12 sm6>
<v-col cols="12" sm="6">
<v-select
label="Scene"
v-model="selectedScene"
:items="scenesWithId"
item-text="label"
item-value="sceneid"
></v-select>
</v-flex>
</v-col>

<v-flex xs12 sm6>
<v-col cols="12" sm="6">
<v-text-field
label="New Scene"
append-outer-icon="send"
@click:append-outer="createScene"
v-model.trim="newScene"
></v-text-field>
</v-flex>
</v-col>

<v-flex v-if="selectedScene" xs12>
<v-col v-if="selectedScene" cols="12">
<v-btn color="red darken-1" text @click="removeScene">Delete</v-btn>
<v-btn color="green darken-1" text @click="activateScene"
>Activate</v-btn
>
<v-btn color="blue darken-1" text @click="dialogValue = true"
>New Value</v-btn
>
</v-flex>
</v-layout>
</v-col>
</v-row>

<DialogSceneValue
@save="saveValue"
Expand Down
Loading