-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Ui/replication mgmt action block #9053
Merged
chelshaw
merged 9 commits into
ui/replication-status-discoverability
from
ui/replication-mgmt-action-block
May 21, 2020
+123
−2
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
33c59b9
Add example of new addon component command
chelshaw 8668f62
WIP: Add action-block core addon component + story
chelshaw f53c989
WIP // preliminary styling for action-block
chelshaw fe6dcc2
Remove test div from dr details page
chelshaw fad87bf
Move Modal component to shared addon component in lib/core
chelshaw 88e41c2
Refactor action-block to style only component
chelshaw 5c57fe6
Add warning type to modal
chelshaw 196c7ba
Add tests for new modal types
chelshaw 35c8c97
Fix typos on modal component
chelshaw File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
@mixin stacked-grid { | ||
grid-template-columns: 1fr; | ||
grid-row: 1/1; | ||
} | ||
@mixin stacked-content { | ||
margin-bottom: $spacing-l; | ||
} | ||
|
||
.action-block { | ||
@extend .selectable-card; | ||
grid-template-columns: 2fr 1fr; | ||
display: grid; | ||
padding: $spacing-m $spacing-l; | ||
line-height: inherit; | ||
|
||
@include until($mobile) { | ||
@include stacked-grid(); | ||
} | ||
} | ||
|
||
.action-block-info { | ||
@include until($mobile) { | ||
@include stacked-grid(); | ||
} | ||
} | ||
|
||
.action-block.stacked { | ||
@include stacked-grid(); | ||
} | ||
.stacked > .action-block-info { | ||
@include stacked-content(); | ||
} | ||
|
||
.action-block-title { | ||
font-size: $size-5; | ||
font-weight: $font-weight-bold; | ||
} | ||
.action-block-action { | ||
text-align: right; | ||
@include until($mobile) { | ||
text-align: left; | ||
} | ||
} | ||
|
||
.replication-actions-grid-layout { | ||
display: flex; | ||
flex-wrap: wrap; | ||
} | ||
|
||
.replication-actions-grid-item { | ||
flex-basis: 50%; | ||
padding: 5px; | ||
} | ||
|
||
.replication-actions-grid-item .action-block { | ||
height: 100%; | ||
width: 100%; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,6 +88,8 @@ | |
@import './components/search-select'; | ||
@import './components/selectable-card'; | ||
@import './components/selectable-card-container.scss'; | ||
// action-block extends selectable-card | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. helpful comment, thank you! |
||
@import './components/action-block.scss'; | ||
@import './components/shamir-progress'; | ||
@import './components/sidebar'; | ||
@import './components/splash-page'; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 13 additions & 2 deletions
15
ui/app/templates/components/modal.hbs → ...core/addon/templates/components/modal.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,20 @@ | ||
{{#ember-wormhole to="modal-wormhole"}} | ||
<div class="modal {{if isActive 'is-active'}}" aria-modal="true"> | ||
<div class="{{modalClass}} {{if isActive 'is-active'}}" aria-modal="true"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nice! |
||
<div class="modal-background" onclick={{onClose}} data-test-modal-background></div> | ||
<div class="modal-card"> | ||
<header class="modal-card-head"> | ||
<h2 class="modal-card-title title is-5" data-test-modal-title>{{title}}</h2> | ||
<h2 class="modal-card-title title is-5" data-test-modal-title> | ||
{{#if glyph}} | ||
<Icon | ||
@size="l" | ||
class="{{glyph.glyphClass}}" | ||
aria-hidden="true" | ||
@glyph={{glyph.glyph}} | ||
data-test-modal-glyph={{glyph.glyph}} | ||
/> | ||
{{/if}} | ||
{{title}} | ||
</h2> | ||
{{#if showCloseButton}} | ||
<button class="delete" aria-label="close" onclick={{onClose}} data-test-modal-close-button></button> | ||
{{/if}} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { default } from 'core/components/modal'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice use of mixins!