diff --git a/_basic.scss b/_basic.scss index 62d38a8..f307c86 100644 --- a/_basic.scss +++ b/_basic.scss @@ -2,6 +2,7 @@ // Use a file outside of hippie i.e. vendor/normalize.css // ----------------------------------------------------------------------------- // @import "../../vendor/normalizecss/normalize.css"; +// @import "../../node_modules/normalize.css/normalize.css"; diff --git a/elements/_grouping.scss b/elements/_grouping.scss index 42b3d3c..75edc9f 100644 --- a/elements/_grouping.scss +++ b/elements/_grouping.scss @@ -67,6 +67,13 @@ hr { border-width: $width_border_basic 0 0; border-style: solid; border-color: $color_border_basic; + + &.vertical { + display: inline; + height: $line_basic; + margin: 0 $space_double; + border-width: 0 $width_border_basic 0 0; + } } .hr_hidden { @@ -286,38 +293,9 @@ div {} // Flex .flex { display: flex; -} -.flex_wrap { - @extend .flex; - flex-wrap: wrap; -} - -.flex_row { - @extend .flex; - flex-direction: column; - // align-items: flex-start; - justify-content: flex-start; -} - -.flex_child { - flex: 0 1 auto; -} - -.flex_child_one { - flex: 1; -} - -.flex_child_end { - align-self: flex-end; -} - -.flex_column_wrap { - @extend .flex_wrap; - - .flex_column { - @extend .flex_child; - flex-grow: 1; + &.inline { + @extend %flex-inline; } } diff --git a/elements/_interactive.scss b/elements/_interactive.scss index 95bf501..bf46005 100644 --- a/elements/_interactive.scss +++ b/elements/_interactive.scss @@ -57,7 +57,7 @@ label + input { } input, button, textarea, select { - margin: $margin_io; + margin: $margin_inline; &[disabled="disabled"], &[disabled] { @@ -79,6 +79,10 @@ td > textarea { } } +.input_io, .button_io, .io_textarea, .io_select { + margin: $margin_io; +} + .input_io, .io_textarea, .io_select { padding: $space_half; color: $color_text_io; diff --git a/elements/_sections.scss b/elements/_sections.scss index 542a5dd..ea0790e 100644 --- a/elements/_sections.scss +++ b/elements/_sections.scss @@ -1,3 +1,5 @@ +@use "sass:map"; + // Root // ----------------------------------------------------------------------------- html { @@ -81,7 +83,16 @@ section {} // Navigation // ----------------------------------------------------------------------------- -nav {} +nav { + + ul { + margin: 0; + + &.inline li { + display: inline-block; + } + } +} // Aside element // ----------------------------------------------------------------------------- @@ -107,6 +118,33 @@ aside { *:first-child { margin-top: 0; } + + &.io { + + input, + textarea, + select, + button { + display: block; + width: 100%; + } + + input { + @extend .input_io; + } + + textarea { + @extend .io_textarea; + } + + select { + @extend .io_select; + } + + button { + @extend .button_io; + } + } } // Headings @@ -180,6 +218,101 @@ header {} } } +header, +aside, +footer { + &.io { + .span_solo { + border: $width_border_io solid transparent; + padding: $padding_basic; + } + } +} + +header.io, +aside.io { + padding: $space_basic; + + input, + button, + textarea, + select { + margin-inline: $space_half; + } + + input { + @extend .input_io; + } + + textarea { + @extend .io_textarea; + } + + select { + @extend .io_select; + } + + button { + @extend .button_io; + } +} + +header, +footer { + &.io { + @extend %flex-inline; + align-items: stretch; + } +} + +header.io { + z-index: map.get($z-indexes, "content-top"); + + &>*:last-child *:last-child { + margin-right: 0; + } + + &>*:first-child *:first-child { + margin-left: 0; + } + + nav, + ul { + @extend %flex-inline; + align-items: stretch; + } + + nav li { + margin: 0; + } + + nav:last-child { + margin-left: auto; + } + + h1 { + margin: 0; + } +} + // Footer // ----------------------------------------------------------------------------- -footer {} \ No newline at end of file +footer { + &.io { + input { + @extend .input_io; + } + + textarea { + @extend .io_textarea; + } + + select { + @extend .io_select; + } + + button { + @extend .button_io; + } + } +} \ No newline at end of file diff --git a/global/_common.scss b/global/_common.scss index fcb9e3a..5165cfa 100644 --- a/global/_common.scss +++ b/global/_common.scss @@ -21,15 +21,15 @@ } .di_none { - display: none; + display: none !important; } .op_hide { - opacity: 0; + opacity: 0 !important; } .op_show { - opacity: 1; + opacity: 1 !important; } .space_even_auto { @@ -173,6 +173,34 @@ +// Flex & grid +// ----------------------------------------------------------------------------- +%flex-inline { + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: flex-start; + justify-content: flex-start; + gap: $space_half $space_basic; +} + +%flex-column, +%flex-row { + display: flex; + flex-wrap: nowrap; + gap: $space_basic; +} + +%flex-column { + flex-direction: column; +} + +%flex-row { + flex-direction: row; +} + + + // Positioned elements // ----------------------------------------------------------------------------- %viewport_fixed { diff --git a/global/_config.scss b/global/_config.scss index 17eab37..f028f2d 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -142,7 +142,8 @@ $space_large: $space_basic * 16; $margin_basic: $space_basic 0 !default; $margin_double: $space_double 0 !default; -$margin_io: 0 $space_small 0 0 !default; +$margin_inline: 0 $space_double 0 0 !default; +$margin_io: 0 !default; $padding_basic: calc(#{$space_basic} - 3px) $space_basic !default; $padding_link: calc(#{$space_basic} - 1px) calc(#{$space_basic} * 2) !default; diff --git a/modules/navigation/_nav_module.scss b/modules/navigation/_nav_module.scss index 608fd63..5f854b5 100644 --- a/modules/navigation/_nav_module.scss +++ b/modules/navigation/_nav_module.scss @@ -99,12 +99,11 @@ nav { margin: $space_basic 0; ul { - @extend .flex; + display: flex; margin: 0 $space_large; li { - @extend .flex_child; - flex-grow: 1; + flex: auto; margin: 0; text-align: center; diff --git a/modules/tables/_tables_module.scss b/modules/tables/_tables_module.scss index de2523e..2746bec 100644 --- a/modules/tables/_tables_module.scss +++ b/modules/tables/_tables_module.scss @@ -11,13 +11,15 @@ } } - th, td { + th, + td { border: 0; } .cell_icon { width: 48px; text-align: center; + img { vertical-align: text-top; } @@ -29,9 +31,11 @@ &:hover { background-color: $foxtrot_color; + a:first-child { display: none; } + a:last-child { display: block; color: $color_highlight_basic; @@ -47,7 +51,8 @@ } } - th:last-child, .cell_date { + th:last-child, + .cell_date { width: 16%; text-align: center; } @@ -65,4 +70,4 @@ max-height: 44px; } } -} +} \ No newline at end of file