Update login and signup forms UI, including Hyrax logo in top nav bar

samvera · Oct 31, 2018 · 1d5f6a7 · 1d5f6a7
1 parent 42adf60
commit 1d5f6a7
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 20 deletions.
diff --git a/app/assets/images/hyrax_logo-bw.png b/app/assets/images/hyrax_logo-bw.png
diff --git a/app/assets/stylesheets/hyrax/_forms.scss b/app/assets/stylesheets/hyrax/_forms.scss
@@ -29,8 +29,6 @@ legend small {
   padding-left:1.2em;
 }
 
-.form-group { margin-bottom: 2em; }
-
 .form-group.has-error input,
 .form-group.has-error option,
 .form-group.has-error textarea {

diff --git a/app/assets/stylesheets/hyrax/_header.scss b/app/assets/stylesheets/hyrax/_header.scss
@@ -17,10 +17,6 @@ header > .navbar {
 
 .searchbar-right {
   margin-right: 0;
-
-  label {
-    color: #ffffff;
-  }
 }
 
 // We need these ancestor selectors to override Bootstrap and push
@@ -30,7 +26,17 @@ header > .navbar {
 }
 
 .dropdown-toggle:focus {
-  outline: 2px auto  Highlight; // FireFox
+  outline: 2px auto Highlight; // FireFox
   outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari
   outline: -2px;
 }
+
+.navbar-brand {
+  padding-bottom: 12px;
+  padding-right: 0;
+  padding-top: 12px;
+
+  img {
+    height: 28px;
+  }
+}
diff --git a/app/assets/stylesheets/hyrax/_home-page.scss b/app/assets/stylesheets/hyrax/_home-page.scss
@@ -40,6 +40,7 @@
 
   .navbar {
     background-color: $navbar-transparent-bg;
+    color: #fff;
     margin-bottom: 0;
 
     .navbar-nav {

diff --git a/app/assets/stylesheets/hyrax/_hyrax.scss b/app/assets/stylesheets/hyrax/_hyrax.scss
@@ -1,15 +1,15 @@
 @import 'hydra-editor/multi_value_fields';
 @import 'hyrax/variables', 'hyrax/file_sets', 'hyrax/settings', 'hyrax/header',
-        'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
-        'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types', 'hyrax/batch-edit',
-        'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats', 'hyrax/catalog',
-        'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights', 'hyrax/file-show',
-        'hyrax/work-show', 'hyrax/modal', 'hyrax/forms', 'hyrax/form',
-        'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
-        'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
-        'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
-        'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
-        'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs';
+  'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
+  'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types',
+  'hyrax/batch-edit', 'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats',
+  'hyrax/catalog', 'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights',
+  'hyrax/file-show', 'hyrax/work-show', 'hyrax/modal', 'hyrax/forms',
+  'hyrax/form', 'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
+  'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
+  'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
+  'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
+  'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs', 'hyrax/login_signup';
 @import 'typeahead';
 @import 'sharing_buttons';
 

diff --git a/app/assets/stylesheets/hyrax/_login_signup.scss b/app/assets/stylesheets/hyrax/_login_signup.scss
@@ -0,0 +1,20 @@
+// Login / Sign up styles needed because Devise gem controls the markup
+form.new_user {
+  margin-bottom: 1rem;
+
+  .field {
+    @extend .form-group;
+
+    input[type='email'],
+    input[type='input'],
+    input[type='password'] {
+      @extend .form-control;
+      width: 300px;
+    }
+  }
+
+  input[type='submit'] {
+    @extend .btn;
+    @extend .btn-primary;
+  }
+}
diff --git a/app/views/_logo.html.erb b/app/views/_logo.html.erb
@@ -1,4 +1,3 @@
 <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-  <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
-  <span class="institution_name"><%= application_name %></span>
+  <%= image_tag("hyrax_logo-bw.png", alt: application_name) %>
 </a>
diff --git a/lib/generators/hyrax/templates/config/locales/hyrax.en.yml b/lib/generators/hyrax/templates/config/locales/hyrax.en.yml
@@ -50,7 +50,7 @@ en:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2018 Samvera</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "&copy; 2018 Samvera - Licensed under the Apache License, Version 2.0"
       service_html: A service of <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: Institution
     institution_name_full: The Institution Name