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.

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

feat(leaving-ibm): v2 style updates #10941

Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bba634d
feat(leaving-ibm): style issue fix
sangeethababu9223 Sep 8, 2023
b13d42e
Merge remote-tracking branch 'upstream/feat/carbon-for-ibm-dotcom-v2'…
sangeethababu9223 Sep 14, 2023
adb34c4
feat(leaving-ibm): update to v2
sangeethababu9223 Sep 14, 2023
bcb81a4
feat(leaving-ibm): update to v2
sangeethababu9223 Sep 14, 2023
b399ea1
feat(leaving-ibm) : v2 style updates
sangeethababu9223 Sep 15, 2023
2fbc164
Merge remote-tracking branch 'upstream/feat/carbon-for-ibm-dotcom-v2'…
sangeethababu9223 Sep 18, 2023
165e203
feat(leaving-ibm): haedline style fix
sangeethababu9223 Sep 18, 2023
085dda0
feat(leaving-ibm): style fix
sangeethababu9223 Sep 18, 2023
2b9b7ab
Merge remote-tracking branch 'upstream/feat/carbon-for-ibm-dotcom-v2'…
sangeethababu9223 Sep 18, 2023
711d4dd
feat(leaving-ibm): scss lint fix
sangeethababu9223 Sep 18, 2023
136ac94
feat(leaving-ibm): scss fix
sangeethababu9223 Sep 18, 2023
c3916e8
feat(leaving-ibm) fix scss issue
sangeethababu9223 Sep 18, 2023
2ac8447
Merge remote-tracking branch 'upstream/feat/carbon-for-ibm-dotcom-v2'…
sangeethababu9223 Sep 20, 2023
768b522
feat(leaving-ibm): code review update
sangeethababu9223 Sep 20, 2023
65dfa42
Merge remote-tracking branch 'upstream/feat/carbon-for-ibm-dotcom-v2'…
sangeethababu9223 Sep 21, 2023
8bba44f
feat(leaving-ibm): design review fixes
sangeethababu9223 Sep 21, 2023
89043db
feat(leaving-ibm): style format
sangeethababu9223 Sep 21, 2023
cea8245
feat(leaving-ibm): style review fix
sangeethababu9223 Sep 22, 2023
2162678
feat(leaving-ibm): review updates
sangeethababu9223 Sep 25, 2023
e9153ac
feat(leaving-ibm): review updates
sangeethababu9223 Sep 25, 2023
c924e88
Merge branch 'feat/carbon-for-ibm-dotcom-v2' into feat/leaving-ibm-v2
kennylam Sep 26, 2023
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
10 changes: 9 additions & 1 deletion packages/carbon-web-components/src/components/modal/modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@

:host(#{$prefix}-modal[open]) {
@extend .#{$prefix}--modal;
@extend .is-visible;
// @extend .is-visible;
IgnacioBecerra marked this conversation as resolved.
Show resolved Hide resolved
opacity: 1;
transition: opacity $duration-moderate-02 motion(entrance, expressive),
visibility 0ms linear;
visibility: inherit;

@media screen and (prefers-reduced-motion: reduce) {
transition: none;
}
}

:host(#{$prefix}-modal) {
Expand Down
11 changes: 11 additions & 0 deletions packages/styles/scss/components/leaving-ibm/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Copyright IBM Corp. 2018, 2023
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward 'leaving-ibm';
@use 'leaving-ibm';

@include leaving-ibm.leaving-ibm;
56 changes: 56 additions & 0 deletions packages/styles/scss/components/leaving-ibm/_leaving-ibm.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
//
// Copyright IBM Corp. 2020, 2023
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/type' as *;
@use '../../../../carbon-web-components/src/components/modal/modal' as *;
@use '@carbon/ibmdotcom-styles/scss/globals/vars' as *;

@mixin leaving-ibm {
:host(#{$c4d-prefix}-leaving-ibm-composite),
:host(#{$c4d-prefix}-leaving-ibm-container) {
width: 100%;
}

:host(#{$c4d-prefix}-leaving-ibm-modal) {
@extend :host(#{$prefix}-modal);

max-height: 100%;

&[open] {
@extend :host(#{$prefix}-modal[open]);
}
}
IgnacioBecerra marked this conversation as resolved.
Show resolved Hide resolved

:host(#{$c4d-prefix}-leaving-ibm-modal-heading) {
@include type-style('fluid-heading-04', true);
}

:host(#{$c4d-prefix}-leaving-ibm-modal-body) {
@extend :host(#{$prefix}-modal-body);

padding-right: 20%;

::slotted(#{$c4d-prefix}-leaving-ibm-modal-supplemental),
::slotted(slot[name='supplemental']) {
display: block;
margin-top: $spacing-07;
color: $text-secondary;
@include type-style('label-02');
}

> p {
padding-right: 0;
margin: 0;
}
::slotted(:last-child) {
padding-bottom: 0;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ class C4DLeavingIbmComposite extends HostListenerMixin(
>
</c4d-leaving-ibm-modal-body>
<cds-modal-footer>
<cds-btn
<cds-button
data-autoid="${c4dPrefix}--leaving-ibm-cta"
href="${href}"
kind="primary"
>${leavingIbmButtonLabel}</cds-btn
>${leavingIbmButtonLabel}</cds-button
>
</cds-modal-footer>
</c4d-leaving-ibm-modal>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,4 @@
// LICENSE file in the root directory of this source tree.
//

@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/type' as *;
@use '../../../../carbon-web-components/src/components/modal/modal';
@use '@carbon/ibmdotcom-styles/scss/globals/vars' as *;

:host(#{$c4d-prefix}-leaving-ibm-composite),
:host(#{$c4d-prefix}-leaving-ibm-container) {
width: 100%;
}

:host(#{$c4d-prefix}-leaving-ibm-modal) {
// @extend :host(#{$prefix}-modal);
max-height: 100%;

&[open] {
// @extend :host(#{$prefix}-modal[open]);
}
}

:host(#{$c4d-prefix}-leaving-ibm-modal-heading) {
// @include type-style('fluid-heading-04');
}

:host(#{$c4d-prefix}-leaving-ibm-modal-body) {
// @extend :host(#{$prefix}-modal-body);
padding-right: 20%;

::slotted(#{$c4d-prefix}-leaving-ibm-modal-supplemental),
::slotted(slot[name='supplemental']) {
display: block;
margin-top: $spacing-07;
color: $text-secondary;
@include type-style('label-02');
}

> p {
padding-right: 0;
}
}
@use '@carbon/ibmdotcom-styles/scss/components/leaving-ibm';
Loading