From 0b905f2368f90c570c7ace57979edaab2d740ec0 Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Thu, 10 Dec 2015 12:11:03 -0600 Subject: [PATCH 01/12] Share widget position Positions share widget on right edge of content instead of moving with navigations that have fewer than six primary links. --- wdn/templates_4.1/less/layouts/share.less | 26 ++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/wdn/templates_4.1/less/layouts/share.less b/wdn/templates_4.1/less/layouts/share.less index c6bc83a5b..e3931878b 100644 --- a/wdn/templates_4.1/less/layouts/share.less +++ b/wdn/templates_4.1/less/layouts/share.less @@ -175,20 +175,26 @@ } #navigation .wdn-icon-share { - position: relative; - left: 9px; - padding: 9px 0; display: none; cursor: pointer; + position: absolute; + padding: 9px 0; line-height: normal; + + @media @bp640 { right: @page-offset-640; } + @media @bp768 { right: @page-offset-768; } + @media @bp960 { right: @page-offset-960; } + @media @bp1280 { right: @page-offset-1280; } + @media @bp1600 { right: @page-offset-1600; } + + @media @bp-nav-full { + display: inline-block; + } } -@media @bp-nav-full { - .wdn-menu-trigger .wdn-share-button .wdn-icon-share { - display: none; - } +.wdn-menu-trigger .wdn-share-button .wdn-icon-share { - #navigation .wdn-icon-share { - display: inline-block; - } + @media @bp-nav-full { + display: none; + } } From 8eb516baea5751ce62a8ebacd905e82f96b98ced Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Thu, 10 Dec 2015 12:17:23 -0600 Subject: [PATCH 02/12] Adjust Share toggle padding --- wdn/templates_4.1/less/layouts/share.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wdn/templates_4.1/less/layouts/share.less b/wdn/templates_4.1/less/layouts/share.less index e3931878b..c6f27bae8 100644 --- a/wdn/templates_4.1/less/layouts/share.less +++ b/wdn/templates_4.1/less/layouts/share.less @@ -52,13 +52,13 @@ .wdn-icon-share { display: block; color: #fff; - padding: 8px 0 10px 10px; + padding: 11px 0; font-size: 17px; font-size: 1.069rem; border-radius: 3px; @media @bp-nav-hidden { - padding: 7px 1.333em 7px 0; + padding: 7px 0; } } } From 01711e15356474afa7199c050d3b6452068263b3 Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Thu, 10 Dec 2015 12:18:03 -0600 Subject: [PATCH 03/12] Remove unneeded share toggle border-radius --- wdn/templates_4.1/less/layouts/share.less | 1 - 1 file changed, 1 deletion(-) diff --git a/wdn/templates_4.1/less/layouts/share.less b/wdn/templates_4.1/less/layouts/share.less index c6f27bae8..addb0fec8 100644 --- a/wdn/templates_4.1/less/layouts/share.less +++ b/wdn/templates_4.1/less/layouts/share.less @@ -55,7 +55,6 @@ padding: 11px 0; font-size: 17px; font-size: 1.069rem; - border-radius: 3px; @media @bp-nav-hidden { padding: 7px 0; From d354e50922737e4dd6cadb65ff2b3528fc59fbbb Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Fri, 11 Dec 2015 15:01:57 -0600 Subject: [PATCH 04/12] Move navigation link border Move border from top of secondary links unordered list to bottom of primary links to include border for those primary links without secondary links. --- wdn/templates_4.1/less/layouts/navigation.less | 5 +++-- wdn/templates_4.1/less/states/navigation.less | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/wdn/templates_4.1/less/layouts/navigation.less b/wdn/templates_4.1/less/layouts/navigation.less index 42e2606a5..74ab4e860 100644 --- a/wdn/templates_4.1/less/layouts/navigation.less +++ b/wdn/templates_4.1/less/layouts/navigation.less @@ -151,6 +151,9 @@ padding-top: 1em; .kern(); letter-spacing: 0.01em; + + @media @bp-nav-full { + } } li { @@ -182,8 +185,6 @@ ul { height: 0; overflow: hidden; - border-top: 1px solid #c00808; - border-top: 1px solid fadeout(#000,94%); } li { diff --git a/wdn/templates_4.1/less/states/navigation.less b/wdn/templates_4.1/less/states/navigation.less index bb78ba6b1..f19a836ac 100644 --- a/wdn/templates_4.1/less/states/navigation.less +++ b/wdn/templates_4.1/less/states/navigation.less @@ -21,6 +21,17 @@ } } } + + .nav_expanded & { + + > ul > li > a { + + @media @bp-nav-full { + border-bottom: 1px solid #c00808; + border-bottom: 1px solid fadeout(#000,94%); + } + } + } } @media @bp-nav-hidden { From 69c90ea9c6f60a83eea81d053cea095e8615206b Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 12:31:11 -0600 Subject: [PATCH 05/12] Updated scarlet --- wdn/templates_4.1/less/_mixins/colors.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wdn/templates_4.1/less/_mixins/colors.less b/wdn/templates_4.1/less/_mixins/colors.less index ef9623f23..1a0a636ca 100644 --- a/wdn/templates_4.1/less/_mixins/colors.less +++ b/wdn/templates_4.1/less/_mixins/colors.less @@ -1,7 +1,7 @@ // GO B1G RED // Scarlet - @scarlet: #d00000; + @scarlet: #dd0000; @brand: @scarlet; // Cream @@ -54,7 +54,7 @@ // Assign base colors - // Base text and heading text colors + // Base text and heading text colors @heading-text: @ui09; @base-text: @ui08; From 3630c868fe4081a35ced04ef7273eee479e176aa Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 12:52:55 -0600 Subject: [PATCH 06/12] Remove unused media query --- wdn/templates_4.1/less/layouts/navigation.less | 3 --- 1 file changed, 3 deletions(-) diff --git a/wdn/templates_4.1/less/layouts/navigation.less b/wdn/templates_4.1/less/layouts/navigation.less index 74ab4e860..1b530ee59 100644 --- a/wdn/templates_4.1/less/layouts/navigation.less +++ b/wdn/templates_4.1/less/layouts/navigation.less @@ -151,9 +151,6 @@ padding-top: 1em; .kern(); letter-spacing: 0.01em; - - @media @bp-nav-full { - } } li { From fdb9edb0ecff5d1480f4c7d5d7b29237ffb1d66b Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 12:57:29 -0600 Subject: [PATCH 07/12] Change mobile nav link border to RGBa --- wdn/templates_4.1/less/layouts/navigation.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wdn/templates_4.1/less/layouts/navigation.less b/wdn/templates_4.1/less/layouts/navigation.less index 1b530ee59..1a47e41fb 100644 --- a/wdn/templates_4.1/less/layouts/navigation.less +++ b/wdn/templates_4.1/less/layouts/navigation.less @@ -131,7 +131,11 @@ // Styles specific to the mobile view @media @bp-nav-hidden { - border-bottom: 1px solid @ui11; + border-bottom: 1px solid rgba(0, 0, 0, 0.15); + + &:hover { + border-bottom: 1px solid rgba(0, 0, 0, 0); + } } @media @bp-nav-full { From 8d5f195e9fd6ccf350c943df9ba5349bd76a56c2 Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 14:01:45 -0600 Subject: [PATCH 08/12] Adjust breadcrumbs for last-link --- .../less/layouts/breadcrumbs.less | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/wdn/templates_4.1/less/layouts/breadcrumbs.less b/wdn/templates_4.1/less/layouts/breadcrumbs.less index 13f3e3b41..52c157361 100644 --- a/wdn/templates_4.1/less/layouts/breadcrumbs.less +++ b/wdn/templates_4.1/less/layouts/breadcrumbs.less @@ -111,17 +111,20 @@ &:last-child { - @media @bp-nav-full { - padding-left: 23px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - background: transparent; - } - - &:after { - display: none; - } + &:not(.last-link) { + + @media @bp-nav-full { + padding-left: 23px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + background: transparent; + } + + &:after { + display: none; + } + } } &.selected { From 68c1eb4800908373a7bf832b59f5ee5bf43bde8a Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 15:27:39 -0600 Subject: [PATCH 09/12] Swap placement of share and search on mobile --- wdn/templates_4.1/less/layouts/search.less | 4 ++-- wdn/templates_4.1/less/layouts/share.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wdn/templates_4.1/less/layouts/search.less b/wdn/templates_4.1/less/layouts/search.less index 278875862..befed4ee5 100644 --- a/wdn/templates_4.1/less/layouts/search.less +++ b/wdn/templates_4.1/less/layouts/search.less @@ -117,7 +117,7 @@ @media @bp-nav-hidden { position: absolute; - left: 4.49em; + left: 2.532em; } @media @bp-nav-full { @@ -184,7 +184,7 @@ content: ''; position: absolute; top: -6px; - left: 5.61em; + left: 3.157em; width: 0; height: 0; border-left: 6px solid transparent; diff --git a/wdn/templates_4.1/less/layouts/share.less b/wdn/templates_4.1/less/layouts/share.less index addb0fec8..15934a4e9 100644 --- a/wdn/templates_4.1/less/layouts/share.less +++ b/wdn/templates_4.1/less/layouts/share.less @@ -2,7 +2,7 @@ z-index: (@nav-z-index + 1); @media @bp-nav-hidden { - margin-left: 1em; + margin-left: 4.209em; } @media @bp-nav-full { From b023e403bfe3fee54113582ff66802877659d391 Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 15:40:35 -0600 Subject: [PATCH 10/12] Add cursor: pointer to search toggle label --- wdn/templates_4.1/less/layouts/search.less | 1 + 1 file changed, 1 insertion(+) diff --git a/wdn/templates_4.1/less/layouts/search.less b/wdn/templates_4.1/less/layouts/search.less index befed4ee5..8f62c32ef 100644 --- a/wdn/templates_4.1/less/layouts/search.less +++ b/wdn/templates_4.1/less/layouts/search.less @@ -118,6 +118,7 @@ @media @bp-nav-hidden { position: absolute; left: 2.532em; + cursor: pointer; } @media @bp-nav-full { From 80068b9620fae5c241c1c637685959817ac4cae1 Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 15:42:40 -0600 Subject: [PATCH 11/12] Search toggle label layout adjustment --- wdn/templates_4.1/less/layouts/search.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wdn/templates_4.1/less/layouts/search.less b/wdn/templates_4.1/less/layouts/search.less index 8f62c32ef..76e5632d1 100644 --- a/wdn/templates_4.1/less/layouts/search.less +++ b/wdn/templates_4.1/less/layouts/search.less @@ -117,7 +117,7 @@ @media @bp-nav-hidden { position: absolute; - left: 2.532em; + left: 2.369em; cursor: pointer; } From ab2af0efef42e034e18329e45a25401d4ae57762 Mon Sep 17 00:00:00 2001 From: Ryan Dee Date: Tue, 15 Dec 2015 15:44:36 -0600 Subject: [PATCH 12/12] Update global footer links Closes #911 --- wdn/templates_4.1/includes/globalfooter.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wdn/templates_4.1/includes/globalfooter.html b/wdn/templates_4.1/includes/globalfooter.html index 8d46cd36e..f6d66e797 100644 --- a/wdn/templates_4.1/includes/globalfooter.html +++ b/wdn/templates_4.1/includes/globalfooter.html @@ -20,8 +20,8 @@
  • Directory
  • Employment
  • Events
    • +
  • Libraries
  • Maps
    • -
  • Marketplace
  • Office of the Chancellor
  • UNL Today