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

Add spacing for children of header and footer dialog elements #288

Merged
merged 3 commits into from
Aug 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 16 additions & 20 deletions docs/_packages/dialog.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ usage:

{% include demo_open.html %}
<div class="dialog">
<button class="dialog__close icon-action icon-action_color_fade">
<button class="dialog__close icon-action">
{% include icon.html icon="x" %}
</button>
<div class="dialog__body">
Expand All @@ -41,7 +41,7 @@ usage:
{% include demo_switch.html %}
```html
<div class="dialog">
<button class="dialog__close icon-action icon-action_color_fade">
<button class="dialog__close icon-action">
<svg role="img" class="icon">
<use xlink:href="#x"></use>
</svg>
Expand All @@ -57,7 +57,7 @@ usage:

{% include demo_open.html %}
<div class="dialog">
<button class="dialog__close icon-action icon-action_color_fade">
<button class="dialog__close icon-action">
{% include icon.html icon="x" %}
</button>
<div class="dialog__body spacing">
Expand All @@ -68,10 +68,12 @@ usage:
{% include demo_switch.html %}
```html
<div class="dialog">
<button class="dialog__close">...</button>
<button class="dialog__close">
...
</button>
<div class="dialog__body">
<h2 class="dialog__title">...</h2>
...
<p>...</p>
</div>
</div>
```
Expand All @@ -83,18 +85,16 @@ usage:
<div class="dialog">
<div class="dialog__header">
<h2 class="dialog__title">Dialog Title</h2>
<button class="dialog__close icon-action icon-action_color_fade">
<button class="dialog__close icon-action">
{% include icon.html icon="x" %}
</button>
</div>
<div class="dialog__body">
<p>This is some dialog content...</p>
</div>
<div class="dialog__footer">
<div class="button-group">
<button class="button button_color_primary">Accept</button>
<button class="button">Cancel</button>
</div>
<button class="button button_color_primary">Accept</button>
<button class="button">Cancel</button>
</div>
</div>
{% include demo_switch.html %}
Expand Down Expand Up @@ -124,13 +124,13 @@ The dialog is a very flexible component and can be used in many different contex
<div class="dialog__header">
<h2 class="dialog__title">New Message</h2>
<div class="dialog__group">
<button class="dialog__group-item icon-action icon-action_color_fade">
<button class="dialog__group-item icon-action">
{% include icon.html icon="minus" %}
</button>
<button class="dialog__group-item icon-action icon-action_color_fade">
<button class="dialog__group-item icon-action">
{% include icon.html icon="maximize-2" %}
</button>
<button class="dialog__group-item dialog__close icon-action icon-action_color_fade">
<button class="dialog__group-item dialog__close icon-action">
{% include icon.html icon="x" %}
</button>
</div>
Expand Down Expand Up @@ -193,10 +193,8 @@ The dialog is a very flexible component and can be used in many different contex
<p>You wrote "I have attached" in your message, but there are no files attached. Send anyway?</p>
</div>
<div class="dialog__footer flex-justify-end">
<div class="button-group">
<button class="button">Cancel</button>
<button class="button button_color_primary">Send</button>
</div>
<button class="button">Cancel</button>
<button class="button button_color_primary">Send</button>
</div>
</div>
{% include demo_switch.html %}
Expand All @@ -206,9 +204,7 @@ The dialog is a very flexible component and can be used in many different contex
...
</div>
<div class="dialog__footer flex-justify-end">
<div class="button-group">
...
</div>
...
</div>
</div>
```
Expand Down
8 changes: 6 additions & 2 deletions docs/dist/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/dist/styles.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/styles.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/styles.min.css.map

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions packages/dialog/dist/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/dialog/dist/styles.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/dialog/dist/styles.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/dialog/dist/styles.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions packages/dialog/src/_dialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ $_e: var.$prefix-element;
align-items: center;
background: var.$background;
vertical-align: middle;

> * + * {
margin-left: var.$spacing;
}
}

.#{$_b}dialog#{$_e}header {
Expand Down Expand Up @@ -61,8 +65,8 @@ $_e: var.$prefix-element;

.#{$_b}dialog > .#{$_b}dialog#{$_e}close {
position: absolute;
top: 1rem;
right: 1rem;
top: var.$padding;
right: var.$padding;

+ .#{$_b}dialog#{$_e}body {
padding-right: 3.5em;
Expand Down
1 change: 1 addition & 0 deletions packages/dialog/src/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $prefix-modifier-value: core.$prefix-modifier-value !default;

$zindex: 500 !default;
$padding: 1em !default;
$spacing: 0.5em !default;
$background: core.$white !default;
$border: null !default;
$sep-border: core.$border !default;
Expand Down
8 changes: 6 additions & 2 deletions packages/vrembem/dist/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/vrembem/dist/styles.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/vrembem/dist/styles.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/vrembem/dist/styles.min.css.map

Large diffs are not rendered by default.