Skip to content

Commit 567542b

Browse files
committed
Code tabs: Fix incorrect heights & Cleanup v-codemirror styling
Signed-off-by: Florian Hotze <dev@florianhotze.com>
1 parent 2b03629 commit 567542b

9 files changed

Lines changed: 6 additions & 36 deletions

File tree

bundles/org.openhab.ui/web/src/components/config/controls/script-editor.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
z-index 4000
2828
user-select none
2929
30-
.v-codemirror
31-
flex 1
32-
min-width 0
33-
3430
.cm-editor
3531
height 100%
3632
width 100%

bundles/org.openhab.ui/web/src/components/pagedesigner/widget-code-popup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<style lang="stylus">
3333
.widgetcode-popup
34-
.page-code-editor.v-codemirror
34+
.page-code-editor
3535
position absolute
3636
height calc(100% - var(--f7-navbar-height))
3737
.yaml-message

bundles/org.openhab.ui/web/src/pages/developer/blocks/blocks-edit.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,24 +95,21 @@
9595
top 0
9696
height calc(100%)
9797
.code-editor-fit
98-
height calc(100% - var(--f7-grid-gap))
98+
height 100%
9999
.row
100100
height 100%
101101
.block-preview-pane
102102
height 100%
103103
overflow auto
104104
.blocks-code
105105
height 100%
106-
.v-codemirror
107-
top 0
108-
height 100%
109106
&.vertical
110107
.block-preview-pane
111108
z-index auto !important
112109
&.horizontal
113110
.row
114111
height 50%
115-
.v-codemirror
112+
.code-editor-fit
116113
height calc(100% - var(--f7-grid-gap))
117114
.blocklyDropDownDiv
118115
z-index 11001 !important

bundles/org.openhab.ui/web/src/pages/developer/widgets/widget-edit.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@
100100
.widget-code
101101
height 100%
102102
position relative
103-
.v-codemirror
104-
position absolute
105-
inset 0
106-
height auto
107103
&.vertical
108104
.block
109105
z-index auto !important

bundles/org.openhab.ui/web/src/pages/settings/items/item-edit.vue

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,6 @@
6565
</f7-page>
6666
</template>
6767

68-
<style lang="stylus">
69-
.item-code-editor.v-codemirror
70-
position absolute
71-
top calc(var(--f7-navbar-height) + var(--f7-tabbar-height))
72-
height calc(100% - var(--f7-navbar-height, 56px) - var(--f7-tabbar-height, 48px))
73-
width 100%
74-
.yaml-message
75-
display block
76-
position absolute
77-
top 80%
78-
white-space pre-wrap
79-
</style>
80-
8168
<script>
8269
import { nextTick, defineAsyncComponent } from 'vue'
8370
import { f7 } from 'framework7-vue'

bundles/org.openhab.ui/web/src/pages/settings/items/parser/items-add-from-textual-definition.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
.items-parser
144144
height 50%
145145
width 100%
146-
.editor.v-codemirror
146+
.editor
147147
position absolute
148148
height calc(100% - var(--f7-grid-gap))
149149
.items-results

bundles/org.openhab.ui/web/src/pages/settings/pages/home/home-edit.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
align-items: center
201201
justify-content: space-between
202202
margin-bottom: 0.5rem
203-
.page-code-editor.v-codemirror
203+
.page-code-editor
204204
position absolute
205205
height calc(100% - var(--f7-navbar-height) - 2*var(--f7-toolbar-height))
206206
.yaml-message

bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
.item-after
227227
display none
228228
229-
.scene-code-editor.v-codemirror
229+
.scene-code-editor
230230
position absolute
231231
height calc(100% - var(--f7-navbar-height) - var(--f7-toolbar-height))
232232

bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,6 @@ p.action-description
393393
.advanced-actions-label
394394
cursor pointer
395395
396-
.thing-code-editor.v-codemirror
397-
position absolute
398-
top calc(var(--f7-navbar-height) + var(--f7-tabbar-height))
399-
height calc(100% - var(--f7-navbar-height, 56px) - var(--f7-tabbar-height, 48px))
400-
width 100%
401-
402396
.dialog.wide-property-dialog
403397
--f7-dialog-width: 560px
404398

0 commit comments

Comments
 (0)