Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
avoid Inventory page components scss overriding other pages (#496)
* avoid Inventory page components scss overriding other pages * Fixes in InventoryModal & tabHeader
- Loading branch information
Showing
19 changed files
with
153 additions
and
127 deletions.
There are no files selected for viewing
10 changes: 6 additions & 4 deletions
10
...k/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/emptyResults.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 |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| .blank-slate-pf { | ||
| margin-top: 100px; | ||
| .rh-cloud-inventory-page { | ||
| .blank-slate-pf { | ||
| margin-top: 100px; | ||
|
|
||
| .no_results_icon { | ||
| margin-right: 5px; | ||
| .no_results_icon { | ||
| margin-right: 5px; | ||
| } | ||
| } | ||
| } |
10 changes: 6 additions & 4 deletions
10
webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/emptyState.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 |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| .blank-slate-pf { | ||
| margin-top: 100px; | ||
| .rh-cloud-inventory-page { | ||
| .blank-slate-pf { | ||
| margin-top: 100px; | ||
|
|
||
| .spinner { | ||
| float: none; | ||
| .spinner { | ||
| float: none; | ||
| } | ||
| } | ||
| } |
26 changes: 14 additions & 12 deletions
26
webpack/ForemanInventoryUpload/Components/AccountList/Components/ErrorState/errorState.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 |
|---|---|---|
| @@ -1,18 +1,20 @@ | ||
| $error_color: #d10d0d; | ||
|
|
||
| .error_state { | ||
| margin-top: 100px; | ||
| text-align: center; | ||
| font-weight: bold; | ||
| font-size: 16px; | ||
| .rh-cloud-inventory-page { | ||
| .error_state { | ||
| margin-top: 100px; | ||
| text-align: center; | ||
| font-weight: bold; | ||
| font-size: 16px; | ||
|
|
||
| .error_icon { | ||
| color: $error_color; | ||
| margin-right: 15px; | ||
| margin-bottom: 10px; | ||
| } | ||
| .error_icon { | ||
| color: $error_color; | ||
| margin-right: 15px; | ||
| margin-bottom: 10px; | ||
| } | ||
|
|
||
| .error_description { | ||
| color: $error_color; | ||
| .error_description { | ||
| color: $error_color; | ||
| } | ||
| } | ||
| } |
46 changes: 24 additions & 22 deletions
46
webpack/ForemanInventoryUpload/Components/AccountList/accountList.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 |
|---|---|---|
| @@ -1,32 +1,34 @@ | ||
| .account-list { | ||
| .pf-c-accordion__toggle { | ||
| margin-top: 10px; | ||
| } | ||
| .rh-cloud-inventory-page { | ||
| .account-list { | ||
| .pf-c-accordion__toggle { | ||
| margin-top: 10px; | ||
| } | ||
|
|
||
| .pf-c-accordion__toggle-text { | ||
| font-size: 16px; | ||
| display: flex; | ||
| justify-content: space-between; | ||
| width: 100%; | ||
| .pf-c-accordion__toggle-text { | ||
| font-size: 16px; | ||
| display: flex; | ||
| justify-content: space-between; | ||
| width: 100%; | ||
|
|
||
| .account-icon { | ||
| margin-right: 5px; | ||
| .account-icon { | ||
| margin-right: 5px; | ||
|
|
||
| .pf-c-label__icon { | ||
| margin: 0; | ||
| .pf-c-label__icon { | ||
| margin: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| span { | ||
| align-self: center; | ||
| } | ||
| span { | ||
| align-self: center; | ||
| } | ||
|
|
||
| .status { | ||
| margin: 0; | ||
| .status { | ||
| margin: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .list-item-status > span { | ||
| margin-left: 7px; | ||
| .list-item-status > span { | ||
| margin-left: 7px; | ||
| } | ||
| } | ||
| } |
6 changes: 4 additions & 2 deletions
6
webpack/ForemanInventoryUpload/Components/FileDownload/fileDownload.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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| button { | ||
| float: right; | ||
| .rh-cloud-inventory-page { | ||
| button { | ||
| float: right; | ||
| } | ||
| } |
30 changes: 16 additions & 14 deletions
30
webpack/ForemanInventoryUpload/Components/FullScreenModal/fullScreenModal.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
12 changes: 7 additions & 5 deletions
12
webpack/ForemanInventoryUpload/Components/NavContainer/navContainer.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 |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| .dashboard { | ||
| .nav_item { | ||
| font-size: 12px; | ||
| text-align: center; | ||
| width: 130px; | ||
| .rh-cloud-inventory-page { | ||
| .dashboard { | ||
| .nav_item { | ||
| font-size: 12px; | ||
| text-align: center; | ||
| width: 130px; | ||
| } | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| .rh-cloud-page { | ||
| .rh-cloud-inventory-page { | ||
| .inventory-upload-header { | ||
| .settings-alert { | ||
| margin-bottom: 30px; | ||
|
|
||
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
2 changes: 1 addition & 1 deletion
2
.../ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/modal.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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #sync_modal { | ||
| #inventory-sync-modal { | ||
| height: 300px; | ||
| margin: auto; | ||
| overflow: hidden; | ||
|
|
||
14 changes: 8 additions & 6 deletions
14
webpack/ForemanInventoryUpload/Components/ScheduledRun/scheduledRun.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 |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| .scheduled_run { | ||
| font-size: 14px; | ||
| .rh-cloud-inventory-page { | ||
| .scheduled_run { | ||
| font-size: 14px; | ||
|
|
||
| p { | ||
| margin: 0 0 -10px 0; | ||
| p { | ||
| margin: 0 0 -10px 0; | ||
|
|
||
| .fa { | ||
| margin-right: 5px; | ||
| .fa { | ||
| margin-right: 5px; | ||
| } | ||
| } | ||
| } | ||
| } |
16 changes: 9 additions & 7 deletions
16
webpack/ForemanInventoryUpload/Components/StatusChart/statusChart.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 |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| .status-chart { | ||
| display: flex; | ||
| align-items: center; | ||
| -webkit-justify-content: center; | ||
| justify-content: center; | ||
| margin: 10%; | ||
| padding: 5%; | ||
| .rh-cloud-inventory-page { | ||
| .status-chart { | ||
| display: flex; | ||
| align-items: center; | ||
| -webkit-justify-content: center; | ||
| justify-content: center; | ||
| margin: 10%; | ||
| padding: 5%; | ||
| } | ||
| } |
6 changes: 4 additions & 2 deletions
6
webpack/ForemanInventoryUpload/Components/TabBody/tabBody.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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| .tab_body { | ||
| margin-bottom: 0; | ||
| .rh-cloud-inventory-page { | ||
| .tab_body { | ||
| margin-bottom: 0; | ||
| } | ||
| } |
12 changes: 7 additions & 5 deletions
12
webpack/ForemanInventoryUpload/Components/TabContainer/tabContainer.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 |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| .dashboard .tab-content { | ||
| padding: 20px; | ||
| min-height: 0; | ||
| .rh-cloud-inventory-page { | ||
| .dashboard .tab-content { | ||
| padding: 20px; | ||
| min-height: 0; | ||
|
|
||
| .row { | ||
| margin-bottom: 20px; | ||
| .row { | ||
| margin-bottom: 20px; | ||
| } | ||
| } | ||
| } |
28 changes: 15 additions & 13 deletions
28
webpack/ForemanInventoryUpload/Components/TabHeader/tabHeader.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
52 changes: 27 additions & 25 deletions
52
webpack/ForemanInventoryUpload/Components/Terminal/terminal.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 |
|---|---|---|
| @@ -1,32 +1,34 @@ | ||
| .terminal { | ||
| height: 200px; | ||
| background-color: #222; | ||
| padding: 10px 0; | ||
| margin-bottom: 20px; | ||
| overflow-y: scroll; | ||
| overflow-x: hidden; | ||
| .rh-cloud-inventory-page { | ||
| .terminal { | ||
| height: 200px; | ||
| background-color: #222; | ||
| padding: 10px 0; | ||
| margin-bottom: 20px; | ||
| overflow-y: scroll; | ||
| overflow-x: hidden; | ||
|
|
||
| p { | ||
| font-family: monospace; | ||
| font-size: 16px; | ||
| color: #22da26; | ||
| overflow-wrap: anywhere; | ||
| p { | ||
| font-family: monospace; | ||
| font-size: 16px; | ||
| color: #22da26; | ||
| overflow-wrap: anywhere; | ||
|
|
||
| &.terminal_error { | ||
| color: #f00; | ||
| &.terminal_error { | ||
| color: #f00; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &::-webkit-scrollbar { | ||
| width: 12px; | ||
| height: 12px; | ||
| background: #aaa; | ||
| } | ||
| &::-webkit-scrollbar { | ||
| width: 12px; | ||
| height: 12px; | ||
| background: #aaa; | ||
| } | ||
|
|
||
| &::-webkit-scrollbar-thumb { | ||
| background: #222; | ||
| border-radius: 6px; | ||
| border: 3px solid transparent; | ||
| background-clip: content-box; | ||
| &::-webkit-scrollbar-thumb { | ||
| background: #222; | ||
| border-radius: 6px; | ||
| border: 3px solid transparent; | ||
| background-clip: content-box; | ||
| } | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| .rh-cloud-page { | ||
| .rh-cloud-inventory-page { | ||
| label.foreman-switcher { | ||
| font-weight: 400; | ||
| margin-bottom: 5px; | ||
|
|
||