Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: Ensure %app-content > %app-view-content rename is complete #6843

Merged
merged 1 commit into from
Dec 4, 2019
Merged

ui: Ensure %app-content > %app-view-content rename is complete #6843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui-v2/app/styles/components/app-view.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ main {
%app-view-header .actions button {
@extend %button-compact;
}
%app-content div > dl {
%app-view-content div > dl {
@extend %form-row;
}
[role='tabpanel'] > p:only-child,
Expand Down
4 changes: 2 additions & 2 deletions ui-v2/app/styles/components/app-view/skin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
border-top: 0 !important;
}
}
%app-content div > dl > dd {
%app-view-content div > dl > dd {
color: $gray-400;
}
[role='tabpanel'] > p:only-child,
.template-error > div,
%app-content > p:only-child,
%app-view-content > p:only-child,
%app-view > div.disabled > div {
@extend %frame-gray-500;
}
6 changes: 3 additions & 3 deletions ui-v2/app/styles/components/form-elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ label span {
@extend %form-element-error;
}
%modal-dialog .type-text,
%app-content .type-text {
%app-view-content .type-text {
@extend %form-element;
}
.type-toggle {
Expand All @@ -22,10 +22,10 @@ label span {
%radio-group,
%checkbox-group,
form table,
%app-content form dl {
%app-view-content form dl {
@extend %form-row;
}
%app-content form:not(.filter-bar) [role='radiogroup'],
%app-view-content form:not(.filter-bar) [role='radiogroup'],
%modal-window [role='radiogroup'] {
@extend %radio-group;
}
Expand Down
2 changes: 1 addition & 1 deletion ui-v2/app/styles/core/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// TODO: This shouldn't be done here, decide the best way to do this
// %main-decoration ? %main-skin ? %content-skin ?
// it includes layouts of components, but not layout of itself?
// %main-components? What about %app-content
// %main-components? What about %app-view-content
main,
%modal-window {
@extend %main-content;
Expand Down
6 changes: 3 additions & 3 deletions ui-v2/app/styles/core/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ h3,
}
/* Weighting */
h1,
%app-content div > dt,
%app-view-content div > dt,
%header-drop-nav .is-active {
font-weight: $typo-weight-bold;
}
Expand All @@ -43,7 +43,7 @@ caption,
%header-nav,
%healthcheck-output dt,
%copy-button,
%app-content div > dl > dt,
%app-view-content div > dl > dt,
%tbody-th,
%form-element > span,
%toggle label span {
Expand Down Expand Up @@ -121,7 +121,7 @@ fieldset > p,
.template-error > div,
[role='tabpanel'] > p:only-child,
.with-confirmation p,
%app-content > p:only-child,
%app-view-content > p:only-child,
%app-view > div.disabled > div,
%button,
%form-element > em,
Expand Down