diff --git a/app/assets/css/extra.css b/app/assets/css/extra.css index 2837285..7af5369 100644 --- a/app/assets/css/extra.css +++ b/app/assets/css/extra.css @@ -1,3 +1,10 @@ +:root { + /* Limestone brand colors (names mirror Limestone's modifier classes) */ + --color-wildcat-blue: #0033a0; + --color-blue-gray: #eff4fd; + --color-cool-neutral: #dcddde; +} + .fa-request.fa-requestable-toc { display: block; margin: 0 auto; @@ -19,6 +26,10 @@ display: none; } +.breadcrumbs ul li.fa-hidden { + display: none; +} + .fa-request-form { overflow: auto; background: #FDFDF6; @@ -33,7 +44,6 @@ overflow-x: hidden; overflow-y: scroll; margin: 1em; - height: 10em; } .fa-options { @@ -73,29 +83,48 @@ label { float: right; } -.container-fluid { - width: 80% !important; - background-color: #ffffff !important; + + +.fa-section { + margin-bottom: 2rem; } -.panel-heading[data-toggle="collapse"] .panel-title:after { - font-family: "Glyphicons Halflings"; - color: #666; - float: right; - content: "\e114"; +.editorial .fa-section h3 { + font-size: 1.5rem; } -.panel-heading[data-toggle="collapse"].collapsed .panel-title:after { - content: "\e080"; +/* .fa-component { */ +/* background-color: #eff4fd; */ +/* padding: 1rem; */ +/* margin-bottom: 0.5rem; */ +/* } */ + +.editorial .fa-component h4 { + font-size: 1.15rem; + font-weight: 400; } -.panel-title a { - color: #337ab7 !important; +.fa-component .list-unstyled { + list-style: none; + padding-left: 0; } -.toplink { - padding: 1em; - float: right; +.fa-component .list-unstyled li { + font-size: 0.9rem; + color: #555; + padding: 0.5rem 0.75rem; + margin-bottom: 0.25rem; +} + +.fa-component img { + max-width: 150px; + max-height: 150px; +} + +.fa-component .fa-request.fa-requestable-contents { + font-size: 0.75rem; + padding: 0.15rem 0.5rem; + margin-left: 0.5rem; } .click-to-load-images, .image-overflow { @@ -137,6 +166,20 @@ label { color: #246024; } +.fa-request-summary { + background-color: var(--color-blue-gray); + padding: 1rem 1.5rem; +} +.fa-request-summary .heading--display span { + background-color: var(--color-blue-gray); +} +.fa-request-summary .accordion__header, +.fa-request-summary .accordion__header:hover, +.fa-request-summary .accordion__header:focus, +.fa-request-summary .accordion__header:active { + background-color: var(--color-blue-gray); +} + /* UK LIMESTONE STYLES */ /* styling to match Limestone's Underline Link */ a.underline-link { @@ -153,13 +196,13 @@ a.underline-link { } a:hover.underline-link { - color:#0033A0; + color: var(--color-wildcat-blue); background-position: 0 0, 1000px 2px; } /* styling to match central webcom's in-page alert*/ .in-page-alert { - background-color: #EFF4FD; + background-color: var(--color-blue-gray); border-left: 7px solid #1E8AFF; padding: 1rem; align-items: center; @@ -170,7 +213,7 @@ a:hover.underline-link { font-size: 1.75rem; font-weight: 900; margin-top: 0; - color: #0033A0; + color: var(--color-wildcat-blue); line-height: 1.2; } .in-page-alert h3 { @@ -179,7 +222,16 @@ a:hover.underline-link { font-weight: 500; margin-bottom: 5px; margin-top: 10px; - color: #0033A0; + color: var(--color-wildcat-blue); line-height: 1.2; - -} \ No newline at end of file +} + +.heading-section { + margin: 1rem 0; +} + +@scope(.heading-section){ + .heading--display { + margin: 2rem 0; + } +} diff --git a/app/assets/js/manifest.txt b/app/assets/js/manifest.txt index 6766e6f..c57faf4 100644 --- a/app/assets/js/manifest.txt +++ b/app/assets/js/manifest.txt @@ -1,8 +1,6 @@ # List required files in the desired order mousetrap.min.js -jquery.min.js jquery-ui.min.js -bootstrap.min.js lity.min.js jquery.unveil.js reveal.js diff --git a/app/assets/js/requests.js b/app/assets/js/requests.js index 2d6bac3..7d8a319 100644 --- a/app/assets/js/requests.js +++ b/app/assets/js/requests.js @@ -23,12 +23,15 @@ var requests = (function() { function update_count() { var count = model.get_count(); + $('.fa-request-count').text(count); if (count > 0) { if (count == 1) { $('.fa-request-summary-note').html('You are requesting 1 item.'); + $('.fa-request-announce').text('1 item selected'); } else { $('.fa-request-summary-note').html('You are requesting ' + count + ' items.'); + $('.fa-request-announce').text(count + ' items selected'); } $('.fa-request-options').removeClass('fa-request-hidden'); $('.fa-extra-options').removeClass('fa-request-hidden'); @@ -36,6 +39,7 @@ var requests = (function() { } else { $('.fa-request-summary-note').html('No items have been requested.'); + $('.fa-request-announce').text('No items selected'); $('.fa-request-options').addClass('fa-request-hidden'); $('.fa-extra-options').addClass('fa-request-hidden'); $('#fa-request-submit').addClass('fa-request-hidden'); @@ -71,8 +75,8 @@ var requests = (function() { } else { request_type = model.get_request_type(); - $('button.fa-request-option').addClass('btn-default').removeClass('btn-primary'); - $('button[data-option="' + request_type + '"]').addClass('btn-primary').removeClass('btn-default'); + $('button.fa-request-option').addClass('button--ghost').removeClass('button--wildcat-blue'); + $('button[data-option="' + request_type + '"]').addClass('button--wildcat-blue').removeClass('button--ghost'); $('div.fa-request-option').addClass('fa-request-hidden'); if (model.get_count() > 0) { $('[data-option="' + request_type + '"]').removeClass('fa-request-hidden'); @@ -91,7 +95,7 @@ var requests = (function() { if (model.has(id)) { item = model.remove(id); jid = '#' + id; - $(jid).addClass('btn-warning').removeClass('btn-success').html($(jid).attr('data-inactive')); + $(jid).addClass('button--ghost').removeClass('button--wildcat-blue').html($(jid).attr('data-inactive')); target = $(jid).attr('data-target') + '-remove'; /* Remove hidden inputs */ @@ -123,7 +127,7 @@ var requests = (function() { pos = model.add(item); if (pos !== false) { count = model.get_count(); - $(jid).addClass('btn-success').removeClass('btn-warning').html($(jid).attr('data-active')); + $(jid).addClass('button--wildcat-blue').removeClass('button--ghost').html($(jid).attr('data-active')); /* Display selected item and add toggle control */ removable_element = requests_view.render({ @@ -564,7 +568,7 @@ var requests = (function() { pieces.push('
  • '); pieces.push('

    '); if (("removable" in item) && item["removable"]) { - pieces.push(' '); + pieces.push(' '); } pieces.push(item["label"]); pieces.push('

    • '); @@ -701,7 +705,7 @@ var requests = (function() { var id = $(this).attr('id'); if ($(this).hasClass('fa-toc')) { $(this).after([ - ' - - + + +

    Submit a request for SCRC materials.

    -
    -
    - {{> harmful_language_statement}} - diff --git a/app/views/findingaid/show.mustache b/app/views/findingaid/show.mustache index 3a3d141..5773226 100644 --- a/app/views/findingaid/show.mustache +++ b/app/views/findingaid/show.mustache @@ -1,6 +1,4 @@ -

    {{title}}{{^title}}Welcome to ExploreUK{{/title}}

    -
    - +
    {{#panels}} {{>panel}} {{/panels}} diff --git a/app/views/findingaid/toc.mustache b/app/views/findingaid/toc.mustache index 9372ac9..c330313 100644 --- a/app/views/findingaid/toc.mustache +++ b/app/views/findingaid/toc.mustache @@ -1,13 +1,7 @@ -
    - {{#requestable}} - {{> advance_note}} - {{/requestable}} -
    -
    -

    {{label}}

    -
    -
    -
      +
      +
      -
    + {{#toc_component}} -
    -
      +
      +
      • {{summary}} @@ -39,24 +32,3 @@ {{/toc_component}} {{> harmful_language_statement}}
      - diff --git a/app/views/layouts/application.mustache b/app/views/layouts/application.mustache index 66196ee..948f497 100644 --- a/app/views/layouts/application.mustache +++ b/app/views/layouts/application.mustache @@ -5,9 +5,7 @@ {{#css}} {{/css}} - {{#js}} - - {{/js}} + {{> head-common}} + {{/js}} + + + {{#requestable}} + + {{/requestable}} + {{>viewer}} diff --git a/app/views/layouts/footer.mustache b/app/views/layouts/footer.mustache deleted file mode 100644 index 17440da..0000000 --- a/app/views/layouts/footer.mustache +++ /dev/null @@ -1,22 +0,0 @@ -{{#requestable}} - -{{/requestable}} -{{^requestable}} - -{{/requestable}} diff --git a/app/views/layouts/nav.mustache b/app/views/layouts/nav.mustache index 0ba67c9..c8b595f 100644 --- a/app/views/layouts/nav.mustache +++ b/app/views/layouts/nav.mustache @@ -1,14 +1,5 @@
      -
      - {{> repo}} -{{#requestable}} - -{{/requestable}} -
      +{{> universal-header}} +{{> global-header}} +{{> search-brief}} +{{> breadcrumbs}} diff --git a/app/views/layouts/repo.mustache b/app/views/layouts/repo.mustache index e6efb0d..89af215 100644 --- a/app/views/layouts/repo.mustache +++ b/app/views/layouts/repo.mustache @@ -1,5 +1,5 @@ {{#repository}}

      + src="images/{{logo}}">

      {{/repository}} diff --git a/app/views/layouts/viewer.mustache b/app/views/layouts/viewer.mustache index 47bd840..131e043 100644 --- a/app/views/layouts/viewer.mustache +++ b/app/views/layouts/viewer.mustache @@ -1,5 +1,5 @@
      - +
      diff --git a/app/views/shared/advance_note.mustache b/app/views/shared/advance_note.mustache new file mode 100644 index 0000000..99e46d4 --- /dev/null +++ b/app/views/shared/advance_note.mustache @@ -0,0 +1,9 @@ + diff --git a/app/views/shared/breadcrumbs.mustache b/app/views/shared/breadcrumbs.mustache new file mode 100644 index 0000000..608f6d8 --- /dev/null +++ b/app/views/shared/breadcrumbs.mustache @@ -0,0 +1,24 @@ +
      +
      + +
      +
      diff --git a/app/views/shared/global-footer.mustache b/app/views/shared/global-footer.mustache new file mode 100644 index 0000000..a49e8a0 --- /dev/null +++ b/app/views/shared/global-footer.mustache @@ -0,0 +1,90 @@ +
      +
      +
      +
      + +

      Contact Us

      + +

      + Special Collections Research Center
      + Margaret I. King Library
      + Lexington, KY 40506-0039
      + scrc@uky.edu
      + Phone: 859-257-8611
      +

      +

      + Breckinridge Research Room
      + Monday–Friday, 10:00 AM–4:00 PM
      + Appointments required.
      +

      +

      + Contact form +

      +
      +
      + +
      +
      + +

      Researcher Resources

      + +
      +
      + +
      + + + + + Campus Map & Directions + + + + + + +
      + + Federal Depository Library + +
      + +
      +
      +
      diff --git a/app/views/shared/global-header.mustache b/app/views/shared/global-header.mustache new file mode 100644 index 0000000..6363f7f --- /dev/null +++ b/app/views/shared/global-header.mustache @@ -0,0 +1,130 @@ + +
    + + diff --git a/app/views/shared/head-common.mustache b/app/views/shared/head-common.mustache new file mode 100644 index 0000000..0f1720d --- /dev/null +++ b/app/views/shared/head-common.mustache @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/app/views/shared/limestone-resources.mustache b/app/views/shared/limestone-resources.mustache new file mode 100644 index 0000000..a455310 --- /dev/null +++ b/app/views/shared/limestone-resources.mustache @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/views/shared/search-brief.mustache b/app/views/shared/search-brief.mustache new file mode 100644 index 0000000..34ec51f --- /dev/null +++ b/app/views/shared/search-brief.mustache @@ -0,0 +1,21 @@ +
    +
    + +
    +
    diff --git a/app/views/shared/universal-footer.mustache b/app/views/shared/universal-footer.mustache new file mode 100644 index 0000000..6969cb7 --- /dev/null +++ b/app/views/shared/universal-footer.mustache @@ -0,0 +1,53 @@ + +
    +
    + + + University of Kentucky Homepage + A link to return to the University of Kentucky Homepage + + + + + + + +
    + + +
    + Directory +
    +
    + Email +
    + + + +
    +
    +
    © University of Kentucky
    + +
    +
    +
    + diff --git a/app/views/shared/universal-header.mustache b/app/views/shared/universal-header.mustache new file mode 100644 index 0000000..fd6d4cf --- /dev/null +++ b/app/views/shared/universal-header.mustache @@ -0,0 +1,54 @@ + +
    +
    +
    + +
    + +
    + + + + +
    +
    +
    +