diff --git a/zero.Web.UI/App/components/header-bar.vue b/zero.Web.UI/App/components/header-bar.vue index 01010e04..fc44b2b8 100644 --- a/zero.Web.UI/App/components/header-bar.vue +++ b/zero.Web.UI/App/components/header-bar.vue @@ -6,9 +6,9 @@

- + - + {{count}}

@@ -116,6 +116,7 @@ .ui-icon-button { margin-right: var(--padding-s); + margin-top: -2px; } } @@ -147,6 +148,9 @@ font-weight: 700; //display: flex; //align-items: center; + font-size: var(--font-size-xl); + font-weight: 900; + //text-transform: uppercase; &.is-empty, .-minor { @@ -160,7 +164,7 @@ font-size: 11px; font-weight: 700; text-transform: uppercase; - background: var(--color-bg-shade-5); + background: var(--color-box); //box-shadow: var(--shadow-short); color: var(--color-text); height: 22px; @@ -174,6 +178,13 @@ position: relative; top: -1px; } + + .ui-icon + { + position: relative; + top: 2px; + margin: 0 5px; + } } .ui-header-bar-description diff --git a/zero.Web.UI/App/components/overlays/overlay-editor.vue b/zero.Web.UI/App/components/overlays/overlay-editor.vue index 6d63e169..a5ed9547 100644 --- a/zero.Web.UI/App/components/overlays/overlay-editor.vue +++ b/zero.Web.UI/App/components/overlays/overlay-editor.vue @@ -24,7 +24,7 @@ { display: grid; grid-template-rows: auto 1fr auto; - height: calc(100vh - 20px); + height: 100vh; > header { @@ -37,7 +37,6 @@ justify-content: flex-end; padding: 20px var(--padding); //background: var(--color-overlay-footer); - border-radius: 0 0 var(--radius) var(--radius); } > content diff --git a/zero.Web.UI/App/components/overlays/overlay-holder.vue b/zero.Web.UI/App/components/overlays/overlay-holder.vue index 65df5f78..d2d5e486 100644 --- a/zero.Web.UI/App/components/overlays/overlay-holder.vue +++ b/zero.Web.UI/App/components/overlays/overlay-holder.vue @@ -108,13 +108,11 @@ right: 0; top: 0; bottom: 0; - border-radius: var(--radius); box-shadow: var(--shadow-overlay); background: var(--color-overlay-editor); text-align: left; padding: 0; - margin: 10px; - height: calc(100vh - 20px); + height: 100vh; max-width: 100%; } diff --git a/zero.Web.UI/App/components/tables/table.scss b/zero.Web.UI/App/components/tables/table.scss index 7e62245c..a9960e1d 100644 --- a/zero.Web.UI/App/components/tables/table.scss +++ b/zero.Web.UI/App/components/tables/table.scss @@ -272,6 +272,7 @@ a.ui-table-row:hover, button.ui-table-row:hover .ui-table-cell .-minor { color: var(--color-text-dim-one); + font-weight: 400; } .ui-table-field-image diff --git a/zero.Web.UI/App/editor/editor-aside.vue b/zero.Web.UI/App/editor/editor-aside.vue index ffc6697a..ed3f6dc2 100644 --- a/zero.Web.UI/App/editor/editor-aside.vue +++ b/zero.Web.UI/App/editor/editor-aside.vue @@ -1,28 +1,12 @@  @@ -72,4 +56,17 @@ this.component = zero.overrides['editor-aside'] || null; } } - \ No newline at end of file + + + \ No newline at end of file diff --git a/zero.Web.UI/App/editor/editor.scss b/zero.Web.UI/App/editor/editor.scss index 594325e6..d68c0379 100644 --- a/zero.Web.UI/App/editor/editor.scss +++ b/zero.Web.UI/App/editor/editor.scss @@ -26,10 +26,10 @@ &.has-sidebar { - max-width: 1460px; + max-width: 1580px; display: grid; - grid-template-columns: minmax(auto, 1fr) 200px; - grid-gap: var(--padding); + grid-template-columns: minmax(auto, 1fr) 260px; + grid-gap: 0 var(--padding); } } diff --git a/zero.Web.UI/App/pages/settings/country.vue b/zero.Web.UI/App/pages/settings/country.vue index 0b1d9f67..6f4e26c2 100644 --- a/zero.Web.UI/App/pages/settings/country.vue +++ b/zero.Web.UI/App/pages/settings/country.vue @@ -5,6 +5,9 @@ + @@ -12,6 +15,7 @@