-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ui: CSS Upgrade (action-group,form-elements,sliding-toggle,breadcrumbs)
This includes an update of our CSS npm module. The majority of this is just moving files from one folder to another. 1. %breadrumbs: As well as moving we've added 'milestone' breadcrumbs 2. %checkbox-group: Moved 3. %radio-group: Moved 4. %sliding-toggle: Moved (used to be called just %toggle) 5. %form-elements: Moved and added a new %inline-alert for form field messaging (see Structure design system) 6. %action-group is now a composition of %menu-panel, %toggle-button, plus edits to existing style to bring the %action-groups inline with the dropdowns from Structure). %action-group also includes a composed %confirmation-alert that is yet to be include. This will be compiled out until we integrate it. We've also removed some of our old icon placeholders as the above work seased to use some of them. Now we done this I'd say all in all over half of our CSS components now use the CSS npm module. The CSS specific to Consul UI also uses much of this CSS module by way of helper placeholders such as our %frames.
- Loading branch information
John Cowen
committed
Nov 19, 2019
1 parent
4e183a7
commit d377121
Showing
41 changed files
with
629 additions
and
140 deletions.
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 |
---|---|---|
@@ -1,7 +1,18 @@ | ||
@import '../toggle-button/index'; | ||
@import '../menu-panel/index'; | ||
@import '../confirmation-alert/index'; | ||
@import './skin'; | ||
@import './layout'; | ||
|
||
%action-group label:first-of-type { | ||
%action-group > div { | ||
@extend %menu-panel; | ||
} | ||
%action-group > label:first-of-type { | ||
@extend %toggle-button; | ||
} | ||
%action-group .confirmation-alert { | ||
@extend %confirmation-alert; | ||
} | ||
%action-group .type-delete { | ||
@extend %internal-button-dangerous; | ||
} |
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
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
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
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,2 @@ | ||
@import './skin'; | ||
@import './layout'; |
14 changes: 14 additions & 0 deletions
14
ui-v2/app/styles/base/components/checkbox-group/layout.scss
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,14 @@ | ||
/* TODO: This is positioning the group */ | ||
/* probably should be in a special %form class*/ | ||
%checkbox-group { | ||
@extend %form-row; | ||
} | ||
%checkbox-group span { | ||
display: inline-block; | ||
margin-left: 10px; | ||
min-width: 50px; | ||
} | ||
%checkbox-group label { | ||
margin-right: 10px; | ||
white-space: nowrap; | ||
} |
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,3 @@ | ||
%checkbox-group label { | ||
cursor: pointer; | ||
} |
6 changes: 6 additions & 0 deletions
6
ui-v2/app/styles/base/components/confirmation-alert/index.scss
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,6 @@ | ||
@import './skin'; | ||
@import './layout'; | ||
|
||
%confirmation-alert > ul > li > * { | ||
@extend %internal-button; | ||
} |
14 changes: 14 additions & 0 deletions
14
ui-v2/app/styles/base/components/confirmation-alert/layout.scss
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,14 @@ | ||
%confirmation-alert > div { | ||
padding: 1rem; | ||
} | ||
%confirmation-alert > ul { | ||
display: flex; | ||
margin: 0; | ||
padding: 4px; | ||
} | ||
%confirmation-alert > ul > li { | ||
width: 50%; | ||
} | ||
%confirmation-alert > ul > li > * { | ||
width: 100%; | ||
} |
26 changes: 26 additions & 0 deletions
26
ui-v2/app/styles/base/components/confirmation-alert/skin.scss
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,26 @@ | ||
%confirmation-alert { | ||
background-color: $white; | ||
} | ||
|
||
%confirmation-alert > div { | ||
background-color: $yellow-050; | ||
border-top-left-radius: $decor-radius-200; | ||
border-top-right-radius: $decor-radius-200; | ||
} | ||
%confirmation-alert > ul { | ||
list-style: none; | ||
} | ||
%confirmation-alert > ul > li > * { | ||
cursor: pointer; | ||
} | ||
%confirmation-alert > ul > li > *:hover, | ||
%confirmation-alert > ul > li > *:focus { | ||
background-color: $gray-100; | ||
} | ||
%confirmation-alert > ul > .dangerous > * { | ||
@extend %frame-red-300; | ||
} | ||
%confirmation-alert > ul > .dangerous > *:hover, | ||
%confirmation-alert > ul > .dangerous > *:focus { | ||
@extend %frame-red-700; | ||
} |
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,27 @@ | ||
@import './skin'; | ||
@import './layout'; | ||
/* TODO: This is positioning the element */ | ||
/* probably should be in a special %form class*/ | ||
%form-element { | ||
@extend %form-row; | ||
} | ||
%form-element > span { | ||
@extend %form-element-label; | ||
} | ||
%form-element > em { | ||
@extend %form-element-note; | ||
} | ||
%form-element-error > strong { | ||
@extend %inline-alert-error; | ||
} | ||
%form-element [type='text'], | ||
%form-element [type='password'], | ||
%form-element textarea { | ||
@extend %form-element-text-input; | ||
} | ||
%form-element-text-input:hover { | ||
@extend %form-element-text-input-hover; | ||
} | ||
%form-element-text-input:focus { | ||
@extend %form-element-text-input-focus; | ||
} |
Oops, something went wrong.