diff --git a/app/styles/dependencies/forms.scss b/app/styles/dependencies/forms.scss index 80db22a7..67a1f6fe 100644 --- a/app/styles/dependencies/forms.scss +++ b/app/styles/dependencies/forms.scss @@ -36,7 +36,7 @@ textarea { .checksley-error-list { margin-bottom: 0; li { - color: $white; + color: $red; padding: .2rem; } } diff --git a/app/styles/main.scss b/app/styles/main.scss index 76db945e..3f0fc9f4 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -51,14 +51,9 @@ $prefix-for-spec: true; @import 'modules/issues-table'; @import 'modules/list-filters'; @import 'modules/filter-tags'; -@import 'modules/admin-menu'; -@import 'modules/admin-submenu'; -@import 'modules/admin-roles'; -@import 'modules/admin-functionalities'; -@import 'modules/admin-membership-table'; + @import 'modules/colors-table'; @import 'modules/category-config'; -@import 'modules/project-details'; @import 'modules/attachments'; @import 'modules/comments'; @import 'modules/comment-activity'; @@ -71,6 +66,12 @@ $prefix-for-spec: true; @import 'modules/change-password-from-recovery'; //modules admin +@import 'modules/admin/admin-menu'; +@import 'modules/admin/admin-submenu'; +@import 'modules/admin/admin-roles'; +@import 'modules/admin/admin-functionalities'; +@import 'modules/admin/admin-membership-table'; +@import 'modules/admin/admin-project-profile'; @import 'modules/admin/default-values'; @import 'modules/admin/project-values'; diff --git a/app/styles/modules/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss similarity index 100% rename from app/styles/modules/admin-functionalities.scss rename to app/styles/modules/admin/admin-functionalities.scss diff --git a/app/styles/modules/admin-membership-table.scss b/app/styles/modules/admin/admin-membership-table.scss similarity index 100% rename from app/styles/modules/admin-membership-table.scss rename to app/styles/modules/admin/admin-membership-table.scss diff --git a/app/styles/modules/admin-menu.scss b/app/styles/modules/admin/admin-menu.scss similarity index 100% rename from app/styles/modules/admin-menu.scss rename to app/styles/modules/admin/admin-menu.scss diff --git a/app/styles/modules/project-details.scss b/app/styles/modules/admin/admin-project-profile.scss similarity index 100% rename from app/styles/modules/project-details.scss rename to app/styles/modules/admin/admin-project-profile.scss diff --git a/app/styles/modules/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss similarity index 100% rename from app/styles/modules/admin-roles.scss rename to app/styles/modules/admin/admin-roles.scss diff --git a/app/styles/modules/admin-submenu.scss b/app/styles/modules/admin/admin-submenu.scss similarity index 100% rename from app/styles/modules/admin-submenu.scss rename to app/styles/modules/admin/admin-submenu.scss diff --git a/app/styles/modules/admin/project-values.scss b/app/styles/modules/admin/project-values.scss index 06e8c917..a2feb997 100644 --- a/app/styles/modules/admin/project-values.scss +++ b/app/styles/modules/admin/project-values.scss @@ -2,9 +2,9 @@ @include table-flex(stretch, center, flex, row, wrap, center); border-bottom: 1px solid $whitish; &:hover { - cursor: move; @include transition (background .2s ease-in); background: lighten($green-taiga, 60%); + cursor: move; .icon { @include transition (opacity .2s ease-in); opacity: 1; diff --git a/app/styles/modules/colors-table.scss b/app/styles/modules/colors-table.scss index 0d4b456f..90db72b7 100644 --- a/app/styles/modules/colors-table.scss +++ b/app/styles/modules/colors-table.scss @@ -17,8 +17,8 @@ padding-left: 50px; } &:hover { - background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); .options-column { @include transition (opacity .3s linear); opacity: 1; @@ -28,6 +28,11 @@ &.hidden { display: none; } + &.edition { + .current-color { + cursor: pointer; + } + } .color-column, .is-closed-column, .options-column { @@ -62,7 +67,6 @@ .current-color { background-color: $gray-light; border-radius: 2px; - cursor: pointer; height: 40px; width: 40px; }