Skip to content

A platform for community discussion. Free, open, simple.

DEV: Move upcoming-changes CSS to dedicated files, loaded last (#41987)

David Taylor4a6959f6a2ba
diff --git a/.skills/discourse-upcoming-changes-authoring/SKILL.md b/.skills/discourse-upcoming-changes-authoring/SKILL.md
index 5fbb5eef1f8..bffecdd7caa 100644
--- a/.skills/discourse-upcoming-changes-authoring/SKILL.md
+++ b/.skills/discourse-upcoming-changes-authoring/SKILL.md
@@ -223,6 +223,7 @@ enable_your_feature_name:
- **Opt-in only**: Omitting `body_class` (or setting it `false`) means no body class — the default. Add it only when you actually have CSS keyed on `uc-{name}`.
- **Always wrap in `:where()`**: Style the class as `:where(.uc-{name})`, never a bare `.uc-{name}`, so the transitional class adds zero specificity and stays safe to unwrap and delete later — the `discourse/uc-classes-in-where` stylelint rule enforces this.
+- **Put the CSS in dedicated files** imported from `app/assets/stylesheets/common/upcoming-changes/_index.scss`.
- **Enabled-for-user gated**: The class only appears for users the change is enabled for (via `currentUserUpcomingChanges`), not globally. Anonymous/ineligible users won't get it.
- **Integrity-checked**: `body_class` is in the integrity spec's `allowed_keys` and must be a boolean — see [Mocking Metadata](#mocking-metadata) for how to set it in tests.
diff --git a/.skills/discourse-upcoming-changes/SKILL.md b/.skills/discourse-upcoming-changes/SKILL.md
index 08705fe3dcd..8931fcfed48 100644
--- a/.skills/discourse-upcoming-changes/SKILL.md
+++ b/.skills/discourse-upcoming-changes/SKILL.md
@@ -83,7 +83,7 @@ upcoming_change:
| `[specific_groups]` | No one, Specific group(s) |
| `[staff, specific_groups]` | No one, Staff, Specific group(s) |
-**Optional:** Add `include_css: true` if you need to scope CSS to this change. When enabled for a user, a `uc-<dasherized-setting-name>` class is added to `<body>` so stylesheets can gate visuals on the change (e.g. `enable_your_feature_name` → `body.uc-enable-your-feature-name`). Omit it (the default) when the change has no CSS keyed on the body class — body classes are opt-in, not emitted for every change. Always scope this CSS as `:where(.uc-<dasherized-setting-name>)`, never a bare `.uc-<name>`, so the transitional class adds zero specificity and stays safe to remove later — enforced by the `discourse/uc-classes-in-where` stylelint rule.
+**Optional:** Add `include_css: true` if you need to scope CSS to this change. When enabled for a user, a `uc-<dasherized-setting-name>` class is added to `<body>` so stylesheets can gate visuals on the change (e.g. `enable_your_feature_name` → `body.uc-enable-your-feature-name`). Omit it (the default) when the change has no CSS keyed on the body class — body classes are opt-in, not emitted for every change. Always scope this CSS as `:where(.uc-<dasherized-setting-name>)`, never a bare `.uc-<name>`, so the transitional class adds zero specificity and stays safe to remove later — enforced by the `discourse/uc-classes-in-where` stylelint rule. Put the styles in dedicated files imported from `app/assets/stylesheets/common/upcoming-changes/_index.scss`.
```yaml
upcoming_change:
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 2d8fea87e3c..38ff1630673 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -25,3 +25,4 @@
@import "common/post-action-feedback";
@import "common/toolbar-popup-menu-options";
@import "common/nested-view";
+@import "common/upcoming-changes/_index";
diff --git a/app/assets/stylesheets/common/base/_index.scss b/app/assets/stylesheets/common/base/_index.scss
index 08e82070409..9b0bfbe49ba 100644
--- a/app/assets/stylesheets/common/base/_index.scss
+++ b/app/assets/stylesheets/common/base/_index.scss
@@ -71,5 +71,3 @@
@import "user-badges";
@import "user-tips";
@import "embed-mode";
-@import "uc-dismiss";
-@import "uc-modernize-foundation-theme";
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 0308b8cf2e4..509ea8fe53b 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -1249,329 +1249,3 @@ body.has-sidebar-page {
display: none;
}
}
-
-:where(.uc-enable-composer-redesign) {
- // flat to match the rest of the bar, aligned to the content gutter
- #reply-control .reply-to .composer-actions-trigger {
- padding-inline-start: 0;
- background: transparent;
- border-color: transparent;
-
- .d-button-label {
- font-weight: 600;
- }
- }
-
- #reply-control {
- // the redesigned grippie is taller than the height the default layout
- // reserves for it, so size the reply area with flex instead
- .grippie ~ .reply-area {
- flex: 1 1 auto;
- height: auto;
- min-height: 0;
- }
- }
-
- .grippie {
- padding-block: var(--space-1);
- border-top-left-radius: var(--d-border-radius-large);
- border-top-right-radius: var(--d-border-radius-large);
- }
-
- .reply-to {
- padding: var(--space-2) var(--space-4);
- margin: 0 !important;
- border-bottom: 1px solid var(--primary-low);
- }
-
- .reply-area {
- padding: 0 !important;
- }
-
- .composer-controls {
- .btn {
- font-size: var(--font-down-1-rem);
- }
- }
-
- .title-and-category {
- padding: 0 !important;
- width: 100% !important;
- gap: 0 !important;
- border-bottom: 1px solid var(--primary-low);
- }
-
- .category-input,
- .users-input {
- border-right: 1px solid var(--primary-low);
-
- @include viewport.until(sm) {
- flex-grow: 1;
- }
- }
-
- .tags-input {
- @include viewport.until(sm) {
- flex-grow: 0 !important;
- }
-
- @include viewport.until(sm) {
- .select-kit {
- .formatted-selection {
- display: none !important;
- }
- }
- }
-
- .select-kit-header-wrapper {
- gap: var(--space-1);
-
- .formatted-selection {
- color: var(--primary-medium);
- }
-
- .d-icon-plus {
- @include viewport.until(sm) {
- display: none;
- }
- }
-
- .d-icon-tag {
- color: var(--primary-low-mid) !important;
- }
- }
-
- .has-selection {
- .select-kit-header-wrapper {
- .formatted-selection {
- color: var(--primary-high);
- }
-
- .d-icon-tag {
- color: var(--tertiary) !important;
- }
- }
- }
- }
-
- .category-input,
- .tags-input,
- .users-input {
- margin: 0 !important;
- max-width: unset !important;
- width: 50% !important;
- box-sizing: border-box;
-
- @include viewport.until(sm) {
- width: auto !important;
- }
-
- .category-chooser.is-expanded,
- .mini-tag-chooser.is-expanded {
- .select-kit-header {
- outline: 0 !important;
- }
- }
-
- .select-kit.combo-box .select-kit-header,
- .select-kit.multi-select .multi-select-header {
- border: 0;
- padding: var(--space-3) var(--space-4);
-
- &:active {
- border: 0;
- outline: 0;
- }
-
- .d-icon {
- font-size: var(--font-down-1-rem);
- color: var(--primary-medium);
- }
- }
- }
-
- .title-input {
- #reply-title {
- border: 0;
- padding: var(--space-4);
- font-size: var(--font-up-3);
- margin-bottom: 0 !important;
- padding-bottom: var(--space-2) !important;
-
- &::placeholder {
- color: var(--primary-medium);
- }
-
- @include viewport.until(sm) {
- font-size: var(--font-up-2);
- }
-
- &:focus {
- outline: 0;
- }
- }
- }
-
- .d-editor-textarea-wrapper {
- --composer-slide-easing: cubic-bezier(0.2, 0, 0, 1);
- border: 0;
-
- // padding and border-radius must animate in lockstep with margin,
- // otherwise the text counter-jumps when the focus state toggles
- transition:
- margin 250ms var(--composer-slide-easing),
- padding 250ms var(--composer-slide-easing),
- border-radius 250ms var(--composer-slide-easing),
- box-shadow 250ms ease;
-
- @media (prefers-reduced-motion: reduce) {
- transition: none;
- }
-
- &:focus,
- &.in-focus {
- outline: none;
- border: 0;
- }
- }
-
- #reply-control.has-composer-fields .d-editor-textarea-wrapper {
- &:focus,
- &:focus-within,
- &.in-focus {
- @include viewport.until(sm) {
- margin-top: calc(
- (
- var(--composer-fields-height, 0px) +
- (var(--header-offset, 0px) / 3)
- ) *
- -1
- );
- z-index: z("composer", "dropdown") + 1;
- box-shadow: 0 -12px 12px 0 rgb(var(--primary-rgb), 0.15);
- border-top-left-radius: var(--d-border-radius-large);
- border-top-right-radius: var(--d-border-radius-large);
- padding-top: var(--space-4);
- }
- }
- }
-
- .d-editor-input {
- padding-inline: var(--space-4) !important;
- }
-
- .wmd-controls:not(.toolbar-visible)
- ~ .composer-footer
- .d-editor-button-bar__wrap {
- display: none;
- }
-
- // clean up selector once the uc- body class is no longer in the way
- .show-preview .d-editor-container.--markdown-editor-enabled {
- .d-editor-textarea-column {
- border-right: 1px solid var(--primary-low);
- }
-
- .d-editor-preview-wrapper {
- margin-top: var(--space-2);
- }
- }
-
- .composer-footer {
- display: flex;
- align-items: center;
- flex-wrap: nowrap;
-
- @include viewport.from(sm) {
- padding: var(--space-2) var(--space-4);
- border-top: 1px solid var(--primary-low);
- }
-
- @include viewport.until(sm) {
- flex-direction: column;
- }
-
- &__toolbar {
- overflow: hidden;
- flex-grow: 1;
-
- @include viewport.until(sm) {
- width: 100%;
- padding-inline: var(--space-2);
- box-sizing: border-box;
- border-top: 1px solid var(--primary-low);
- border-bottom: 1px solid var(--primary-low);
- }
- }
-
- .submit-panel {
- margin: 0 !important;
-
- @include viewport.until(sm) {
- width: 100%;
- padding-inline: var(--space-2);
- box-sizing: border-box;
-
- .save-or-cancel {
- display: inline-flex !important;
- margin-left: auto;
- flex: unset !important;
- margin-right: 0 !important;
-
- // temporary overrule, should be done in template eventually
- .btn.btn-primary {
- background: transparent;
- color: var(--tertiary);
- font-weight: bold;
- }
- }
-
- #draft-status {
- margin-left: 0 !important;
- }
- }
- }
-
- .d-editor-button-bar__wrap {
- @include viewport.until(sm) {
- margin: 0;
- }
- }
-
- .d-editor-button-bar {
- @include viewport.until(sm) {
- padding-inline: var(--space-2);
- }
-
- &__scroll-btn {
- color: var(--primary-medium);
- font-size: var(--font-down-1-rem);
- }
-
- .btn,
- .composer-toggle-switch__left-icon,
- .composer-toggle-switch__right-icon {
- font-size: var(--font-down-1-rem);
- }
- }
-
- .composer-toggle-switch {
- margin-left: 0;
- }
- }
-
- @include viewport.until(sm) {
- .reply-area {
- background: var(--secondary);
- padding: 0 0 max(env(safe-area-inset-bottom), var(--space-2)) !important;
-
- html.keyboard-visible & {
- padding-bottom: var(--space-2) !important;
- }
- }
-
- .reply-to {
- padding: var(--space-1) var(--space-3);
- }
- }
-}
diff --git a/app/assets/stylesheets/common/form-kit/_index.scss b/app/assets/stylesheets/common/form-kit/_index.scss
index 6af38bb9e0f..c99008e4c90 100644
--- a/app/assets/stylesheets/common/form-kit/_index.scss
+++ b/app/assets/stylesheets/common/form-kit/_index.scss
@@ -8,7 +8,6 @@
@import "_conditional-display";
@import "_container";
@import "_control-checkbox";
-@import "_control-checkbox-upcoming-changes";
@import "_control-code";
@import "_control-color";
@import "_control-composer";
diff --git a/app/assets/stylesheets/common/upcoming-changes/_index.scss b/app/assets/stylesheets/common/upcoming-changes/_index.scss
new file mode 100644
index 00000000000..52cc078250b
--- /dev/null
+++ b/app/assets/stylesheets/common/upcoming-changes/_index.scss
@@ -0,0 +1,4 @@
+@import "uc-dismiss";
+@import "uc-enable-composer-redesign";
+@import "uc-enable-new-checkbox-style";
+@import "uc-modernize-foundation-theme";
diff --git a/app/assets/stylesheets/common/base/uc-dismiss.scss b/app/assets/stylesheets/common/upcoming-changes/uc-dismiss.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-dismiss.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-dismiss.scss
diff --git a/app/assets/stylesheets/common/upcoming-changes/uc-enable-composer-redesign.scss b/app/assets/stylesheets/common/upcoming-changes/uc-enable-composer-redesign.scss
new file mode 100644
index 00000000000..9a5a901e9fb
--- /dev/null
+++ b/app/assets/stylesheets/common/upcoming-changes/uc-enable-composer-redesign.scss
@@ -0,0 +1,327 @@
+@use "lib/viewport";
+
+:where(.uc-enable-composer-redesign) {
+ // flat to match the rest of the bar, aligned to the content gutter
+ #reply-control .reply-to .composer-actions-trigger {
+ padding-inline-start: 0;
+ background: transparent;
+ border-color: transparent;
+
+ .d-button-label {
+ font-weight: 600;
+ }
+ }
+
+ #reply-control {
+ // the redesigned grippie is taller than the height the default layout
+ // reserves for it, so size the reply area with flex instead
+ .grippie ~ .reply-area {
+ flex: 1 1 auto;
+ height: auto;
+ min-height: 0;
+ }
+ }
+
+ .grippie {
+ padding-block: var(--space-1);
+ border-top-left-radius: var(--d-border-radius-large);
+ border-top-right-radius: var(--d-border-radius-large);
+ }
+
+ .reply-to {
+ padding: var(--space-2) var(--space-4);
+ margin: 0 !important;
+ border-bottom: 1px solid var(--primary-low);
+ }
+
+ .reply-area {
+ padding: 0 !important;
+ }
+
+ .composer-controls {
+ .btn {
+ font-size: var(--font-down-1-rem);
+ }
+ }
+
+ .title-and-category {
+ padding: 0 !important;
+ width: 100% !important;
+ gap: 0 !important;
+ border-bottom: 1px solid var(--primary-low);
+ }
+
+ .category-input,
+ .users-input {
+ border-right: 1px solid var(--primary-low);
+
+ @include viewport.until(sm) {
+ flex-grow: 1;
+ }
+ }
+
+ .tags-input {
+ @include viewport.until(sm) {
+ flex-grow: 0 !important;
+ }
+
+ @include viewport.until(sm) {
+ .select-kit {
+ .formatted-selection {
+ display: none !important;
+ }
+ }
+ }
+
+ .select-kit-header-wrapper {
+ gap: var(--space-1);
+
+ .formatted-selection {
+ color: var(--primary-medium);
+ }
+
+ .d-icon-plus {
+ @include viewport.until(sm) {
+ display: none;
+ }
+ }
+
+ .d-icon-tag {
+ color: var(--primary-low-mid) !important;
+ }
+ }
+
+ .has-selection {
+ .select-kit-header-wrapper {
+ .formatted-selection {
+ color: var(--primary-high);
+ }
+
+ .d-icon-tag {
+ color: var(--tertiary) !important;
+ }
+ }
+ }
+ }
+
+ .category-input,
+ .tags-input,
+ .users-input {
+ margin: 0 !important;
+ max-width: unset !important;
+ width: 50% !important;
+ box-sizing: border-box;
+
+ @include viewport.until(sm) {
+ width: auto !important;
+ }
+
+ .category-chooser.is-expanded,
+ .mini-tag-chooser.is-expanded {
+ .select-kit-header {
+ outline: 0 !important;
+ }
+ }
+
+ .select-kit.combo-box .select-kit-header,
+ .select-kit.multi-select .multi-select-header {
+ border: 0;
+ padding: var(--space-3) var(--space-4);
+
+ &:active {
+ border: 0;
+ outline: 0;
+ }
+
+ .d-icon {
+ font-size: var(--font-down-1-rem);
+ color: var(--primary-medium);
+ }
+ }
+ }
+
+ .title-input {
+ #reply-title {
+ border: 0;
+ padding: var(--space-4);
+ font-size: var(--font-up-3);
+ margin-bottom: 0 !important;
+ padding-bottom: var(--space-2) !important;
+
+ &::placeholder {
+ color: var(--primary-medium);
+ }
+
+ @include viewport.until(sm) {
+ font-size: var(--font-up-2);
+ }
+
+ &:focus {
+ outline: 0;
+ }
+ }
+ }
+
+ .d-editor-textarea-wrapper {
+ --composer-slide-easing: cubic-bezier(0.2, 0, 0, 1);
+ border: 0;
+
+ // padding and border-radius must animate in lockstep with margin,
+ // otherwise the text counter-jumps when the focus state toggles
+ transition:
+ margin 250ms var(--composer-slide-easing),
+ padding 250ms var(--composer-slide-easing),
+ border-radius 250ms var(--composer-slide-easing),
+ box-shadow 250ms ease;
+
+ @media (prefers-reduced-motion: reduce) {
+ transition: none;
+ }
+
+ &:focus,
+ &.in-focus {
+ outline: none;
+ border: 0;
+ }
+ }
+
+ #reply-control.has-composer-fields .d-editor-textarea-wrapper {
+ &:focus,
+ &:focus-within,
+ &.in-focus {
+ @include viewport.until(sm) {
+ margin-top: calc(
+ (
+ var(--composer-fields-height, 0px) +
+ (var(--header-offset, 0px) / 3)
+ ) *
+ -1
+ );
+ z-index: z("composer", "dropdown") + 1;
+ box-shadow: 0 -12px 12px 0 rgb(var(--primary-rgb), 0.15);
+ border-top-left-radius: var(--d-border-radius-large);
+ border-top-right-radius: var(--d-border-radius-large);
+ padding-top: var(--space-4);
+ }
+ }
+ }
+
+ .d-editor-input {
+ padding-inline: var(--space-4) !important;
+ }
+
+ .wmd-controls:not(.toolbar-visible)
+ ~ .composer-footer
+ .d-editor-button-bar__wrap {
+ display: none;
+ }
+
+ // clean up selector once the uc- body class is no longer in the way
+ .show-preview .d-editor-container.--markdown-editor-enabled {
+ .d-editor-textarea-column {
+ border-right: 1px solid var(--primary-low);
+ }
+
+ .d-editor-preview-wrapper {
+ margin-top: var(--space-2);
+ }
+ }
+
+ .composer-footer {
+ display: flex;
+ align-items: center;
+ flex-wrap: nowrap;
+
+ @include viewport.from(sm) {
+ padding: var(--space-2) var(--space-4);
+ border-top: 1px solid var(--primary-low);
+ }
+
+ @include viewport.until(sm) {
+ flex-direction: column;
+ }
+
+ &__toolbar {
+ overflow: hidden;
+ flex-grow: 1;
+
+ @include viewport.until(sm) {
+ width: 100%;
+ padding-inline: var(--space-2);
+ box-sizing: border-box;
+ border-top: 1px solid var(--primary-low);
+ border-bottom: 1px solid var(--primary-low);
+ }
+ }
+
+ .submit-panel {
+ margin: 0 !important;
+
+ @include viewport.until(sm) {
+ width: 100%;
+ padding-inline: var(--space-2);
+ box-sizing: border-box;
+
+ .save-or-cancel {
+ display: inline-flex !important;
+ margin-left: auto;
+ flex: unset !important;
+ margin-right: 0 !important;
+
+ // temporary overrule, should be done in template eventually
+ .btn.btn-primary {
+ background: transparent;
+ color: var(--tertiary);
+ font-weight: bold;
+ }
+ }
+
+ #draft-status {
+ margin-left: 0 !important;
+ }
+ }
+ }
+
+ .d-editor-button-bar__wrap {
+ @include viewport.until(sm) {
+ margin: 0;
+ }
+ }
+
+ .d-editor-button-bar {
+ @include viewport.until(sm) {
+ padding-inline: var(--space-2);
+ }
+
+ &__scroll-btn {
+ color: var(--primary-medium);
+ font-size: var(--font-down-1-rem);
+ }
+
+ .btn,
+ .composer-toggle-switch__left-icon,
+ .composer-toggle-switch__right-icon {
+ font-size: var(--font-down-1-rem);
+ }
+ }
+
+ .composer-toggle-switch {
+ margin-left: 0;
+ }
+ }
+
+ @include viewport.until(sm) {
+ .reply-area {
+ background: var(--secondary);
+ padding: 0 0 max(env(safe-area-inset-bottom), var(--space-2)) !important;
+
+ html.keyboard-visible & {
+ padding-bottom: var(--space-2) !important;
+ }
+ }
+
+ .reply-to {
+ padding: var(--space-1) var(--space-3);
+ }
+ }
+}
diff --git a/app/assets/stylesheets/common/form-kit/_control-checkbox-upcoming-changes.scss b/app/assets/stylesheets/common/upcoming-changes/uc-enable-new-checkbox-style.scss
similarity index 100%
rename from app/assets/stylesheets/common/form-kit/_control-checkbox-upcoming-changes.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-enable-new-checkbox-style.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/_index.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/_index.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/_index.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/_index.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/buttons-controls.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/buttons-controls.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/calendar.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/calendar.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/calendar.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/calendar.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/categories.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/categories.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/categories.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/categories.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/chat.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/chat.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/chat.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/chat.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/groups.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/groups.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/groups.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/groups.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/header.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/header.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/header.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/header.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/misc.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/misc.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/misc.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/misc.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/nav-pills.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/nav-pills.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/nav-pills.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/nav-pills.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/select-kit.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/select-kit.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/select-kit.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/select-kit.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/sidebar.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/sidebar.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/sidebar.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/sidebar.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/topic-list.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/topic-list.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/topic-list.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/topic-list.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/variables.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/variables.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/variables.scss
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/welcome-banner.scss b/app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/welcome-banner.scss
similarity index 100%
rename from app/assets/stylesheets/common/base/uc-modernize-foundation-theme/welcome-banner.scss
rename to app/assets/stylesheets/common/upcoming-changes/uc-modernize-foundation-theme/welcome-banner.scss