diff --git a/src/assets/conf/resources-landing-page.json b/src/assets/conf/resources-landing-page.json index dc85e9c..837ab42 100644 --- a/src/assets/conf/resources-landing-page.json +++ b/src/assets/conf/resources-landing-page.json @@ -214,7 +214,7 @@ "Workflow": { - "description": "Project management, task assignment and status, client information, data, invoicing and reports", + "description": "Project management, task assignment and status, client information, invoicing and reports", "cards": [ { "title": "Clarity", diff --git a/src/assets/pages/resources-landing-page.html b/src/assets/pages/resources-landing-page.html index 91163e8..00f3306 100644 --- a/src/assets/pages/resources-landing-page.html +++ b/src/assets/pages/resources-landing-page.html @@ -5,7 +5,7 @@ - Steering Wheel + Resource Center @@ -20,7 +20,7 @@ JDSfaulkner logo -  Steering Wheel +  Resource Center -
-
+
+
-
-
+
+
-
-
+
+
diff --git a/src/assets/pages/styles/resources-landing-page.scss b/src/assets/pages/styles/resources-landing-page.scss index e0f589f..c959ec5 100644 --- a/src/assets/pages/styles/resources-landing-page.scss +++ b/src/assets/pages/styles/resources-landing-page.scss @@ -132,10 +132,12 @@ body { .category-header p { margin: 0 0 .15em 0; padding-left: 1rem; + padding-bottom: .5rem; } -.category-header h4 { +.category-header h5 { padding-left: 1rem; + padding-top: .5rem; } .footer { diff --git a/src/assets/pages/styles/theme-base.scss b/src/assets/pages/styles/theme-base.scss index f405e22..ab5b274 100644 --- a/src/assets/pages/styles/theme-base.scss +++ b/src/assets/pages/styles/theme-base.scss @@ -57,18 +57,20 @@ body{ } .category-header { - border: 1px solid black; + border: 1px solid; border-radius: 5px; - background-color: transparent; cursor: pointer; margin-bottom: 4px; + background-color: map-get($theme-colors, inactiveaccordion); + color: map-get($theme-colors, textaccordion); + border-color: map-get($theme-colors, inactiveborderaccordion); } .category-header.active { - background-color: white; margin-bottom: 25px; + background-color: map-get($theme-colors, activeaccordion); + color: map-get($theme-colors, textaccordion); + border-color: map-get($theme-colors, activeborderaccordion); } -.category-header br { - -} + diff --git a/src/assets/pages/styles/theme-dark.scss b/src/assets/pages/styles/theme-dark.scss index a7c9e9f..151984e 100644 --- a/src/assets/pages/styles/theme-dark.scss +++ b/src/assets/pages/styles/theme-dark.scss @@ -21,7 +21,11 @@ $theme-colors: ( "paragraphtextcolor": #808080, "paragraphtextcolorhover":#202022, "themebuttonoutline": #414144, - "categorybox": #707070, + "inactiveaccordion": #202023, + "activeaccordion": #414144, + "textaccordion": #808080, + "inactiveborderaccordion": #55555c, + "activeborderaccordion": rgba(26, 26, 26, 0), "footertext": #808080, ); diff --git a/src/assets/pages/styles/theme-light.scss b/src/assets/pages/styles/theme-light.scss index 5f07d15..ea598e0 100644 --- a/src/assets/pages/styles/theme-light.scss +++ b/src/assets/pages/styles/theme-light.scss @@ -21,7 +21,12 @@ $theme-colors: ( "paragraphtextcolor": #434344, "paragraphtextcolorhover": #ffffff, "themebuttonoutline": #434344, - "categorybox": #ffffff, + "inactiveaccordion": #f6f6f6, + "activeaccordion": #ffffff, + "textaccordion": #434344, + "borderaccordion": #c0c2c6, + "inactiveborderaccordion": #c0c2c6, + "activeborderaccordion": rgba(26, 26, 26, 0), "footertext": #434344, ); diff --git a/src/assets/views/card-category.mustache b/src/assets/views/card-category.mustache index 4d9ee92..93cd15a 100644 --- a/src/assets/views/card-category.mustache +++ b/src/assets/views/card-category.mustache @@ -1,8 +1,8 @@
-

{{{category-id-clean}}}

button
-

{{{category-description}}}

+
{{{category-id-clean}}}
button
+

{{{category-description}}}