Skip to content

Commit

Permalink
ui: Use top-level 'named index files' instead of in folder index files (
Browse files Browse the repository at this point in the history
#8274)

* Remove unused phrase-editor CSS

* Move index.scss files to top-level named files to make them more obvious
  • Loading branch information
johncowen authored Jul 9, 2020
1 parent b27efcd commit 7edb3ec
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 69 deletions.
26 changes: 11 additions & 15 deletions ui-v2/app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
@charset 'utf-8';
@import 'base/reset/index';
@import 'base/index';
@import 'variables/index';

/* all variables and custom queries including generic base variables */
@import 'variables';

/*TODO: Move this to its own local component*/
@import 'ember-power-select';
/**/

@import 'base/components/index';
@import 'components/index';
@import 'core/typography';
@import 'core/layout';

@import 'routes/dc/settings/index';
@import 'routes/dc/services/index';
@import 'routes/dc/nodes/index';
@import 'routes/dc/intention/index';
@import 'routes/dc/kv/index';
@import 'routes/dc/acls/index';
@import 'routes/dc/acls/tokens/index';
/* all components including generic base components */
@import 'components';
/* cascading typography */
@import 'typography';
/* layouts */
@import 'layout';
/* pinpoint individual overwrites for those 'just on this page' problems */
@import 'routes';
52 changes: 52 additions & 0 deletions ui-v2/app/styles/components.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
@import './base/components/index';

/**/

@import './components/card/index';
@import './components/form-elements';
@import './components/breadcrumbs';
@import './components/anchors';
@import './components/progress';
@import './components/buttons';
@import './components/composite-row';
@import './components/secret-button';
@import './components/tabs';
@import './components/pill';
@import './components/table';
@import './components/tooltip';
@import './components/tag-list';
@import './components/healthcheck-output';
@import './components/healthcheck-info';
@import './components/healthchecked-resource';
@import './components/freetext-filter';
@import './components/filter-bar';
@import './components/tomography-graph';
@import './components/flash-message';
@import './components/code-editor';
@import './components/confirmation-dialog';
@import './components/modal-dialog';
@import './components/auth-form';
@import './components/auth-modal';
@import './components/notice';
@import './components/oidc-select';
@import './components/discovery-chain';
@import './components/empty-state';
@import './components/tabular-details';
@import './components/tabular-collection';
@import './components/list-collection';
@import './components/grid-collection';
@import './components/popover-select';
@import './components/tooltip-panel';
@import './components/menu-panel';
@import './components/more-popover-menu';
@import './components/confirmation-alert';
@import './components/definition-table';

/**/

@import './components/brand-loader';
@import './components/loader';
@import './components/main-header-horizontal';
@import './components/main-nav-horizontal';
@import './components/app-view';
@import './components/footer';
48 changes: 0 additions & 48 deletions ui-v2/app/styles/components/index.scss

This file was deleted.

4 changes: 0 additions & 4 deletions ui-v2/app/styles/components/phrase-editor.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../layouts/index';
@import 'layouts/index';

// TODO: This shouldn't be done here, decide the best way to do this
// %main-decoration ? %main-skin ? %content-skin ?
Expand Down
7 changes: 7 additions & 0 deletions ui-v2/app/styles/routes.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@import 'routes/dc/settings/index';
@import 'routes/dc/services/index';
@import 'routes/dc/nodes/index';
@import 'routes/dc/intention/index';
@import 'routes/dc/kv/index';
@import 'routes/dc/acls/index';
@import 'routes/dc/acls/tokens/index';
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ pre code,
%notice p,
%flash-message p,
%filter-bar input,
%phrase-editor input,
%tab-section p {
@extend %p1;
}
Expand Down
4 changes: 4 additions & 0 deletions ui-v2/app/styles/variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import './base/reset/index';
@import './base/index';
@import './variables/custom-query';
@import './variables/skin';
File renamed without changes.

0 comments on commit 7edb3ec

Please sign in to comment.