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

fix(shell): restructure shell styles #42

Merged
merged 5 commits into from
Sep 3, 2019
Merged

fix(shell): restructure shell styles #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0115aa
fix(shell): restructure shell styles
Aug 28, 2019
952bf5f
fix(storybook): modularise container imports
Aug 28, 2019
545b675
fix(themes): fix themes reference
Aug 28, 2019
813ef04
chore(merge): merge `modular-styles`
Aug 29, 2019
e5bacd0
refactor(themes): rename imports
Aug 30, 2019
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
1 change: 1 addition & 0 deletions .storybook/addons/addon-theme/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { action, getStoredTheme, namespace, themes, title } from '.';

import { Form, Select, SelectItem } from '../../../src';

// TODO: `modular-styles` - Revert.
// import '../../../src/index.scss';

const { addPanel, getChannel, register } = addons;
Expand Down
2 changes: 2 additions & 0 deletions .storybook/components/Container/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
/// @copyright IBM Security 2019
////

@import 'carbon-components/scss/globals/scss/spacing';

@import '../../../src/index';

.container {
Expand Down
1 change: 1 addition & 0 deletions .storybook/components/Container/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* @copyright IBM Security 2019
*/

// TODO: `modular-styles` - Revert.
// import '../../index.scss';

const Container = ({ children }) => children;
Expand Down
2 changes: 2 additions & 0 deletions .storybook/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ addParameters({
),
storySort: (a, b) =>
ORDER.indexOf(getCategory(a)) - ORDER.indexOf(getCategory(b)),

// TODO: `modular-styles` - Revert.
j1mie marked this conversation as resolved.
Show resolved Hide resolved
// theme,
},
});
Expand Down
6 changes: 2 additions & 4 deletions .storybook/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
/// @copyright IBM Security 2019
////

// @import 'themes/index';
// @import '../.storybook/components/Container/index';
@import 'themes/index';
@import '../.storybook/components/Container/index';

/**
.grid {
display: flex;
padding: $carbon--spacing-09;
Expand All @@ -29,4 +28,3 @@
}
}
}
**/
18 changes: 5 additions & 13 deletions src/components/Accordion/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
////
/// Accordion component.
/// @group accordion
/// @copyright IBM Security 2018
/// @copyright IBM Security 2019
////

// Security variables
@import '../../globals/variables/index';

// Carbon components
@import 'carbon-components/scss/components/accordion/accordion';

// Security components
@import '../../components/SkeletonText/index';

// Carbon mixins
@import '@carbon/type/scss/styles';
@import '@carbon/layout/scss/spacing';
@import '@carbon/type/scss/styles';
@import 'carbon-components/scss/components/accordion/accordion';

// Security mixins
@import '../../globals/namespace/index';

@import '../../components/SkeletonText/index';

@include export-namespace($name: 'accordion') {
.#{$prefix}--accordion {
&__heading {
Expand Down
3 changes: 2 additions & 1 deletion src/components/Breadcrumb/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
/// @copyright IBM Security 2019
////

@import '@carbon/type/scss/styles';
@import 'carbon-components/scss/components/breadcrumb/breadcrumb';

@import '../../globals/index';
@import '../../globals/namespace/index';

/// Carbon style overrides.
@include export-namespace($name: breadcrumb) {
Expand Down
9 changes: 2 additions & 7 deletions src/components/Button/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@
/// @copyright IBM Security 2019
////

@import 'carbon-components/scss/globals/scss/vars';

@import '../../globals/color/index';
@import '../../globals/layout/index';
@import '../../globals/motion/index';
@import '../../globals/rtl/index';
@import '../../globals/theme/index';
@import '@carbon/layout/scss/spacing';
@import '@carbon/type/scss/styles';

@mixin button {
/// Padding.
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/HeaderListItem/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// @copyright IBM Security 2019
////

@import '../../../globals/index';
@import '@carbon/layout/scss/spacing';

@mixin header__list__item {
height: inherit;
Expand Down
9 changes: 8 additions & 1 deletion src/components/Header/HeaderNotification/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
/// @copyright IBM Security 2019
////

@import '../../../globals/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/layout/scss/spacing';
@import '@carbon/themes/scss/tokens';
@import '@carbon/type/scss/font-family';
@import '@carbon/type/scss/styles';
@import 'carbon-components/scss/globals/scss/layout';

@import '../../../globals/motion/index';

@import '../mixins';

Expand Down
3 changes: 2 additions & 1 deletion src/components/Header/HeaderPopoverHeader/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
/// @copyright IBM Security 2019
////

@import '../../../globals/index';
@import '@carbon/layout/scss/spacing';
@import '@carbon/type/scss/styles';

@mixin header__popover__header {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/HeaderPopoverLinkSecondary/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// @copyright IBM Security 2019
////

@import '../../../globals/index';
@import '@carbon/themes/scss/tokens';

@mixin header__popover__link--secondary {
&,
Expand Down
24 changes: 13 additions & 11 deletions src/components/Header/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,22 @@
/// @copyright IBM Security 2019
////

@import '../../globals/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/layout/scss/spacing';
@import '@carbon/themes/scss/tokens';
@import '@carbon/type/scss/styles';
@import 'carbon-components/scss/globals/scss/helper-mixins';
@import 'carbon-components/scss/globals/scss/layout';

@import '../../globals/motion/index';
@import '../../globals/namespace/index';

@import '../../platform/body/mixins';

@import '../IconButton/mixins';
SimonFinney marked this conversation as resolved.
Show resolved Hide resolved

@import 'variables';

/// Name.
/// @type String
$header__name: header;
Expand All @@ -22,20 +34,10 @@ $header__namespace: get-component-namespace(
/// @type Color
$header__color__background: $body__color__background;

/// Layer.
/// @type Number
$header__layer: z(
$layer: overlay,
);

/// Width.
/// @type Length
$header__sizing__width: 100%;

/// Padding.
/// @type Length
$header__spacing__padding: $carbon--spacing-03;

/// Transition duration.
/// @type Length
$header__transition__duration: $transition-duration--fast;
Expand Down
18 changes: 18 additions & 0 deletions src/components/Header/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
////
/// Header variables.
/// @group header
/// @copyright IBM Security 2019
////

@import '@carbon/layout/scss/spacing';
@import 'carbon-components/scss/globals/scss/layout';
SimonFinney marked this conversation as resolved.
Show resolved Hide resolved

/// Layer.
/// @type Number
$header__layer: z(
$layer: overlay,
);

/// Padding.
/// @type Length
$header__spacing__padding: $carbon--spacing-03;
8 changes: 6 additions & 2 deletions src/components/IconButton/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
/// @copyright IBM Security 2019
////

@import '../../globals/layout/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/themes/scss/tokens';

@import 'carbon-components/scss/globals/scss/helper-mixins';
@import 'carbon-components/scss/globals/scss/layout';

@import '../../globals/motion/index';
@import '../../globals/theme/index';

@import '../Tooltip/mixins';

Expand Down
2 changes: 2 additions & 0 deletions src/components/IconButton/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
/// @copyright IBM Security 2019
////

@import '../../globals/namespace/index';

/// Name.
/// @type String
$button--icon__name: button--icon;
Expand Down
11 changes: 10 additions & 1 deletion src/components/Nav/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@
/// @copyright IBM Security 2019
////

@import '../../globals/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/layout/scss/spacing';
@import '@carbon/themes/scss/tokens';
@import '@carbon/type/scss/styles';
@import 'carbon-components/scss/globals/scss/helper-mixins';
@import 'carbon-components/scss/globals/scss/layout';
@import 'carbon-components/scss/globals/scss/motion';

@import '../../globals/motion/index';
@import '../../globals/rtl/index';

@mixin nav {
$nav__heading: '#{&}__heading';
Expand Down
1 change: 1 addition & 0 deletions src/components/ProfileImage/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
////

@import '../Component/mixins';

@import 'mixins';

@include component($name: profile-image) {
Expand Down
4 changes: 3 additions & 1 deletion src/components/ProfileImage/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
/// @copyright IBM Security 2019
////

@import '../../globals/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/themes/scss/tokens';
@import '@carbon/type/scss/styles';

@mixin profile-image {
@include carbon--type-style($name: body-short-01);
Expand Down
1 change: 1 addition & 0 deletions src/components/Shell/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/// @copyright IBM Security 2019
////

@import '../Breadcrumb/index';
@import '../Button/index';
@import '../Header/index';
@import '../Link/index';
Expand Down
9 changes: 8 additions & 1 deletion src/components/Shell/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
/// @copyright IBM Security 2019
////

@import '../../globals/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/layout/scss/spacing';
@import '@carbon/themes/scss/tokens';
@import '@carbon/type/scss/styles';
@import 'carbon-components/scss/globals/scss/helper-mixins';
@import 'carbon-components/scss/globals/scss/layout';

@import '../../globals/motion/index';

@import '../Header/mixins';
@import '../Toolbar/mixins';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Toolbar/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////
/// Toolbar component.
/// @group toolbar
/// @copyright IBM Security 2018
/// @copyright IBM Security 2019
////

@import '../IconButton/index';
Expand Down
11 changes: 9 additions & 2 deletions src/components/Toolbar/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
/// @copyright IBM Security 2019
////

@import '../../globals/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/layout/scss/spacing';
@import '@carbon/themes/scss/tokens';
@import 'carbon-components/scss/globals/scss/layout';

@import '../../globals/motion/index';
@import '../../globals/namespace/index';
@import '../../globals/rtl/index';

@import '../../platform/body/mixins';
@import '../Header/mixins';
@import '../Header/variables';
SimonFinney marked this conversation as resolved.
Show resolved Hide resolved

/// Name.
/// @type String
Expand Down
8 changes: 7 additions & 1 deletion src/components/Tooltip/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
/// @copyright IBM Security 2019
////

@import '../../globals/index';
@import '@carbon/layout/scss/mini-unit';
@import '@carbon/layout/scss/spacing';
@import '@carbon/themes/scss/tokens';
@import '@carbon/type/scss/styles';

@import '../../globals/motion/index';
@import '../../globals/rtl/index';

@import '../Toolbar/mixins';

Expand Down
6 changes: 3 additions & 3 deletions src/components/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
////

// Application.
@import 'Breadcrumb/index';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were just missing from the component stylesheet? Guessing they were being brought in by other components?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had it further below, but I rearranged it to the top

@import 'Card/index';
@import 'DataDecorator/index';
@import 'DataTable/index';
Expand All @@ -16,10 +17,12 @@
@import 'IconButtonBar/index';
@import 'IconButton/index';
@import 'InlineLoading/index';
@import 'Nav/index';
@import 'NonEntitledSection/index';
@import 'Notification/index';
@import 'Panel/index';
@import 'Pill/index';
@import 'ProfileImage/index';
@import 'ProgressIndicator/index';
@import 'ScrollGradient/index';
@import 'Search/index';
Expand All @@ -39,14 +42,11 @@

// Platform.
@import 'Header/index';
@import 'Nav/index';
@import 'ProfileImage/index';
@import 'Shell/index';

/// Carbon proxy.
@import 'Accordion/index';
@import 'Button/index';
@import 'Breadcrumb/index';
@import 'Checkbox/index';
@import 'CodeSnippet/index';
@import 'ComboBox/index';
Expand Down
Loading