Skip to content

Commit

Permalink
login page edits and navbar search bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
maxturer committed Apr 30, 2024
1 parent fa79707 commit b5a4043
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
18 changes: 9 additions & 9 deletions app/assets/stylesheets/scholarspace/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 12 additions & 0 deletions app/assets/stylesheets/scholarspace/components/_static-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,22 @@

//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 {
Expand Down
2 changes: 1 addition & 1 deletion app/views/catalog/_search_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">

<span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
<span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
<span aria-hidden="true" data-search-element="label"><%= t("hyrax.search.form.option.all.label_short") %></span>
<span class="caret"></span>
</button>

Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/sessions/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% provide :page_title, "Staff Login" %>
<div class="login-container">
<div class="login-container main-login">
<h1>Staff Login</h1>
<%= render "devise/shared/links" %>
<p class="or">or:</p>
Expand Down

0 comments on commit b5a4043

Please sign in to comment.