diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk index 8161aba..55c9596 100644 --- a/source/screens/demo/components.njk +++ b/source/screens/demo/components.njk @@ -152,8 +152,12 @@ tags:
ul.list_link>(li>a)*2

<figure>

figure>figcaption+{element}
@@ -171,7 +175,8 @@ tags:
div.box_space>div.box_cube>span
-
Text
+
+ Text
div.box_placeholder+hr+div.box_placeholder_bkg
@@ -278,14 +283,24 @@ tags:

Elemente:

// form // label // input // button // select // datalist // optgroup // option // textarea // output // progress // meter // fieldset // legend

<input>

-
-
-
-
-
-
+
+ + + + +

Varianten

+
input.button_io+button.button_io
+
+ + +
+
+ + + +
diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index 25911b1..b943fee 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -5,7 +5,7 @@ tags: --- {% set pageId = page.fileSlug %} {% set pageClass = "h_full_view" %} -{% set bodyClass = "body_drag" %} +{% set bodyClass = "body_ui" %} {% extends "demo/_app.njk" %} diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk index 5f279de..29ab5bd 100644 --- a/source/screens/demo/examples/ui/form.njk +++ b/source/screens/demo/examples/ui/form.njk @@ -4,6 +4,7 @@ tags: - ui --- {% set pageClass = "html_ui" %} +{% set bodyClass = "body_ui" %} {% extends "demo/_app.njk" %} diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index 536583d..ba2e4c0 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -24,9 +24,9 @@ tags: {% block body %} {{ header.status(hippie, new) }} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ + + + +
diff --git a/source/style/hippie-style b/source/style/hippie-style index 2f63dbe..35b55de 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 2f63dbe2b65ddb320c0a7ea186f04a9c3698c9e7 +Subproject commit 35b55de55002b4a13d7f0530b326f5e2a569bbb1 diff --git a/source/style/modules/ui/_drag_module.scss b/source/style/modules/ui/_drag_module.scss index c9a98dc..a345922 100644 --- a/source/style/modules/ui/_drag_module.scss +++ b/source/style/modules/ui/_drag_module.scss @@ -1,9 +1,4 @@ -.body_drag { - @extend .body_ui; - - #space { - position: relative; - height: 100%; - background-color: $color-dark; - } +#space { + position: relative; + height: 100%; } \ No newline at end of file diff --git a/source/style/modules/ui/_new_module.scss b/source/style/modules/ui/_new_module.scss index 1c0d5a9..db795cd 100755 --- a/source/style/modules/ui/_new_module.scss +++ b/source/style/modules/ui/_new_module.scss @@ -1,11 +1,13 @@ $module_top_height: 32px; +$body_top_space: $module_top_height + $space_basic; .body_new { - height: 100vh; - padding: $module_top_height + $space_basic $space_basic $space_basic; + @extend .body_ui; + + padding: $body_top_space $space_basic $space_basic; } -.container { +#frame { display: grid; height: 100%; // margin: $space_basic; diff --git a/source/style/modules/ui/_settings_module.scss b/source/style/modules/ui/_settings_module.scss index 337f523..a95c3bc 100755 --- a/source/style/modules/ui/_settings_module.scss +++ b/source/style/modules/ui/_settings_module.scss @@ -7,7 +7,15 @@ } } +.body_setting { + @extend .body_ui; + + background-color: $color_back_basic; +} + #frame { + @extend %flex-column; + position: relative; height: 100%; @@ -22,23 +30,16 @@ } main { + @extend %flex-row; + + flex: 1; + aside { background-color: $color_brighter; } - } -} -.frame-flex { - display: flex; - flex-direction: column; - gap: $space_basic; - - main { - flex: 1; - - aside, section { - height: 100%; + flex: 1; } } } diff --git a/source/style/ui.scss b/source/style/ui.scss index 99fb3cb..efe343b 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -1,11 +1,10 @@ @use "sass:map"; -$color_text_basic: white; -$color_head_basic: white; - @import "demo_config"; @import "hippie-style/hippie"; +$color_gui_back: $color_dark; + .op_show { transition: $transition_show; } @@ -20,12 +19,12 @@ $color_head_basic: white; body { position: relative; min-height: 100%; - background-color: black; } } .body_ui { height: 100vh; + background-color: $color_gui_back; } .step {