From 35651ef3f9d34bac8ee7245dfa42061bfba0fefc Mon Sep 17 00:00:00 2001 From: daros10 Date: Thu, 2 Apr 2020 14:11:37 -0500 Subject: [PATCH 1/2] change application colors --- .../activity-list.component.html | 50 ++++++------ .../activity-list.component.scss | 6 ++ .../create-activity.component.html | 2 +- .../create-activity.component.scss | 11 +++ src/app/modules/home/home.component.html | 6 +- .../create-project.component.html | 6 +- .../create-project.component.scss | 11 +++ .../project-list/project-list.component.html | 6 +- .../project-list/project-list.component.scss | 7 ++ .../components/clock/clock.component.html | 14 ++-- .../details-fields.component.html | 41 +++++++--- .../details-fields.component.scss | 13 ++++ .../components/modal/modal.component.html | 4 +- .../components/modal/modal.component.scss | 11 +++ .../month-picker/month-picker.component.html | 4 +- .../month-picker/month-picker.component.scss | 7 +- .../components/navbar/navbar.component.html | 14 ++-- .../components/sidebar/sidebar.component.html | 34 ++++++--- .../components/sidebar/sidebar.component.scss | 23 +++++- .../components/user/user.component.html | 17 +++-- .../components/user/user.component.scss | 8 +- .../project-list-hover.component.scss | 7 ++ .../pages/time-clock.component.html | 20 ++--- .../pages/time-clock.component.scss | 12 +++ .../pages/time-entries.component.html | 54 +++++++++---- .../pages/time-entries.component.scss | 4 +- src/assets/img/ioet-logo-light.png | Bin 0 -> 41432 bytes src/index.html | 28 +++---- src/styles/colors.scss | 71 ++++++++++++++++++ 29 files changed, 361 insertions(+), 130 deletions(-) create mode 100644 src/assets/img/ioet-logo-light.png create mode 100644 src/styles/colors.scss diff --git a/src/app/modules/activities-management/components/activity-list/activity-list.component.html b/src/app/modules/activities-management/components/activity-list/activity-list.component.html index 256d271c9..22d535f0b 100644 --- a/src/app/modules/activities-management/components/activity-list/activity-list.component.html +++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.html @@ -1,31 +1,31 @@
-
-
-
-
-
-

- - {{activity.name}} - -
- - -
-

-
+
+
+
+
+
+

+ + {{ activity.name }} + +
+ + +
+

+
-
-
-
Description:
-

{{activity.description}}

-
-
-
+
+
+
Description:
+

{{ activity.description }}

- - - +
+
+ + +
+
diff --git a/src/app/modules/activities-management/components/activity-list/activity-list.component.scss b/src/app/modules/activities-management/components/activity-list/activity-list.component.scss index e69de29bb..0c625698f 100644 --- a/src/app/modules/activities-management/components/activity-list/activity-list.component.scss +++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.scss @@ -0,0 +1,6 @@ +@import '../../../../../styles/colors.scss'; + +.style-list-project { + background-image: $background-gradient-items; + color: white; +} diff --git a/src/app/modules/activities-management/components/create-activity/create-activity.component.html b/src/app/modules/activities-management/components/create-activity/create-activity.component.html index 511a9867a..1d1b74d2f 100644 --- a/src/app/modules/activities-management/components/create-activity/create-activity.component.html +++ b/src/app/modules/activities-management/components/create-activity/create-activity.component.html @@ -23,7 +23,7 @@

Activity

diff --git a/src/app/modules/activities-management/components/create-activity/create-activity.component.scss b/src/app/modules/activities-management/components/create-activity/create-activity.component.scss index e69de29bb..b38a23340 100644 --- a/src/app/modules/activities-management/components/create-activity/create-activity.component.scss +++ b/src/app/modules/activities-management/components/create-activity/create-activity.component.scss @@ -0,0 +1,11 @@ +@import '../../../../../styles/colors.scss'; + +.save-button-style { + background-image: $button-primary-color; + color: white; +} + +.cancel-button-style { + background-color: $modal-button-secondary; + color: white; +} diff --git a/src/app/modules/home/home.component.html b/src/app/modules/home/home.component.html index 924cf8b51..316323697 100644 --- a/src/app/modules/home/home.component.html +++ b/src/app/modules/home/home.component.html @@ -1,5 +1,3 @@ - - - - \ No newline at end of file + + diff --git a/src/app/modules/project-management/components/create-project/create-project.component.html b/src/app/modules/project-management/components/create-project/create-project.component.html index f13ec9b88..5f59426d4 100644 --- a/src/app/modules/project-management/components/create-project/create-project.component.html +++ b/src/app/modules/project-management/components/create-project/create-project.component.html @@ -54,10 +54,12 @@

Project

diff --git a/src/app/modules/project-management/components/create-project/create-project.component.scss b/src/app/modules/project-management/components/create-project/create-project.component.scss index e69de29bb..b38a23340 100644 --- a/src/app/modules/project-management/components/create-project/create-project.component.scss +++ b/src/app/modules/project-management/components/create-project/create-project.component.scss @@ -0,0 +1,11 @@ +@import '../../../../../styles/colors.scss'; + +.save-button-style { + background-image: $button-primary-color; + color: white; +} + +.cancel-button-style { + background-color: $modal-button-secondary; + color: white; +} diff --git a/src/app/modules/project-management/components/project-list/project-list.component.html b/src/app/modules/project-management/components/project-list/project-list.component.html index 4765d5255..b98bc11b4 100644 --- a/src/app/modules/project-management/components/project-list/project-list.component.html +++ b/src/app/modules/project-management/components/project-list/project-list.component.html @@ -5,7 +5,7 @@
-
+

{{ project.name }}
- +

diff --git a/src/app/modules/project-management/components/project-list/project-list.component.scss b/src/app/modules/project-management/components/project-list/project-list.component.scss index ea2de12c3..daa7b0035 100644 --- a/src/app/modules/project-management/components/project-list/project-list.component.scss +++ b/src/app/modules/project-management/components/project-list/project-list.component.scss @@ -1,4 +1,11 @@ +@import '../../../../../styles/colors.scss'; + .scroll { max-height: 400px; overflow-y: auto; } + +.style-list-project { + background-image: $background-gradient-items; + color: white; +} diff --git a/src/app/modules/shared/components/clock/clock.component.html b/src/app/modules/shared/components/clock/clock.component.html index 1a4412038..23da85048 100644 --- a/src/app/modules/shared/components/clock/clock.component.html +++ b/src/app/modules/shared/components/clock/clock.component.html @@ -1,8 +1,6 @@ -
-
- -
-
-

{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}

-
-
\ No newline at end of file +
+ +
+
+

{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}

+
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index fd89befb5..66a747528 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -3,38 +3,59 @@
Project
- +
Activity
- +
Jira Ticket
- +
Technology
- +
- - +
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.scss b/src/app/modules/shared/components/details-fields/details-fields.component.scss index 06b6e01f5..2735a1709 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.scss +++ b/src/app/modules/shared/components/details-fields/details-fields.component.scss @@ -1,7 +1,20 @@ +@import '../../../../../styles/colors.scss'; .span-width { width: 6rem; + background-image: $background-pantone; + color: white; } .hidden { display: none; } + +.save-button-style { + background-color: $modal-button-primary; + color: white; +} + +.close-button-style { + background-color: $modal-button-secondary; + color: white; +} diff --git a/src/app/modules/shared/components/modal/modal.component.html b/src/app/modules/shared/components/modal/modal.component.html index 05e9a29e1..a8e5eb848 100644 --- a/src/app/modules/shared/components/modal/modal.component.html +++ b/src/app/modules/shared/components/modal/modal.component.html @@ -10,8 +10,8 @@ Are you sure you want to delete {{ list.name || list.project }} entry?
- - + +
diff --git a/src/app/modules/shared/components/modal/modal.component.scss b/src/app/modules/shared/components/modal/modal.component.scss index e69de29bb..f6f4d7757 100644 --- a/src/app/modules/shared/components/modal/modal.component.scss +++ b/src/app/modules/shared/components/modal/modal.component.scss @@ -0,0 +1,11 @@ +@import '../../../../../styles/colors.scss'; + +.delete-button-style { + background-color: $modal-button-primary; + color: white; +} + +.cancel-button-style { + background-color: $modal-button-secondary; + color: white; +} diff --git a/src/app/modules/shared/components/month-picker/month-picker.component.html b/src/app/modules/shared/components/month-picker/month-picker.component.html index 32c6d361a..c7b6335a0 100644 --- a/src/app/modules/shared/components/month-picker/month-picker.component.html +++ b/src/app/modules/shared/components/month-picker/month-picker.component.html @@ -1,7 +1,7 @@
diff --git a/src/app/modules/shared/components/month-picker/month-picker.component.scss b/src/app/modules/shared/components/month-picker/month-picker.component.scss index ab3f8099a..01ae0076a 100644 --- a/src/app/modules/shared/components/month-picker/month-picker.component.scss +++ b/src/app/modules/shared/components/month-picker/month-picker.component.scss @@ -1,5 +1,8 @@ +@import '../../../../../styles/colors.scss'; + .month { - background-color: #0093dc; + background: $header; + color: white; cursor: pointer; &:hover { @@ -8,5 +11,5 @@ } .active { - background-color: #005ce0; + background-color: $item-background; } diff --git a/src/app/modules/shared/components/navbar/navbar.component.html b/src/app/modules/shared/components/navbar/navbar.component.html index 0f28be942..3d9f2c186 100644 --- a/src/app/modules/shared/components/navbar/navbar.component.html +++ b/src/app/modules/shared/components/navbar/navbar.component.html @@ -1,8 +1,8 @@ -