diff --git a/wherehows-web/app/styles/abstracts/_mixins.scss b/wherehows-web/app/styles/abstracts/_mixins.scss index a2626d80de..e3bbc69c10 100644 --- a/wherehows-web/app/styles/abstracts/_mixins.scss +++ b/wherehows-web/app/styles/abstracts/_mixins.scss @@ -82,7 +82,7 @@ /// Proxy for AD container styles @mixin nacho-container { - border: 1px solid set-color(grey, light); + border: 1px solid get-color(black, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); padding: item-spacing(4); background-color: get-color(white); diff --git a/wherehows-web/app/styles/base/_base.scss b/wherehows-web/app/styles/base/_base.scss index 779207dc6d..c025eb601f 100644 --- a/wherehows-web/app/styles/base/_base.scss +++ b/wherehows-web/app/styles/base/_base.scss @@ -13,7 +13,7 @@ html { * Apply padding to top and bottom to account for navigation and footer */ body { - background-color: set-color(white, base); + background-color: get-color(slate0); overflow-y: scroll; overflow-x: hidden; } diff --git a/wherehows-web/app/styles/components/_all.scss b/wherehows-web/app/styles/components/_all.scss index d9e918ca3c..5492dab293 100644 --- a/wherehows-web/app/styles/components/_all.scss +++ b/wherehows-web/app/styles/components/_all.scss @@ -22,6 +22,7 @@ @import 'upstream-owners/all'; @import 'dataset-schema/all'; @import 'tooltips/all'; +@import 'entity-header/all'; @import 'nacho/nacho-button'; @import 'nacho/nacho-global-search'; diff --git a/wherehows-web/app/styles/components/entity-header/_all.scss b/wherehows-web/app/styles/components/entity-header/_all.scss new file mode 100644 index 0000000000..b4099e17b1 --- /dev/null +++ b/wherehows-web/app/styles/components/entity-header/_all.scss @@ -0,0 +1 @@ +@import 'entity-header'; diff --git a/wherehows-web/app/styles/components/entity-header/_entity-header.scss b/wherehows-web/app/styles/components/entity-header/_entity-header.scss new file mode 100644 index 0000000000..ccf587d279 --- /dev/null +++ b/wherehows-web/app/styles/components/entity-header/_entity-header.scss @@ -0,0 +1,13 @@ +.dataset-entity-header { + background-color: white; + padding-top: item-spacing(5); +} + +.dataset-entity-tabs { + background-color: white; + + ///overrides library styles to match design spec + .ivy-tabs-tablist { + margin-bottom: 0; + } +} diff --git a/wherehows-web/app/styles/components/nacho/_nacho-breadcrumbs.scss b/wherehows-web/app/styles/components/nacho/_nacho-breadcrumbs.scss index 96b9672b56..04c4ab23d2 100644 --- a/wherehows-web/app/styles/components/nacho/_nacho-breadcrumbs.scss +++ b/wherehows-web/app/styles/components/nacho/_nacho-breadcrumbs.scss @@ -1,7 +1,7 @@ @import 'restyle'; $primary-border-color: get-color(gray3, 0.8); -$secondary-border-color: set-color(white, base); +$secondary-border-color: get-color(slate0); /// Defines styles for the breadcrumb container @include restyle-define( @@ -67,6 +67,16 @@ $secondary-border-color: set-color(white, base); .nacho-breadcrumbs { @include restyle(breadcrumbs); + &--white-surface { + $secondary-border-color: get-color(white); + + .nacho-breadcrumbs__crumb__grain { + &::after { + border-left: 30px solid $secondary-border-color; + } + } + } + &__crumb { float: left; diff --git a/wherehows-web/app/styles/layout/_page.scss b/wherehows-web/app/styles/layout/_page.scss index d63d53bc2a..47e6835b9e 100644 --- a/wherehows-web/app/styles/layout/_page.scss +++ b/wherehows-web/app/styles/layout/_page.scss @@ -3,6 +3,7 @@ } /// Styles that apply to the layout for a page with two columns sidebar and content style -.wh-sidebar, .wh-main-content { - margin: 30px 0; +.wh-sidebar, +.wh-main-content { + margin-top: item-spacing(5); } diff --git a/wherehows-web/app/templates/browse/entity.hbs b/wherehows-web/app/templates/browse/entity.hbs index 48e2ff7f0f..53a20ecf87 100644 --- a/wherehows-web/app/templates/browse/entity.hbs +++ b/wherehows-web/app/templates/browse/entity.hbs @@ -1,37 +1,35 @@ {{#if shouldShowBrowserRevamp}}
-
- {{#browser/containers/data-systems params=model as |dataSystemsContainer|}} - {{#if dataSystemsContainer.getDataSystemsNodesTask.isRunning}} - {{pendulum-ellipsis-animation}} - {{else}} - {{#if dataSystemsContainer.requestParams.platform}} -
- {{datasets/urn-breadcrumbs urn=dataSystemsContainer.urn}} + {{#browser/containers/data-systems params=model as |dataSystemsContainer|}} + {{#if dataSystemsContainer.getDataSystemsNodesTask.isRunning}} + {{pendulum-ellipsis-animation}} + {{else}} + {{#if dataSystemsContainer.requestParams.platform}} +
+ {{datasets/urn-breadcrumbs urn=dataSystemsContainer.urn}} - {{browser/data-systems nodes=dataSystemsContainer.nodes}} -
- {{else}} - {{#each dataSystemsContainer.nodes as |node|}} -
-
-
- {{#browser/containers/data-platform platformParams=node as |platformContainer|}} - {{browser/data-platform - platform=platformContainer.platformProps - node=node - platformTask=platformContainer.getDataPlatformTask - }} - {{/browser/containers/data-platform}} -
+ {{browser/data-systems nodes=dataSystemsContainer.nodes}} +
+ {{else}} + {{#each dataSystemsContainer.nodes as |node|}} +
+
+
+ {{#browser/containers/data-platform platformParams=node as |platformContainer|}} + {{browser/data-platform + platform=platformContainer.platformProps + node=node + platformTask=platformContainer.getDataPlatformTask + }} + {{/browser/containers/data-platform}}
- {{/each}} - {{/if}} +
+ {{/each}} {{/if}} - {{/browser/containers/data-systems}} -
+ {{/if}} + {{/browser/containers/data-systems}}
{{else}} diff --git a/wherehows-web/app/templates/datasets/dataset.hbs b/wherehows-web/app/templates/datasets/dataset.hbs index d2bb4ee883..cbfe07c570 100644 --- a/wherehows-web/app/templates/datasets/dataset.hbs +++ b/wherehows-web/app/templates/datasets/dataset.hbs @@ -1,6 +1,6 @@ -
-
- {{datasets/urn-breadcrumbs urn=model.uri}} +
+
+ {{datasets/urn-breadcrumbs class="nacho-breadcrumbs nacho-breadcrumbs--white-surface" urn=model.uri}}
@@ -49,44 +49,49 @@
{{datasets/containers/dataset-owner-list urn=encodedUrn}} +
+
- {{#ivy-tabs selection=tabSelected as |tabs|}} +{{#ivy-tabs selection=tabSelected as |tabs|}} +
+
+ {{#tabs.tablist as |tablist|}} - {{#tabs.tablist as |tablist|}} + {{#unless isPinot}} + {{#tablist.tab tabIds.Properties on-select=(action "tabSelectionChanged")}} + Properties + {{/tablist.tab}} + {{/unless}} - {{#unless isPinot}} - {{#tablist.tab tabIds.Properties on-select=(action "tabSelectionChanged")}} - Properties - {{/tablist.tab}} - {{/unless}} - - {{#if isJitAclAccessEnabled}} - {{#tablist.tab tabIds.Access on-select=(action "tabSelectionChanged")}}ACL Access{{/tablist.tab}} - {{/if}} - - {{#tablist.tab tabIds.Schema on-select=(action "tabSelectionChanged")}}Schema{{/tablist.tab}} - - {{#tablist.tab tabIds.Ownership on-select=(action "tabSelectionChanged")}} - Ownership - - {{#if requiredMinNotConfirmed}} - + {{#if isJitAclAccessEnabled}} + {{#tablist.tab tabIds.Access on-select=(action "tabSelectionChanged")}}ACL Access{{/tablist.tab}} {{/if}} - {{/tablist.tab}} - {{#if isInternal}} - {{#tablist.tab tabIds.Compliance on-select=(action "tabSelectionChanged")}} - Compliance + {{#tablist.tab tabIds.Schema on-select=(action "tabSelectionChanged")}}Schema{{/tablist.tab}} - {{#if requiresUserAction}} + {{#tablist.tab tabIds.Ownership on-select=(action "tabSelectionChanged")}} + Ownership + + {{#if requiredMinNotConfirmed}} {{/if}} {{/tablist.tab}} - {{/if}} - {{/tabs.tablist}} + {{#if isInternal}} + {{#tablist.tab tabIds.Compliance on-select=(action "tabSelectionChanged")}} + Compliance + {{#if requiresUserAction}} + + {{/if}} + {{/tablist.tab}} + {{/if}} + {{/tabs.tablist}} +
+
+ +
{{#tabs.tabpanel tabIds.Properties}} {{datasets/containers/dataset-properties urn=encodedUrn @@ -123,6 +128,5 @@ {{datasets/containers/dataset-acl-access urn=encodedUrn}} {{/tabs.tabpanel}} {{/if}} - - {{/ivy-tabs}} -
+
+{{/ivy-tabs}} diff --git a/wherehows-web/app/templates/search.hbs b/wherehows-web/app/templates/search.hbs index ead47e063b..889b8b437c 100644 --- a/wherehows-web/app/templates/search.hbs +++ b/wherehows-web/app/templates/search.hbs @@ -19,7 +19,7 @@
{{#if model.count}}
-
    +
      {{#unless first}}