diff --git a/ui/packages/consul-ui/app/components/app-view/README.mdx b/ui/packages/consul-ui/app/components/app-view/README.mdx new file mode 100644 index 0000000000..b7681597bd --- /dev/null +++ b/ui/packages/consul-ui/app/components/app-view/README.mdx @@ -0,0 +1,112 @@ +--- +class: ember +state: needs-love +--- +# AppView + +`` is our current top level wrapping component (one level in from +the app chrome), every 'top level main section/template' should have one of +these. + +It contains legacy authorization code (that can probably be removed now), and +our flash messages (that should be moved to the `` or `` component and potentially be renamed to `Page` or `View` or similar now +that we don't need two words. + +Other than that it provides the basic layout/slots for our main title, search +bar, top right hand actions and main content. + +The large top margin that is visible when no breadcrumbs are visible is there +to ensure that the page doesn't 'jump around' when you navigate to a page with +breadcrumbs and back again. + +```hbs preview-template +
+ + + + +

+ Main title {{format-number "100000"}} total {{pluralize 100000 "thing" without-count=true}} in this page +

+ + + + + +

+ Nothing to see here +

+ + + + + + +
Basic list-like view
+
+``` +```hbs preview-template +
+ + + +
    +
  1. Hansel
    2. +
  2. Gretel
    3. +
+ + + +

+ Scary witch's gingerbread house (run away quick!) +

+ + + + + Run away! + + + + + + +

+ Double, double toil and trouble +

+ + + + + +
Basic detail-like view
+
+``` + +## Arguments + +| Argument | Type | Default | Description | +| --- | --- | --- | --- | +| `authorized` | `Boolean` | `true` | Whether the View is authorized or not | +| `enabled` | `Boolean` | `true` | Whether ACLs are enabled or not | + +## Slots + +| Name | Description | +| --- | --- | +| `header` | The main title of the page, you probably want to put a `

` in here | +| `content` | The main content of the page, and potentially an `` somewhere | +| `notification` | Old style notifications, also see `` | +| `breadcrumbs` | Any breadcrumbs, you probably want an `ol/li/a` in here | +| `actions` | Any actions relevant for the entire page, probably using `` | +| `nav` | Secondary navigation goes in here, also see `` | +| `toolbar` | Rendered underneath the header and actions for various 'toolbar' type things, such as our SearchBars | + +## Portals + +| Name | Description | +| --- | --- | +| `app-view-actions` | Provides a portal to render additional page actions from any views. This is rendered **before** the contents of the `actions` slot | diff --git a/ui/packages/consul-ui/app/components/app-view/index.hbs b/ui/packages/consul-ui/app/components/app-view/index.hbs index eca3d01bba..6197f1b69b 100644 --- a/ui/packages/consul-ui/app/components/app-view/index.hbs +++ b/ui/packages/consul-ui/app/components/app-view/index.hbs @@ -1,4 +1,7 @@ -
+
{{yield}}
{{#each flashMessages.queue as |flash|}} diff --git a/ui/packages/consul-ui/app/components/app-view/index.scss b/ui/packages/consul-ui/app/components/app-view/index.scss new file mode 100644 index 0000000000..cbeffed84a --- /dev/null +++ b/ui/packages/consul-ui/app/components/app-view/index.scss @@ -0,0 +1,64 @@ +@import './skin'; +@import './layout'; +.app-view { + @extend %app-view; +} + +%app-view > header { + @extend %app-view-header; +} +%app-view-header .title { + @extend %app-view-title; +} +%app-view-header .actions { + @extend %app-view-actions; +} +%app-view > div { + @extend %app-view-content; +} + +%app-view-actions a, +%app-view-actions button { + @extend %button-compact; +} + +/* toggleable toolbar for short screens */ +[for='toolbar-toggle'] { + @extend %with-search-color-icon; + background-position: 0 4px; + display: inline-block; + width: 26px; + height: 26px; + cursor: pointer; + color: $blue-500; +} +#toolbar-toggle { + display: none; +} +@media #{$--lt-spacious-page-header} { + %app-view-actions { + margin-top: 9px; + } +} +// reduced search magnifying icon layout +@media #{$--horizontal-selects} { + [for='toolbar-toggle'] { + display: none; + } +} +@media #{$--lt-horizontal-selects} { + %app-view-header h1 { + display: inline-block; + } + // on the instance detail page we don't have the magnifier + html[data-route$='dc.services.instance.show'] h1 { + display: block; + } + #toolbar-toggle + * { + display: none; + } + #toolbar-toggle:checked + * { + display: flex; + } +} + diff --git a/ui/packages/consul-ui/app/styles/components/app-view/layout.scss b/ui/packages/consul-ui/app/components/app-view/layout.scss similarity index 86% rename from ui/packages/consul-ui/app/styles/components/app-view/layout.scss rename to ui/packages/consul-ui/app/components/app-view/layout.scss index 31676b0c4e..461e758e65 100644 --- a/ui/packages/consul-ui/app/styles/components/app-view/layout.scss +++ b/ui/packages/consul-ui/app/components/app-view/layout.scss @@ -7,9 +7,9 @@ z-index: 4; } %app-view-actions { - margin-left: auto; display: flex; align-items: flex-start; + margin-left: auto; } /* units */ %app-view-title { @@ -26,11 +26,6 @@ } /* content */ -%app-view-content-empty { - margin-top: 0 !important; - padding: 50px; - text-align: center; -} /* TODO: Think about an %app-form or similar */ %app-view-content form:not(.filter-bar) fieldset { padding-bottom: 0.3em; diff --git a/ui/packages/consul-ui/app/styles/components/app-view/skin.scss b/ui/packages/consul-ui/app/components/app-view/skin.scss similarity index 50% rename from ui/packages/consul-ui/app/styles/components/app-view/skin.scss rename to ui/packages/consul-ui/app/components/app-view/skin.scss index 840cfc2641..7ee63b053a 100644 --- a/ui/packages/consul-ui/app/styles/components/app-view/skin.scss +++ b/ui/packages/consul-ui/app/components/app-view/skin.scss @@ -1,31 +1,22 @@ -%app-view-content-empty { - @extend %frame-gray-500; +%app-view-title > *:first-child { + @extend %h100; } %app-view-title { border-bottom: $decor-border-100; } -%app-view-title > *:first-child { - @extend %h100; -} %app-view-content form:not(.filter-bar) fieldset { border-bottom: $decor-border-200; } %app-view-header h1 > em { - color: $gray-600; + color: var(--gray-600); } %app-view-header dd > a { - color: $black; + color: var(--gray-999); } %app-view-content div > dl > dd { - color: $gray-400; + color: var(--gray-400); } %app-view-title, %app-view-content form:not(.filter-bar) fieldset { - border-color: $gray-200; -} -// We know that any sibling navs might have a top border -// by default. As its squashed up to a %app-view-title, in this -// case hide its border to avoid double border -%app-view-title ~ nav { - border-top: 0 !important; + border-color: var(--gray-200); } diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss index 4d79762ce0..725454482b 100644 --- a/ui/packages/consul-ui/app/styles/components.scss +++ b/ui/packages/consul-ui/app/styles/components.scss @@ -35,7 +35,7 @@ @import './components/radio-card'; @import './components/tabular-dl'; -@import './components/app-view'; +@import 'consul-ui/components/app-view'; @import 'consul-ui/components/brand-loader'; @import 'consul-ui/components/skip-links'; @import 'consul-ui/components/app'; diff --git a/ui/packages/consul-ui/app/styles/components/app-view.scss b/ui/packages/consul-ui/app/styles/components/app-view.scss index f684be1dc3..03590bef2e 100644 --- a/ui/packages/consul-ui/app/styles/components/app-view.scss +++ b/ui/packages/consul-ui/app/styles/components/app-view.scss @@ -1,50 +1 @@ @import './app-view/index'; - -.app-view { - @extend %app-view; -} - -%app-view-actions a, -%app-view-actions button { - @extend %button-compact; -} - -/* toggleable toolbar for short screens */ -[for='toolbar-toggle'] { - @extend %with-search-color-icon; - background-position: 0 4px; - display: inline-block; - width: 26px; - height: 26px; - cursor: pointer; - color: $blue-500; -} -#toolbar-toggle { - display: none; -} -@media #{$--lt-spacious-page-header} { - %app-view-actions { - margin-top: 9px; - } -} -// reduced search magnifying icon layout -@media #{$--horizontal-selects} { - [for='toolbar-toggle'] { - display: none; - } -} -@media #{$--lt-horizontal-selects} { - %app-view-header h1 { - display: inline-block; - } - // on the instance detail page we don't have the magnifier - html[data-route$='dc.services.instance.show'] h1 { - display: block; - } - #toolbar-toggle + * { - display: none; - } - #toolbar-toggle:checked + * { - display: flex; - } -} diff --git a/ui/packages/consul-ui/app/styles/components/app-view/index.scss b/ui/packages/consul-ui/app/styles/components/app-view/index.scss deleted file mode 100644 index 8c529631b5..0000000000 --- a/ui/packages/consul-ui/app/styles/components/app-view/index.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import './skin'; -@import './layout'; -%app-view > header { - @extend %app-view-header; -} -%app-view-header .title { - @extend %app-view-title; -} -%app-view-header .actions { - @extend %app-view-actions; -} -%app-view > div { - @extend %app-view-content; -} diff --git a/ui/packages/consul-ui/app/styles/debug.scss b/ui/packages/consul-ui/app/styles/debug.scss index cbdbe93fe1..be65420160 100644 --- a/ui/packages/consul-ui/app/styles/debug.scss +++ b/ui/packages/consul-ui/app/styles/debug.scss @@ -9,16 +9,14 @@ html.is-debug body > .brand-loader { } .docs { - [role='banner'] nav:first-of-type { - height: calc(100vh - var(--chrome-height, 47px)); - } .tabular-collection, .list-collection { height: 300px !important; } - nav:first-of-type { + [role='banner'] nav:first-of-type { & { padding-top: 0 !important; + height: calc(100vh - var(--chrome-height, 47px)); } ul { margin-bottom: 100px; @@ -48,10 +46,43 @@ html.is-debug body > .brand-loader { > ul { list-style-type: disc; } + > h1, + > h2, + > h3 { + margin-bottom: 1em; + } + > h1 { + padding-top: 20px; + @extend %h100; + } + > h2 { + @extend %h200; + } + > h3 { + @extend %h300; + } + > p { + @extend %p1; + } + > table { + margin-bottom: 3em; + } + > table td { + font-weight: normal !important; + cursor: default !important; + } + > table td code { + @extend %inline-code; + vertical-align: bottom; + } + > table tr:hover { + box-shadow: none; + } } .docfy-demo { & { margin-bottom: 1rem; + position: relative; } &__example { & { @@ -98,32 +129,4 @@ html.is-debug body > .brand-loader { } } } - h1, - h2, - h3 { - margin-bottom: 1em; - } - h1 { - padding-top: 20px; - @extend %h100; - } - h2 { - @extend %h200; - } - h3 { - @extend %h300; - } - p { - @extend %p1; - } - table { - margin-bottom: 3em; - } - td { - font-weight: normal !important; - cursor: default !important; - } - tr:hover { - box-shadow: none; - } }