mirror of https://github.com/status-im/consul.git
ui: CSS margin/border alterations (#8796)
* ui: Reorganize page top margins and borders * Tweak definition table copy-buttons * Make room for intro paragraphs
This commit is contained in:
parent
bf2b52f880
commit
3a89c7d232
|
@ -46,7 +46,7 @@
|
||||||
margin-bottom: 0.8em;
|
margin-bottom: 0.8em;
|
||||||
}
|
}
|
||||||
%table th {
|
%table th {
|
||||||
padding-bottom: 0.6em;
|
padding: 0.6em 0;
|
||||||
}
|
}
|
||||||
%table th:not(.actions),
|
%table th:not(.actions),
|
||||||
%table td:not(.actions),
|
%table td:not(.actions),
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
@import './app-view/index';
|
@import './app-view/index';
|
||||||
|
|
||||||
main {
|
.app-view {
|
||||||
@extend %app-view;
|
@extend %app-view;
|
||||||
}
|
}
|
||||||
%app-view-actions label + div {
|
%app-view-actions label + div {
|
||||||
|
@ -8,10 +8,6 @@ main {
|
||||||
overflow: visible !important;
|
overflow: visible !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
%app-view .outlet > div.unauthorized,
|
|
||||||
%app-view .outlet > div.error {
|
|
||||||
@extend %app-view-error;
|
|
||||||
}
|
|
||||||
%app-view header form {
|
%app-view header form {
|
||||||
@extend %filter-bar;
|
@extend %filter-bar;
|
||||||
}
|
}
|
||||||
|
@ -19,13 +15,6 @@ main {
|
||||||
%app-view-actions button {
|
%app-view-actions button {
|
||||||
@extend %button-compact;
|
@extend %button-compact;
|
||||||
}
|
}
|
||||||
[role='tabpanel'] > p:only-child,
|
|
||||||
%app-view-content > p:only-child {
|
|
||||||
@extend %app-view-content-empty;
|
|
||||||
}
|
|
||||||
[role='tabpanel'] > *:first-child {
|
|
||||||
margin-top: 1.25em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* toggleable toolbar for short screens */
|
/* toggleable toolbar for short screens */
|
||||||
[for='toolbar-toggle'] {
|
[for='toolbar-toggle'] {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
@import './skin';
|
@import './skin';
|
||||||
@import './layout';
|
@import './layout';
|
||||||
%app-view .outlet > div > header {
|
%app-view > header {
|
||||||
@extend %app-view-header;
|
@extend %app-view-header;
|
||||||
}
|
}
|
||||||
%app-view-header .title {
|
%app-view-header .title {
|
||||||
|
@ -9,6 +9,6 @@
|
||||||
%app-view-header .actions {
|
%app-view-header .actions {
|
||||||
@extend %app-view-actions;
|
@extend %app-view-actions;
|
||||||
}
|
}
|
||||||
%app-view .outlet > div > div {
|
%app-view > div {
|
||||||
@extend %app-view-content;
|
@extend %app-view-content;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,10 +18,7 @@
|
||||||
%app-view {
|
%app-view {
|
||||||
margin-top: 50px;
|
margin-top: 50px;
|
||||||
}
|
}
|
||||||
/* give anything after the header a bit of room */
|
|
||||||
%app-view-header + div > *:first-child {
|
|
||||||
margin-top: 1.8em;
|
|
||||||
}
|
|
||||||
%app-view-title {
|
%app-view-title {
|
||||||
padding-bottom: 0.2em;
|
padding-bottom: 0.2em;
|
||||||
}
|
}
|
||||||
|
@ -40,9 +37,6 @@
|
||||||
padding-bottom: 0.2em;
|
padding-bottom: 0.2em;
|
||||||
margin-bottom: 0.5em;
|
margin-bottom: 0.5em;
|
||||||
}
|
}
|
||||||
%app-view-error > div {
|
|
||||||
padding: 1px 0 30px 0;
|
|
||||||
}
|
|
||||||
%app-view-content-empty {
|
%app-view-content-empty {
|
||||||
margin-top: 0 !important;
|
margin-top: 0 !important;
|
||||||
padding: 50px;
|
padding: 50px;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
@extend %frame-gray-500;
|
@extend %frame-gray-500;
|
||||||
}
|
}
|
||||||
%app-view-title {
|
%app-view-title {
|
||||||
border-bottom: $decor-border-200;
|
border-bottom: $decor-border-100;
|
||||||
}
|
}
|
||||||
%app-view-content h2,
|
%app-view-content h2,
|
||||||
%app-view-content form:not(.filter-bar) fieldset {
|
%app-view-content form:not(.filter-bar) fieldset {
|
||||||
|
|
|
@ -3,3 +3,6 @@
|
||||||
grid-template-columns: 140px auto;
|
grid-template-columns: 140px auto;
|
||||||
grid-gap: 0.4em 20px;
|
grid-gap: 0.4em 20px;
|
||||||
}
|
}
|
||||||
|
%definition-table .copy-button {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
padding: 4px 8px;
|
padding: 4px 8px;
|
||||||
margin-top: 0 !important;
|
|
||||||
margin-bottom: -12px;
|
|
||||||
}
|
}
|
||||||
%filter-bar .filters {
|
%filter-bar .filters {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -12,9 +10,6 @@
|
||||||
%filter-bar .filters > *:not(:last-child) {
|
%filter-bar .filters > *:not(:last-child) {
|
||||||
margin-right: 6px;
|
margin-right: 6px;
|
||||||
}
|
}
|
||||||
%filter-bar + :not(.notice) {
|
|
||||||
margin-top: 1.8em;
|
|
||||||
}
|
|
||||||
%filter-bar fieldset {
|
%filter-bar fieldset {
|
||||||
flex: 0 1 auto;
|
flex: 0 1 auto;
|
||||||
width: auto;
|
width: auto;
|
||||||
|
|
|
@ -1,5 +1,35 @@
|
||||||
@import 'layouts/index';
|
@import 'layouts/index';
|
||||||
|
|
||||||
|
/* all forms have a margin below the header */
|
||||||
|
html[data-route$='.create'] .app-view > header + div > *:first-child,
|
||||||
|
html[data-route$='.edit'] .app-view > header + div > *:first-child {
|
||||||
|
margin-top: 1.8em;
|
||||||
|
}
|
||||||
|
/* most tabs have margin after the tab bar, unless the tab has a filter bar */
|
||||||
|
/* if it is a filter bar and the thing after the filter bar is a p then it also */
|
||||||
|
/* needs a top margun :S */
|
||||||
|
%app-view-content [role='tabpanel'] > *:first-child:not(.filter-bar):not(table),
|
||||||
|
%app-view-content [role='tabpanel'] > .filter-bar + p {
|
||||||
|
margin-top: 1.25em;
|
||||||
|
}
|
||||||
|
/* turn off top borders for things flush up to a filter bar */
|
||||||
|
.consul-lock-session-list {
|
||||||
|
margin-top: 0 !important;
|
||||||
|
}
|
||||||
|
html[data-route='dc.services.index'] .consul-service-list ul,
|
||||||
|
.consul-nspace-list ul,
|
||||||
|
.consul-service-instance-list ul,
|
||||||
|
.consul-node-list ul,
|
||||||
|
.consul-lock-session-list ul,
|
||||||
|
.consul-role-list ul,
|
||||||
|
.consul-policy-list ul,
|
||||||
|
.consul-token-list ul {
|
||||||
|
border-top-width: 0 !important;
|
||||||
|
}
|
||||||
|
.notice + .consul-token-list ul {
|
||||||
|
border-top-width: 1px !important;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: This shouldn't be done here, decide the best way to do this
|
// TODO: This shouldn't be done here, decide the best way to do this
|
||||||
// %main-decoration ? %main-skin ? %content-skin ?
|
// %main-decoration ? %main-skin ? %content-skin ?
|
||||||
// it includes layouts of components, but not layout of itself?
|
// it includes layouts of components, but not layout of itself?
|
||||||
|
@ -47,7 +77,7 @@ html[data-route$='.edit'] main {
|
||||||
margin-bottom: 1em;
|
margin-bottom: 1em;
|
||||||
}
|
}
|
||||||
/* TODO: keep margin below forms, move elsewhere? */
|
/* TODO: keep margin below forms, move elsewhere? */
|
||||||
%main-content form,
|
%main-content form:not(.filter-bar),
|
||||||
%main-content form + div .with-confirmation {
|
%main-content form + div .with-confirmation {
|
||||||
margin-bottom: 2em;
|
margin-bottom: 2em;
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,7 +58,6 @@ pre code,
|
||||||
%app-view h1 span.kind-proxy {
|
%app-view h1 span.kind-proxy {
|
||||||
@extend %p2;
|
@extend %p2;
|
||||||
}
|
}
|
||||||
.template-error > div,
|
|
||||||
%empty-state-subheader,
|
%empty-state-subheader,
|
||||||
%empty-state p,
|
%empty-state p,
|
||||||
%button,
|
%button,
|
||||||
|
|
Loading…
Reference in New Issue