From 85062144fd1f380a4c0bb88f8a722d4ed7957ba6 Mon Sep 17 00:00:00 2001 From: Rebecca Hollis Date: Wed, 18 Nov 2020 09:07:17 -0500 Subject: [PATCH] made the alt design the working design --- src/assets/pages/resources-landing-page.html | 155 +++++++++++------- .../pages/styles/resources-landing-page.scss | 107 +++++++++++- .../styles/test-resources-landing-page2.scss | 154 ----------------- .../pages/test-resources-landing-page2.html | 130 --------------- 4 files changed, 202 insertions(+), 344 deletions(-) delete mode 100644 src/assets/pages/styles/test-resources-landing-page2.scss delete mode 100644 src/assets/pages/test-resources-landing-page2.html diff --git a/src/assets/pages/resources-landing-page.html b/src/assets/pages/resources-landing-page.html index ab84310..91163e8 100644 --- a/src/assets/pages/resources-landing-page.html +++ b/src/assets/pages/resources-landing-page.html @@ -1,9 +1,11 @@ + + -   ResourceFinder + Steering Wheel @@ -11,74 +13,117 @@ + -
-
- -
-
-

CLICK HERE FOR TAX DOCUMENTS

-

Alternate Layout

-
- -
- -
-
- -
+
+
+ +
+
+ +
+ + +
+
+
+
+
+
-
-
-
- + + + + + + + + + diff --git a/src/assets/pages/styles/resources-landing-page.scss b/src/assets/pages/styles/resources-landing-page.scss index 410f912..e0f589f 100644 --- a/src/assets/pages/styles/resources-landing-page.scss +++ b/src/assets/pages/styles/resources-landing-page.scss @@ -1,13 +1,36 @@ +html { + font-size: 14px; +} +@media (min-width: 768px) { + html { + font-size: 16px; + } +} +.container { + max-width: 960px; +} .main { background-color: secondary; - color: warning + color: navbartext; +} + +body { + font-size: 1rem; + padding-top: 80px; + padding-bottom: 20px; +} + +.feather { + width: 16px; + height: 16 px; + vertical-align: text-bottom; } .album { background-color: secondary; - color: warning + color: navbartext; } .img-thumbnail { @@ -18,14 +41,78 @@ background-color: primary; } + + .navbar { - color: navbartext; + margin-bottom: 20px; } +/* + * Sidebar + */ + +.sidebar { + position: fixed; + top: 0; + bottom: 0; + left: 0; + z-index: 100; /* Behind the navbar */ + padding: 0; + box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); +} + +.sidebar-sticky { + position: -webkit-sticky; + position: sticky; + top: 48px; /* Height of navbar */ + height: calc(100vh - 48px); + margin-top: 6rem; + padding-left: .5rem; + overflow-x: hidden; + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ +} + +.sidebar .nav-link { + font-weight: 500; + color: navbartext; +} + +.sidebar .nav-link .feather { + margin-right: 4px; + color: navbartextfeather; +} + +.sidebar .nav-link.active { + color: navbartextactive; +} + +.sidebar .nav-link:hover .feather, +.sidebar .nav-link.active .feather { + color: inherit; +} + +.sidebar-heading { + font-size: .75rem; + text-transform: uppercase; +} + +/* + * End Sidebar + */ + +.border-top { border-top: 1px solid #e5e5e5; } +.border-bottom { border-bottom: 1px solid #e5e5e5; } .nav-link { color: navbartext; } +@media (min-width: 768 px) { + .main { + padding-right: 40px; + padding-left: 220px; /* 180 + 40 */ +} +} + .form-control:focus { box-shadow: none; } @@ -41,17 +128,27 @@ .form-control::-webkit-input-placeholder { color: searchfont; } /* WebKit, Blink, Edge */ .form-control:-moz-placeholder { color: searchfont; } /* Mozilla Firefox 4 to 18 */ .form-control::-moz-placeholder { color: searchfont; } /* Mozilla Firefox 19+ */ -.form-control:-ms-input-placeholder { color: searchfont; } /* Internet Explorer 10-11 */ -.form-control::-ms-input-placeholder { color: searchfont; } /* Microsoft Edge */ +.category-header p { + margin: 0 0 .15em 0; + padding-left: 1rem; +} + +.category-header h4 { + padding-left: 1rem; +} .footer { padding-top: 3rem; padding-bottom: 3rem; background: primary; + color: footertext; } .footer p { margin-bottom: .25rem; + margin-left: 25rem; + padding-left: 25rem; + color: footertext; } diff --git a/src/assets/pages/styles/test-resources-landing-page2.scss b/src/assets/pages/styles/test-resources-landing-page2.scss deleted file mode 100644 index e0f589f..0000000 --- a/src/assets/pages/styles/test-resources-landing-page2.scss +++ /dev/null @@ -1,154 +0,0 @@ -html { - font-size: 14px; -} -@media (min-width: 768px) { - html { - font-size: 16px; - } -} - -.container { - max-width: 960px; -} - -.main { - background-color: secondary; - color: navbartext; -} - -body { - font-size: 1rem; - padding-top: 80px; - padding-bottom: 20px; -} - -.feather { - width: 16px; - height: 16 px; - vertical-align: text-bottom; -} - -.album { - background-color: secondary; - color: navbartext; -} - -.img-thumbnail { - background-color: primary; -} - -.thumbnail { - background-color: primary; -} - - - -.navbar { - margin-bottom: 20px; -} - -/* - * Sidebar - */ - -.sidebar { - position: fixed; - top: 0; - bottom: 0; - left: 0; - z-index: 100; /* Behind the navbar */ - padding: 0; - box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); -} - -.sidebar-sticky { - position: -webkit-sticky; - position: sticky; - top: 48px; /* Height of navbar */ - height: calc(100vh - 48px); - margin-top: 6rem; - padding-left: .5rem; - overflow-x: hidden; - overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ -} - -.sidebar .nav-link { - font-weight: 500; - color: navbartext; -} - -.sidebar .nav-link .feather { - margin-right: 4px; - color: navbartextfeather; -} - -.sidebar .nav-link.active { - color: navbartextactive; -} - -.sidebar .nav-link:hover .feather, -.sidebar .nav-link.active .feather { - color: inherit; -} - -.sidebar-heading { - font-size: .75rem; - text-transform: uppercase; -} - -/* - * End Sidebar - */ - -.border-top { border-top: 1px solid #e5e5e5; } -.border-bottom { border-bottom: 1px solid #e5e5e5; } -.nav-link { - color: navbartext; -} - -@media (min-width: 768 px) { - .main { - padding-right: 40px; - padding-left: 220px; /* 180 + 40 */ -} -} - -.form-control:focus { - box-shadow: none; -} - -.card-image-background{ - display: flex; -} - -.text-align-left{ - text-align: left; -} - -.form-control::-webkit-input-placeholder { color: searchfont; } /* WebKit, Blink, Edge */ -.form-control:-moz-placeholder { color: searchfont; } /* Mozilla Firefox 4 to 18 */ -.form-control::-moz-placeholder { color: searchfont; } /* Mozilla Firefox 19+ */ - -.category-header p { - margin: 0 0 .15em 0; - padding-left: 1rem; -} - -.category-header h4 { - padding-left: 1rem; -} - -.footer { - padding-top: 3rem; - padding-bottom: 3rem; - background: primary; - color: footertext; -} - -.footer p { - margin-bottom: .25rem; - margin-left: 25rem; - padding-left: 25rem; - color: footertext; -} - diff --git a/src/assets/pages/test-resources-landing-page2.html b/src/assets/pages/test-resources-landing-page2.html deleted file mode 100644 index 58c66ff..0000000 --- a/src/assets/pages/test-resources-landing-page2.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - Steering Wheel - - - - - - - - - - -
- - JDSfaulkner logo -  Steering Wheel - - - Theme -
- - -
-
- - - -
-
- -
-
- -
- - -
-
-
-
-
-
-
-
- - - - - -
-
-
- - - - - - - - \ No newline at end of file