diff --git a/app/assets/stylesheets/scholarspace/base/_base.scss b/app/assets/stylesheets/scholarspace/base/_base.scss index 9a74f3f1..e94b2604 100644 --- a/app/assets/stylesheets/scholarspace/base/_base.scss +++ b/app/assets/stylesheets/scholarspace/base/_base.scss @@ -225,7 +225,7 @@ html { } #content-wrapper { - padding-bottom: 18.1rem; + padding-bottom: 20rem; @media (min-width: $mobile-breakpoint) { padding-bottom: 10.5rem; diff --git a/app/assets/stylesheets/scholarspace/components/_collection.scss b/app/assets/stylesheets/scholarspace/components/_collection.scss index a27a89e6..d26b04ef 100755 --- a/app/assets/stylesheets/scholarspace/components/_collection.scss +++ b/app/assets/stylesheets/scholarspace/components/_collection.scss @@ -246,3 +246,8 @@ } } } + +// collections in main search +.search-result-wrapper .collection-counts-wrapper .collection-counts-item { + font-weight: inherit; +} \ No newline at end of file diff --git a/app/assets/stylesheets/scholarspace/components/_header.scss b/app/assets/stylesheets/scholarspace/components/_header.scss index 4b1ad20a..98ecd7e4 100644 --- a/app/assets/stylesheets/scholarspace/components/_header.scss +++ b/app/assets/stylesheets/scholarspace/components/_header.scss @@ -423,25 +423,25 @@ header { .input-group { margin-bottom: 0; + width: 32vw; + + @media (max-width: 870px) { + width: 22vw; + } + + @media (max-width: $mobile-breakpoint) { + width: 50vw; + } } } #search-field-header { height: unset; - width: 25vw; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 0; border-bottom-right-radius: 0; padding: calc(0.3rem + 4px) 0.75rem; - - @media (max-width: 870px) { - width: 15vw; - } - - @media (max-width: $mobile-breakpoint) { - width: 45vw; - } } #search-submit-header { diff --git a/app/assets/stylesheets/scholarspace/components/_static-page.scss b/app/assets/stylesheets/scholarspace/components/_static-page.scss index d39358a6..153cf4b6 100644 --- a/app/assets/stylesheets/scholarspace/components/_static-page.scss +++ b/app/assets/stylesheets/scholarspace/components/_static-page.scss @@ -78,3 +78,43 @@ width: 10em; } } + + //login page + .login-container { + &.main-login { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + + .login-box-container { + width: min-content; + margin-bottom: 1rem; + padding: 1rem; + + #user_email, + #user_password { + color: $gw-dark-blue; + } + } + + p.or { + margin: 1rem 0; + } + + .reset-actions { + margin-bottom: 1rem; + } + + .login-return a { + text-decoration: underline; + } + + @media (max-width: $mobile-max) { + + .login-box-container { + margin-bottom: 2rem; + } + } + } \ No newline at end of file diff --git a/app/views/advanced/index.html.erb b/app/views/advanced/index.html.erb index d2ac0079..5dcf2ccd 100644 --- a/app/views/advanced/index.html.erb +++ b/app/views/advanced/index.html.erb @@ -1,9 +1,10 @@ +<% provide :page_title, "More Search Options" %> + <% content_for(:body_attributes) do %> data-turbolinks="false" <% end %>
- <% @page_title = "More Search Options - #{application_name}" %>
diff --git a/app/views/catalog/_search_form.html.erb b/app/views/catalog/_search_form.html.erb index 516e74f9..579da5e8 100644 --- a/app/views/catalog/_search_form.html.erb +++ b/app/views/catalog/_search_form.html.erb @@ -10,7 +10,7 @@ diff --git a/app/views/catalog/index.html.erb b/app/views/catalog/index.html.erb index 884e11f0..52c8836f 100644 --- a/app/views/catalog/index.html.erb +++ b/app/views/catalog/index.html.erb @@ -1,3 +1,4 @@ +<% provide :page_title, "Search Results" %>
<%= render 'search_results' %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 8ba65bc8..ede6ac41 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,5 +1,6 @@ +<% provide :page_title, "Forgot your password?" %> -
+
<%= f.submit "Send me password reset instructions" %>
<% end %> - <%= render "devise/shared/links" %> +
\ No newline at end of file diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 3f5617e8..b3c40993 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,28 +1,35 @@ -