Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java =================================================================== diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -rf11663c9b27c276fae910e6c3fa5561a3e2af781 --- lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java (.../PortraitTag.java) (revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java (.../PortraitTag.java) (revision f11663c9b27c276fae910e6c3fa5561a3e2af781) @@ -43,7 +43,7 @@ public class PortraitTag extends BodyTagSupport { private static final long serialVersionUID = -3143529984657965761L; private static final Logger log = Logger.getLogger(PortraitTag.class); - private static final int NUM_COLORS = 7; + private static final int NUM_COLORS = 6; private IUserManagementService userManagementService; private static final String CSS_ROUND = " portrait-round"; Index: lams_central/web/css/authoring-svg.css =================================================================== diff -u -rfb2e534f60cd5b148214a23587f20140dc1bd2dd -rf11663c9b27c276fae910e6c3fa5561a3e2af781 --- lams_central/web/css/authoring-svg.css (.../authoring-svg.css) (revision fb2e534f60cd5b148214a23587f20140dc1bd2dd) +++ lams_central/web/css/authoring-svg.css (.../authoring-svg.css) (revision f11663c9b27c276fae910e6c3fa5561a3e2af781) @@ -1,12 +1,21 @@ +:root{ + --lams-blue: #0175E2; + --lams-yellow: #F9F871; + --lams-green: #00914A; + --lams-red: #D73961; + --lams-opacity: 0.5; + --lams-low-opacity: 0.25; +} + .svg-tool-activity-border { fill: none; - stroke: #b6b6b6; + stroke: var(--bs-gray); stroke-width: 1; } .svg-tool-activity-border-require-grouping { fill: none; - stroke: red; + stroke: var(--lams-red); stroke-width: 3; } @@ -21,33 +30,35 @@ .svg-tool-activity-category-1 { stroke: none; - fill: #caddfb; + fill: var(--lams-blue); + opacity: var(--lams-low-opacity); } .svg-tool-activity-category-2 { stroke: none; - fill: #ffffbb; + fill: var(--lams-yellow); + opacity: var(--lams-opacity); } .svg-tool-activity-category-3 { - fill: #2DBCE9; - opacity: 0.25; + fill: var(--lams-blue); + opacity: var(--lams-opacity); } .svg-tool-activity-category-4 { - fill: #FF72AC; - opacity: 0.25; - + fill: var(--lams-red); + opacity: var(--lams-opacity); } .svg-tool-activity-category-5 { stroke: none; - fill: #caddfb; + fill: var(--lams-blue); + opacity: var(--lams-low-opacity); } .svg-tool-activity-category-6 { - fill: #1AD9B2; - opacity: 0.25; + fill: var(--lams-green); + opacity: var(--lams-opacity); } .svg-activity-title-label { @@ -75,41 +86,42 @@ } .svg-branching-start { - stroke: green; + stroke: var(--lams-green); } .svg-branching-end { - stroke: red; + stroke: var(--lams-red); } .svg-branching-match { - stroke: blue; + stroke: var(--lams-blue); } .svg-annotation-container { - stroke: #b6b6b6; + stroke: var(--bs-gray); } .svg-activity-optional .svg-annotation-container, .svg-activity-parallel .svg-annotation-container, .svg-activity-floating .svg-annotation-container { - fill : #f0f8ff; + fill: var(--lams-blue); + opacity: var(--lams-low-opacity); } .svg-transition { stroke-width: 1; - stroke: rgb(119, 126, 157); + stroke: var(--bs-gray); fill: none; } .svg-transition-element { - stroke: rgb(119, 126, 157); - fill: rgb(119, 126, 157); + stroke: var(--bs-gray); + fill: var(--bs-gray); } .svg-transition-draw { stroke-width: 2; - stroke: rgb(119, 126, 157); + stroke: var(--bs-gray); stroke-dasharray: 5, 3; } Index: lams_central/web/css/bootstrap5.custom.scss =================================================================== diff -u -r9f4482aa1d29f454f091420cc38d3b27a3f4cc8f -rf11663c9b27c276fae910e6c3fa5561a3e2af781 --- lams_central/web/css/bootstrap5.custom.scss (.../bootstrap5.custom.scss) (revision 9f4482aa1d29f454f091420cc38d3b27a3f4cc8f) +++ lams_central/web/css/bootstrap5.custom.scss (.../bootstrap5.custom.scss) (revision f11663c9b27c276fae910e6c3fa5561a3e2af781) @@ -1,15 +1,18 @@ /* LAMS custom palette - https://coolors.co/f8f8f8-a6aabd-0175e2-f9f871-00914a-d73961 + https://coolors.co/f8f8f8-0175e2-f9f871-00914a-d73961 */ -$blue: #0175E2; -$yellow: #F9F871; -$green: #00914A; -$red: #D73961; -$gray: #A6AABD; +$blue: #0175E2; /* rgb(1, 117, 226) */ +$yellow: #F9F871; /* rgb(249, 248, 113) */ +$green: #00914A; /* rgb(0, 145, 74) */ +$red: #D73961; /* rgb(215, 57, 97) */ @import "bootstrap/bootstrap.scss"; :root { - --lams-background-gray: #F8F8F8; + --lams-background-gray: #F8F8F8; /* rgb(248, 248, 248) */ +} + +.btn-success, .btn-success:hover{ + color: $white; } \ No newline at end of file Index: lams_central/web/css/components.css =================================================================== diff -u -r31afff99da6da76fe6c33c0eaba09f57a02ca1ac -rf11663c9b27c276fae910e6c3fa5561a3e2af781 --- lams_central/web/css/components.css (.../components.css) (revision 31afff99da6da76fe6c33c0eaba09f57a02ca1ac) +++ lams_central/web/css/components.css (.../components.css) (revision f11663c9b27c276fae910e6c3fa5561a3e2af781) @@ -1,5 +1,5 @@ body.component { - background-color: #E4E4E4; + background-color: var(--lams-background-gray); } body.component .tooltip-inner { @@ -28,7 +28,6 @@ min-height: 100vh; border-radius: 2rem; overflow: hidden; - background-color: #F6F5FA; } .component-page-wrapper input::-webkit-input-placeholder { @@ -40,7 +39,7 @@ } .component-page-wrapper label { - color: #6c757d; + color: var(--bs-gray); } .component-page-wrapper .btn { @@ -368,30 +367,14 @@ } .component-page-wrapper .component-menu-btn a { - color: #fff; - display: inline-block; - background-color: #3C42E0; width: 3.1rem; height: 3.1rem; - border-radius: 1rem; - text-align: center; - line-height: 2.8rem; - box-shadow: 0px 3px 6px #3C42E040; - transition: all .3s ease; } .component-page-wrapper .component-menu-btn a i.fa { - padding-top: 1.5rem; + padding-top: 1.09rem; } -.component-page-wrapper .component-menu-btn a.active { - background-color: #878bea; -} - -.component-page-wrapper .component-menu-btn a:hover { - background-color: #878bea; -} - .component-page-wrapper .component-menu-btn a img { width: 1rem; } @@ -511,7 +494,7 @@ .switch input ~ label::before { right: 0; - background-color: #dee2e6; + background-color: var(--bs-gray); border-radius: calc(2.375rem * .8); transition: 0.2s all; } @@ -527,7 +510,7 @@ } .switch input:checked ~ label::before { - background-color: #7fdaa1; + background-color: var(--bs-green); } .switch input:checked ~ label::after { Index: lams_central/web/css/free.ui.jqgrid.custom.css =================================================================== diff -u -r6582c67f62fe86aeb15f5b7e21b54a82952ec3d3 -rf11663c9b27c276fae910e6c3fa5561a3e2af781 --- lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision 6582c67f62fe86aeb15f5b7e21b54a82952ec3d3) +++ lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision f11663c9b27c276fae910e6c3fa5561a3e2af781) @@ -10,7 +10,7 @@ } .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-caption { - background-color: #F6F5FA; + background-color: var(--bs-gray-200); } .ui-jqgrid .ui-jqgrid-bdiv { @@ -81,7 +81,7 @@ } .table-hover tbody tr:hover { - background-color: #F6F5FA; + background-color: var(--bs-gray-200); } .ui-jqgrid .ui-jqgrid-titlebar>.ui-jqgrid-titlebar-close { Index: lams_central/web/css/vertical-timeline.css =================================================================== diff -u -rbfa7dfb5557d54767b137652b34dd89c13fb1227 -rf11663c9b27c276fae910e6c3fa5561a3e2af781 --- lams_central/web/css/vertical-timeline.css (.../vertical-timeline.css) (revision bfa7dfb5557d54767b137652b34dd89c13fb1227) +++ lams_central/web/css/vertical-timeline.css (.../vertical-timeline.css) (revision f11663c9b27c276fae910e6c3fa5561a3e2af781) @@ -123,7 +123,7 @@ background-clip: padding-box; border-radius: 50%; text-align: center; - border: 7px solid #ffffff; + border: 1px solid var(--bs-gray); line-height: 45px; font-size: 15px; float: left; @@ -139,6 +139,7 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + border: 1px solid var(--bs-gray); } .vertical-timeline .timeline-entry .timeline-entry-inner .timeline-label:after { content: ''; @@ -148,7 +149,7 @@ height: 0; border-style: solid; border-width: 9px 9px 9px 0; - border-color: transparent #ffffff transparent transparent; + border-color: transparent var(--bs-gray) transparent transparent; left: 0; top: 20px; margin-left: -9px; @@ -160,6 +161,12 @@ margin: 5px 0 0 10px; } +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.activity-complete, +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.activity-current { + border-width: 7px; +} + + .vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.activity-complete ~ .timeline-label:after { margin-left: -13px; border-color: transparent var(--bs-success) transparent transparent; @@ -180,5 +187,10 @@ .vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon img { width: 25px; + margin-top: 10px; +} + +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.activity-complete img, +.vertical-timeline .timeline-entry .timeline-entry-inner .timeline-icon.activity-current img { margin-top: -2px; } \ No newline at end of file Index: lams_central/web/images/svg/gateClosed.svg =================================================================== diff -u -r4032b1b03d4bf650f44d7c49a5745e3524a876d7 -rf11663c9b27c276fae910e6c3fa5561a3e2af781 --- lams_central/web/images/svg/gateClosed.svg (.../gateClosed.svg) (revision 4032b1b03d4bf650f44d7c49a5745e3524a876d7) +++ lams_central/web/images/svg/gateClosed.svg (.../gateClosed.svg) (revision f11663c9b27c276fae910e6c3fa5561a3e2af781) @@ -20,7 +20,7 @@