-
-
Notifications
You must be signed in to change notification settings - Fork 215
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7773 from qmonmert/tikui/ModulesPatch
Refactoring: ModulesPatch.vue
- Loading branch information
Showing
12 changed files
with
185 additions
and
120 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
126 changes: 126 additions & 0 deletions
126
src/main/style/organism/modules-patch/_modules-patch.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,126 @@ | ||
| $jhlite-modules-patch-line-color: $jhlite-global-line-color; | ||
| $jhlite-modules-patch-box-radius: $jhlite-global-box-radius; | ||
| $jhlite-modules-patch-primary-color: $jhlite-global-primary-color; | ||
| $jhlite-modules-patch-line-color: $jhlite-global-line-color; | ||
| $jhlite-modules-patch-applied-module-color: $jhlite-global-applied-module-color; | ||
| $jhlite-modules-patch-primary-color: $jhlite-global-primary-color; | ||
| $jhlite-modules-patch-line-color: $jhlite-global-line-color; | ||
| $jhlite-modules-patch-primary-input-color: $jhlite-global-primary-input-color; | ||
| $jhlite-modules-patch-disabled-color: $jhlite-global-disabled-color; | ||
|
|
||
| .jhipster-modules-patch { | ||
| color: var(--jhlite-global-color-text); | ||
|
|
||
| .jhipster-modules-list { | ||
| display: flex; | ||
| flex-direction: column; | ||
| flex-grow: 1; | ||
|
|
||
| &--categories { | ||
| flex-grow: 1; | ||
| padding: 0 15px; | ||
| overflow-y: auto; | ||
| } | ||
| } | ||
|
|
||
| .jhipster-modules-filters { | ||
| display: flex; | ||
| align-items: center; | ||
| margin: 15px 0; | ||
| padding: 0 15px; | ||
| height: 40px; | ||
|
|
||
| &--tags { | ||
| margin-right: 10px; | ||
| } | ||
|
|
||
| &--filter { | ||
| flex-grow: 1; | ||
| border: 1px solid $jhlite-modules-patch-line-color; | ||
| border-radius: $jhlite-modules-patch-box-radius; | ||
| padding: 0 10px; | ||
| font-size: 1.4em; | ||
| } | ||
|
|
||
| &--displayed-modules-count { | ||
| margin-left: 15px; | ||
| border-radius: 1em; | ||
| background-color: $jhlite-modules-patch-primary-color; | ||
| padding: 3px 1em; | ||
| color: #fff; | ||
| } | ||
| } | ||
|
|
||
| .jhipster-module-category { | ||
| &--name { | ||
| font-size: 1.4em; | ||
| font-weight: 800; | ||
| } | ||
| } | ||
|
|
||
| .jhipster-module { | ||
| display: flex; | ||
| margin-bottom: 10px; | ||
| border: 1px solid $jhlite-modules-patch-line-color; | ||
| border-radius: $jhlite-modules-patch-box-radius; | ||
|
|
||
| &.selected { | ||
| background-color: $jhlite-modules-patch-primary-color; | ||
| color: var(--jhlite-white); | ||
| } | ||
|
|
||
| &--content { | ||
| flex-grow: 1; | ||
| cursor: pointer; | ||
| padding: 5px 10px; | ||
| } | ||
|
|
||
| &--content.not-selected { | ||
| display: flex; | ||
| } | ||
|
|
||
| &--content.applied { | ||
| background-color: $jhlite-modules-patch-applied-module-color; | ||
| } | ||
|
|
||
| &--tags.not-selected, | ||
| &--description.not-selected { | ||
| display: none; | ||
| } | ||
|
|
||
| &--tags.selected { | ||
| display: flex; | ||
| margin: 5px 0; | ||
| } | ||
|
|
||
| &--description.selected { | ||
| display: block; | ||
| } | ||
|
|
||
| &--tag { | ||
| margin-right: 7px; | ||
| border-radius: 1em; | ||
| background-color: $jhlite-modules-patch-primary-color; | ||
| padding: 0 0.5em; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| &--slug { | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| &--apply-button { | ||
| border: 0; | ||
| border-left: 1px solid $jhlite-modules-patch-line-color; | ||
| background-color: transparent; | ||
| padding: 0 10px; | ||
| color: $jhlite-modules-patch-primary-input-color; | ||
| font-size: 1.5em; | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| &--apply-button:disabled { | ||
| color: $jhlite-modules-patch-disabled-color; | ||
| } | ||
| } | ||
| } |
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 @@ | ||
| include modules-patch.mixin.pug | ||
|
|
||
| +jhlite-modules-patch |
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 @@ | ||
| ## Modules patch |
38 changes: 38 additions & 0 deletions
38
src/main/style/organism/modules-patch/modules-patch.mixin.pug
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,38 @@ | ||
| include /molecule/tag-filter/tag-filter.mixin.pug | ||
| include /organism/module-parameters/module-parameters.mixin.pug | ||
| include /organism/module-properties/module-properties.mixin.pug | ||
|
|
||
| mixin jhlite-modules-patch | ||
| .jhipster-modules-patch.jhlite-menu-content-template | ||
| .jhipster-modules-list.jhlite-menu-content-template--content | ||
| .jhipster-modules-filters | ||
| .jhipster-modules-filters--tags | ||
| +jhlite-tag-filter | ||
| +jhlite-tag-filter | ||
| +jhlite-tag-filter | ||
| input.jhipster-modules-filters--filter(placeholder='Filter') | ||
| .jhipster-modules-filters--displayed-modules-count 3 / 5 | ||
|
|
||
| .jhipster-modules-list--categories | ||
| div | ||
| div | ||
| h2.jhipster-module-category--name Angular | ||
| .jhipster-module.not-selected.not-applied | ||
| .jhipster-module--content.not-selected.not-applied | ||
| .jhipster-module--tags.not-selected.not-applied | ||
| .jhipster-module--tag angular | ||
| .jhipster-module--tag client | ||
| .jhipster-module--slug.not-selected.not-applied angular-core | ||
| .jhipster-module--description.not-selected.not-applied Add Angular + Angular CLI | ||
| +jhlite-module-parameters('selected', 'all-valid-parameters') | ||
| button.jhipster-module--apply-button | ||
| span | ||
| // TODO: IconVue | ||
| em.jhlite-icon.jhlite-icon-play | ||
|
|
||
| aside.jhlite-menu-content-template--menu | ||
| .jhlite-side-menu | ||
| .jhlite-side-menu--slot.-expand | ||
| +jhlite-module-properties | ||
| .jhlite-side-menu--slot | ||
| // TODO: ProjectActionsVue |
4 changes: 4 additions & 0 deletions
4
src/main/style/organism/modules-patch/modules-patch.render.pug
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,4 @@ | ||
| extends /layout | ||
|
|
||
| block body | ||
| include modules-patch.code.pug |
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 |
|---|---|---|
|
|
@@ -3,3 +3,4 @@ | |
| @import 'colors'; | ||
| @import 'breakpoint'; | ||
| @import 'animation'; | ||
| @import 'custom'; | ||
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,5 @@ | ||
| // TODO: duplicate properties from src/main/webapp/content/css/custom.css | ||
|
|
||
| button:not(:last-child) { | ||
| margin-right: 0.75rem; | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/webapp/app/module/primary/modules-patch/ModulesPatch.html
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
119 changes: 0 additions & 119 deletions
119
src/main/webapp/app/module/primary/modules-patch/ModulesPatch.vue
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,122 +1,3 @@ | ||
| <template src="./ModulesPatch.html"></template> | ||
|
|
||
| <script lang="ts" src="./ModulesPatch.component.ts"></script> | ||
|
|
||
| <style lang="scss"> | ||
| .jhipster-modules { | ||
| color: var(--jhlite-global-color-text); | ||
| } | ||
| .jhipster-modules-list { | ||
| flex-grow: 1; | ||
| display: flex; | ||
| flex-direction: column; | ||
| &--categories { | ||
| overflow-y: auto; | ||
| flex-grow: 1; | ||
| padding: 0 15px; | ||
| } | ||
| } | ||
| .jhipster-modules-filters { | ||
| margin: 15px 0; | ||
| padding: 0 15px; | ||
| height: 40px; | ||
| display: flex; | ||
| align-items: center; | ||
| &--tags { | ||
| margin-right: 10px; | ||
| } | ||
| &--filter { | ||
| font-size: 1.4em; | ||
| border: 1px solid $jhipster-lite-line-color; | ||
| border-radius: $jhipster-lite-box-radius; | ||
| padding: 0 10px; | ||
| flex-grow: 1; | ||
| } | ||
| &--displayed-modules-count { | ||
| margin-left: 15px; | ||
| background-color: $jhipster-lite-primary-color; | ||
| padding: 3px 1em; | ||
| border-radius: 1em; | ||
| color: #ffffff; | ||
| } | ||
| } | ||
| .jhipster-module-category { | ||
| &--name { | ||
| font-size: 1.4em; | ||
| font-weight: 800; | ||
| } | ||
| } | ||
| .jhipster-module { | ||
| border: 1px solid $jhipster-lite-line-color; | ||
| border-radius: $jhipster-lite-box-radius; | ||
| margin-bottom: 10px; | ||
| display: flex; | ||
| &.selected { | ||
| background-color: $jhipster-lite-primary-color; | ||
| color: var(--jhlite-white); | ||
| } | ||
| &--content { | ||
| cursor: pointer; | ||
| flex-grow: 1; | ||
| padding: 5px 10px; | ||
| } | ||
| &--content.not-selected { | ||
| display: flex; | ||
| } | ||
| &--content.applied { | ||
| background-color: $jhipster-lite-applied-module-color; | ||
| } | ||
| &--tags.not-selected, | ||
| &--description.not-selected { | ||
| display: none; | ||
| } | ||
| &--tags.selected { | ||
| display: flex; | ||
| margin: 5px 0; | ||
| } | ||
| &--description.selected { | ||
| display: block; | ||
| } | ||
| &--tag { | ||
| background-color: $jhipster-lite-secondary-color; | ||
| font-style: italic; | ||
| margin-right: 7px; | ||
| padding: 0 0.5em; | ||
| border-radius: 1em; | ||
| } | ||
| &--slug { | ||
| font-weight: bold; | ||
| } | ||
| &--apply-button { | ||
| background-color: transparent; | ||
| border: 0; | ||
| border-left: 1px solid $jhipster-lite-line-color; | ||
| padding: 0 10px; | ||
| color: $jhipster-lite-primary-input-color; | ||
| font-weight: bold; | ||
| font-size: 1.5em; | ||
| } | ||
| &--apply-button:disabled { | ||
| color: $jhipster-lite-disabled-color; | ||
| } | ||
| } | ||
| </style> |