diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png deleted file mode 100644 index 288b3870..00000000 Binary files a/app/assets/images/facebook.png and /dev/null differ diff --git a/app/assets/images/facebook.svg b/app/assets/images/facebook.svg deleted file mode 100644 index 8884d7be..00000000 --- a/app/assets/images/facebook.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/friends.png b/app/assets/images/friends.png deleted file mode 100644 index da2a3a12..00000000 Binary files a/app/assets/images/friends.png and /dev/null differ diff --git a/app/assets/images/friends.svg b/app/assets/images/friends.svg deleted file mode 100644 index a2c3c7ba..00000000 --- a/app/assets/images/friends.svg +++ /dev/null @@ -1,3818 +0,0 @@ - - - - - - - - - - -]> - diff --git a/app/assets/images/govdocs.png b/app/assets/images/govdocs.png deleted file mode 100644 index a185fc44..00000000 Binary files a/app/assets/images/govdocs.png and /dev/null differ diff --git a/app/assets/images/govdocs.svg b/app/assets/images/govdocs.svg deleted file mode 100644 index db8d6dfb..00000000 --- a/app/assets/images/govdocs.svg +++ /dev/null @@ -1,2113 +0,0 @@ - - - - diff --git a/app/assets/images/pu.png b/app/assets/images/pu.png deleted file mode 100644 index aa6afd6a..00000000 Binary files a/app/assets/images/pu.png and /dev/null differ diff --git a/app/assets/images/pu.svg b/app/assets/images/pu.svg deleted file mode 100644 index 2e732371..00000000 --- a/app/assets/images/pu.svg +++ /dev/null @@ -1,445 +0,0 @@ - - - - diff --git a/app/assets/images/pul-logo-new.svg b/app/assets/images/pul-logo-new.svg deleted file mode 100644 index 3cce0fe9..00000000 --- a/app/assets/images/pul-logo-new.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png deleted file mode 100644 index 584df0dd..00000000 Binary files a/app/assets/images/twitter.png and /dev/null differ diff --git a/app/assets/images/twitter.svg b/app/assets/images/twitter.svg deleted file mode 100644 index e08c4e73..00000000 --- a/app/assets/images/twitter.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/assets/images/up-arrow.svg b/app/assets/images/up-arrow.svg deleted file mode 100644 index b1fc3f27..00000000 --- a/app/assets/images/up-arrow.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c389019d..76ab00fc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,7 +11,6 @@ @import 'application_variables'; @import 'spotlight/variables_bootstrap'; -@import 'variables/variables_bootstrap'; @import 'bootstrap-sprockets'; @import 'bootstrap'; @import 'sir-trevor/main'; @@ -20,23 +19,7 @@ @import 'spotlight/spotlight'; @import 'normalize-rails'; - -@import 'mixins'; -@import 'header'; -@import 'footer'; - -body { - background-color: $masthead-bg; -} - -.masthead { - margin-bottom: 0px; -} - -#main-content { - background-color: $white; - padding-top: 15px; -} +@import 'pul-assets'; .viewer { height: 400px; diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss deleted file mode 100644 index 8a5b321a..00000000 --- a/app/assets/stylesheets/footer.scss +++ /dev/null @@ -1,140 +0,0 @@ -@import 'variables/breaks'; -@import 'variables/colors'; -@import 'variables/typography'; - -.l-footer .block--menu .menu { - display: none; -} - -@media (min-width: $bp-small) { - .l-footer .block--menu .menu { - display: block; - } -} - -.l-footer { - margin: 2em 0; -} - -footer { - h2 { - font-size: 16px; - margin-bottom: 0.75em; - font-weight: bold; - color: $dark-gray; - font-family: $font-serif; - a { - color: $dark-gray; - } - } -} - -footer a { - color: black; -} - -.l-region--footer .leaf a { - line-height: 1.75em; -} - -.l-region--footer address, -.l-region--footer .footer--copyright, -.l-region--footer li a { - color: $dark-gray; - font-size: 0.9em; -} - -.svg .facebook-logo:before, -.svg .twitter-logo:before, -.svg .govdocs-logo:before, -.svg .friends-logo:before, -.svg .pu-logo:before { - content: ' '; - display: inline-block; - vertical-align: middle; - height: 100%; -} - -.svg .facebook-logo, -.svg .twitter-logo, -.svg .govdocs-logo, -.svg .friends-logo, -.svg .pu-logo { - background-size: contain; - display: inline-block; - line-height: 11px; - height: 24px; -} - -.svg .facebook-logo img, -.svg .twitter-logo img, -.svg .govdocs-logo img, -.svg .friends-logo img, -.svg .pu-logo img { - display: none; -} - -.svg .facebook-logo { - background-image: image-url("facebook.svg"); - width: 24px; - margin: 0 0.2em 0.75em; -} - -.svg .twitter-logo { - background-image: image-url("twitter.svg"); - width: 24px; - margin: 0 0.2em 0.75em; -} - -.svg .govdocs-logo { - background-image: image-url("govdocs.svg"); - width: 27px; - margin: 0 0.2em 0.75em; -} - -.svg .friends-logo { - background-image: image-url("friends.svg"); - width: 91px; - margin: 0 0.2em 0.75em; -} - -.svg .pu-logo { - background-image: image-url("pu.svg"); - width: 142px; - height: 40px; - margin: 0.5em 0 0; -} - -.l-region--footer .footer--copyright { - margin-top: 0.5em; -} - -.back-to-top { - background: image-url("up-arrow.svg") center 50% no-repeat rgba(255,255,255,.8); - bottom: 30px; - display: none; - height: 40px; - overflow: hidden; - position: fixed; - right: 10px; - text-decoration: none; - text-indent: 100%; - white-space: nowrap; - width: 40px; - - @media only screen and (min-width: 768px) { - bottom: 20px; - right: 20px; - } - - @media only screen and (min-width: 1024px) { - bottom: 30px; - height: 60px; - right: 30px; - width: 60px; - } - - &:hover{ - text-decoration: none; - } -} diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss deleted file mode 100644 index 40d4c017..00000000 --- a/app/assets/stylesheets/header.scss +++ /dev/null @@ -1,308 +0,0 @@ -@import "variables/breaks"; -@import "variables/typography"; -@import "variables/colors"; - -.logo__pul { - height: 40px; - display: inline-block; - - img { - position: relative; - top: 50%; - -webkit-transform: translateY(-50%); - -ms-transform: translateY(-50%); - transform: translateY(-50%); - } -} - -.svg .logo-svg { - display: inline-block; - max-width: 100%; -} - -.svg .logo-no-svg { - display: none; -} - -.l-branding__pul { - background: $dark-gray; - border-top: 3px solid $orange; - min-height: 40px; - position: relative; - clear: both; - - .menu--level-1, - .logo__pul { - height: 52px; - position: relative; - z-index: 10; - - @media (min-width: 645px) { - width: 50%; - } - } - - .logo__pul a { - @include vertical-align; - display: inline-block; // float: left; - height: 38px; - - img { - height: 35px; - vertical-align: middle; - } - - &.site-title { - vertical-align: middle; - margin-left: 1rem; - border-left: 1px solid darken($gray, 50%); - height: 35px; - padding-left: 1rem; - color: white; - font-size: 1.6em; - line-height: 35px; - - &:hover { - text-decoration: none; - } - - &:focus, - &:active { - color: $orange; - } - } - } - - .menu--level-1>ul { - display: inline-block; - - @media (min-width: 645px) { - margin-top: 0; - @include vertical-align; - } - } -} - -@media (min-width: $bp-small) { - .l-branding__pul { - height: 55px; - } -} - -.menu--level-1>ul { - display: block; - - @media (min-width: 645px) { - float: right; - } - - >li>a, - .btn-account { - color: $gray; - font-size: 0.75em; - background: none; - border: none; - padding: 0; - - &:hover { - text-decoration: underline; - background-color: transparent; - } - } - - @media (min-width: 645px) { - .dropdown-menu { - top: 35px; - } - } - - >li { - float: left; - padding: 0 1rem; - // border-right: 1px solid darken($gray, 40%); - - @media (max-width: 645px) { - line-height: 1em; - } - - &:last-child { - border-right: none; - padding-right: 0; - } - } -} - -.l-branding__pul .logo__pul { - margin: 0; - padding: 0; -} - -.search-options a { - color: darken($blue, 3); -} - -.navbar-nav>li { - float: left; -} - -@media (max-width: 500px) { - .page-heading { - margin-bottom: 0; - } - - .bookmarks-count { - display: none; - } - - #sortAndPerPage { - margin: 0 auto; - text-align: center; - width: 100%; - .page_links, - .search-widgets { - display: inline-block; - float: none; - font-size: 1.2em; - width: 100%; - } - } - - .button--start-over .icon-refresh:before, - .btn .icon-moveback:before { - margin: 0; - } - - .pagination-search-widgets { - - .search-widgets li { - margin: 0 6px 0 0; - - a, - button.btn { - margin: 0; - width: 100%; - } - - .checkbox.toggle_bookmark, - .checkbox.toggle_bookmark label, - .checkbox.toggle_bookmark span { - width: 100%; - margin: 0; - } - } - - .button--start-over a, - .btn, - .page_links a { - margin: 0; - min-width: 44px; - min-height: 34px; - } - - .btn, - .page_links a { - margin-right: 3px; - } - } - - .btn-group.query { - width: 100%; - } -} - -@media (max-width: 645px) { - .logo__pul { - text-align: center; - } - - .l-branding__pul .menu--level-1 { - margin: 0; - text-align: center; - width: 100%; - li { - display: inline-block; - } - } - - .l-branding__pul .menu--level-1 ul li { - font-size: 1.2em; - } - - .menu--level-1 > ul > li > a, - .menu--level-1 > ul .btn-account { - font-size: 12px; - } - - .l-branding__pul { - height: auto; - } - - .l-branding__pul .menu--level-1 { - height: auto; - } - - .menu--level-1 > ul .btn-account { - height: auto; - } -} - -@media (max-width: 565px) { - .pagination-search-widgets { - .col-xs-12 { - width: 100%; - margin-bottom: 6px; - } - - .search-widgets .navbar-nav { - margin: 0 auto; - display: table; - } - - .page_links { - width: auto; - float: right; - text-align: center; - - .previous, - .next { - font-size: 20px; - vertical-align: middle; - width: 44px; - height: 34px; - line-height: 0.9em; - } - } - } -} - -@media (max-width: $bp-medium) { - .pagination-search-widgets { - - .search-widgets li { - margin: 0 6px 0 0; - - &:last-child { - margin-right: 0; - } - - &.dropdown { - - ul { - position: absolute; - padding: 0; - background: $white; - border: 1px solid $gray; - } - - li { - margin: 0; - } - - li a { - padding: 6px; - } - } - } - } -} - diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss deleted file mode 100644 index a6a7dcbe..00000000 --- a/app/assets/stylesheets/mixins.scss +++ /dev/null @@ -1,5 +0,0 @@ -@mixin vertical-align { - position: relative; - top: 50%; - transform: translateY(-50%); -} diff --git a/app/assets/stylesheets/typography.scss b/app/assets/stylesheets/typography.scss deleted file mode 100644 index 6b6ca4e7..00000000 --- a/app/assets/stylesheets/typography.scss +++ /dev/null @@ -1,63 +0,0 @@ -/* Follows minor third modular scale of 1.200 */ -@import 'variables/typography'; - -html { - font-size: 1em; -} - -body { - background-color: white; - font-family: $font-sans; - font-size: 16px; - font-weight: 400; - line-height: 1.45; - color: #333; -} - -p { - margin-bottom: 1.3em; -} - -h1, h2, h3, h4 { - margin: 1.414em 0 0.5em; - font-weight: inherit; - line-height: 1.2; -} - -h1 { - margin-top: 0; - // font-size: 2.074em; - font-size: 1.3em; - margin-bottom: 1em; -} - -h2 { - // font-size: 1.728em; - font-size: 1.3em; -} - -h3 { - font-size: 1.3em; -} - -h4 { - font-size: 1.2em; -} - -small, .font-small { - font-size: 0.833em; -} - -.page-heading { - display: inline-block; - margin-bottom: 1.4em; - padding-top: 5px; -} - -.page-heading.my-account { - margin-top: 5px; -} - -.welcome-message h2 { - margin-top: 0; -} diff --git a/app/assets/stylesheets/variables/breaks.scss b/app/assets/stylesheets/variables/breaks.scss deleted file mode 100644 index 712b7555..00000000 --- a/app/assets/stylesheets/variables/breaks.scss +++ /dev/null @@ -1,3 +0,0 @@ -$bp-large: 1200px; -$bp-medium: 992px; -$bp-small: 768px; \ No newline at end of file diff --git a/app/assets/stylesheets/variables/colors.scss b/app/assets/stylesheets/variables/colors.scss deleted file mode 100644 index 79619cae..00000000 --- a/app/assets/stylesheets/variables/colors.scss +++ /dev/null @@ -1,11 +0,0 @@ -$white: #ffffff; -$black: #000000; -$dark-gray: #494f57; -$blacklight-gray: #777; -$gray: #e8e6df; -$light-gray: #f5f4f1; -$dark-orange: #9F620D; -$orange: #e87511; -$blue: #3072AB; -$brand-danger: #a94442; -$yellow-light: #fee7ba; diff --git a/app/assets/stylesheets/variables/typography.scss b/app/assets/stylesheets/variables/typography.scss deleted file mode 100644 index d81b20bc..00000000 --- a/app/assets/stylesheets/variables/typography.scss +++ /dev/null @@ -1,6 +0,0 @@ -$font-serif: 'Droid Serif', Georgia, Times, serif !default; -$font-sans: 'Dejavu Sans', 'Arial Unicode MS', Helvetica, sans-serif !default; -$font-mono: 'Lucida Console', Monaco, monospace !default; -$text-color: #000 !default; - -$text-small: 12px; diff --git a/app/assets/stylesheets/variables/variables_bootstrap.scss b/app/assets/stylesheets/variables/variables_bootstrap.scss deleted file mode 100644 index ac9ff894..00000000 --- a/app/assets/stylesheets/variables/variables_bootstrap.scss +++ /dev/null @@ -1 +0,0 @@ -$font-size-base: 16px; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d9121aa5..cfd5deda 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -5,15 +5,4 @@ module ApplicationHelper def site_sidebar? can?(:manage, Spotlight::Site.instance) || can?(:create, Spotlight::Exhibit) end - - # site_title pulls from the db if configured through the UI. - # otherwise use the val from the blacklight locale file. - # We need this because application_name helper changes to include exhibit titles - def header_title - site_title || t("blacklight.application_name") - end - - def current_year - Date.today.year - end end diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb index 791e8aa0..99b84c55 100644 --- a/app/views/_user_util_links.html.erb +++ b/app/views/_user_util_links.html.erb @@ -1,3 +1,4 @@ +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6ac1dc00..ea19ae24 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -31,7 +31,7 @@ - <%= render partial: 'shared/header_navbar' %> + <%= render partial: 'pul-assets/header_navbar' %> <%= render partial: 'shared/announcements' %> <%= render partial: 'shared/masthead' %> <%= content_for?(:header_content) ? yield(:header_content) : "" %> diff --git a/app/views/layouts/blacklight.html.erb b/app/views/layouts/blacklight.html.erb index 6ac1dc00..ea19ae24 100644 --- a/app/views/layouts/blacklight.html.erb +++ b/app/views/layouts/blacklight.html.erb @@ -31,7 +31,7 @@ - <%= render partial: 'shared/header_navbar' %> + <%= render partial: 'pul-assets/header_navbar' %> <%= render partial: 'shared/announcements' %> <%= render partial: 'shared/masthead' %> <%= content_for?(:header_content) ? yield(:header_content) : "" %> diff --git a/app/views/layouts/spotlight/spotlight.html.erb b/app/views/layouts/spotlight/spotlight.html.erb index 2a201d30..bdff63ed 100644 --- a/app/views/layouts/spotlight/spotlight.html.erb +++ b/app/views/layouts/spotlight/spotlight.html.erb @@ -33,7 +33,7 @@ <%= render partial: 'shared/announcements' %> - <%= render partial: 'shared/header_navbar' %> + <%= render partial: 'pul-assets/header_navbar' %> <%= render partial: 'shared/masthead' %> <%= content_for?(:header_content) ? yield(:header_content) : "" %> diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index d3a9cb05..72e68c31 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,195 +1,3 @@ - +<%= render 'shared/analytics' %> diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb deleted file mode 100644 index 017be811..00000000 --- a/app/views/shared/_header_navbar.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -