Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update login and signup forms UI, and make search label visible #3362

Merged
merged 2 commits into from
Nov 13, 2018
Merged

Update login and signup forms UI, and make search label visible #3362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2e1646
Update login and signup forms styling in UI, and make homepage search…
adamjarling Oct 31, 2018
f388fbe
Move Login/Signup styles to be application controlled
Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/assets/stylesheets/hyrax/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/hyrax/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ 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;
}
20 changes: 10 additions & 10 deletions app/assets/stylesheets/hyrax/_hyrax.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
@import 'typeahead';
@import 'sharing_buttons';

Expand Down
20 changes: 20 additions & 0 deletions app/assets/stylesheets/hyrax/_login_signup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Login / Sign up styles needed because Devise gem controls the markup
form.new_user {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid qualifying class selectors with an element.
Selector new_user should be written in lowercase with hyphens

margin-bottom: 1rem;

.field {
@extend .form-group;

input[type='email'],
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid qualifying attribute selectors with an element.

input[type='input'],
input[type='password'] {
@extend .form-control;
width: 300px;
}
}

input[type='submit'] {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid qualifying attribute selectors with an element.

@extend .btn;
@extend .btn-primary;
}
}
1 change: 1 addition & 0 deletions lib/generators/hyrax/templates/hyrax.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
@import "blacklight_gallery/slideshow";
@import "blacklight_gallery/osd_viewer";
@import 'hyrax/hyrax';
@import 'hyrax/login_signup';