-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from scientist-softserv/styling
Styling
- Loading branch information
Showing
19 changed files
with
190 additions
and
75 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| .viewer-wrapper { | ||
| height: 900px; | ||
| } | ||
|
|
||
| .viewer { | ||
| height: 100%; | ||
| padding: 10px; | ||
|
|
||
| } | ||
|
|
||
| #viewer-modal { | ||
| .modal-content { | ||
| padding: 20px; | ||
| } | ||
| picture { | ||
| background-color: rgb(46,46,46); | ||
| } | ||
| button.close { | ||
| margin-bottom: 10px; | ||
| } | ||
| } | ||
|
|
||
| .video-embed-viewer { | ||
| aspect-ratio: auto; | ||
| width: 100%; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| @import url(https://fonts.googleapis.com/css?family=Nobile:400,700,300); | ||
|
|
||
| $primary-font-family: "Nobile", sans-serif; | ||
|
|
||
| $jumbotron-heading-font-size: 2.5em; | ||
| $jumbotron-heading-color: #30373b; | ||
| $jumbotron-sub-heading-color: #444; | ||
| $jumbotron-button-background-color: #7ab55c; | ||
|
|
||
| $features-section-background-color: #f4f4f4; | ||
| $features-section-border-color: #ddd; | ||
|
|
||
|
|
||
| // BRAND COLORS | ||
| $white: #ffffff; | ||
| $lightgrey: #F5F5F6; | ||
| $lightgreyborder: #e5e5e5; | ||
| $lightgrey2: #b8b8b8; | ||
| $mediumgrey: #5b5b5b; | ||
| $darkgrey: #2C2C2C; | ||
| $black: #000000; | ||
| $lightyellow: #FFBD42; | ||
| $mediumyellow: #CE8C00; | ||
| $darkyellow: #985F03; | ||
| $transparentwhite: rgba(255, 255, 255, .8); | ||
|
|
||
| // Breakpoints | ||
|
|
||
| //use for max widths | ||
| // X-Small devices (portrait phones, less than 576px) | ||
| $xs-max: 575.98px; | ||
| // Small devices (landscape phones, less than 768px) | ||
| $sm-max: 767.98px; | ||
| // Medium devices (tablets, less than 992px) | ||
| $md-max: 991.98px; | ||
| // Large devices (desktops, less than 1200px) | ||
| $lg-max: 1251.98px; | ||
| // X-Large devices (large desktops, less than 1400px) | ||
| $xl-max: 1399.98px; | ||
|
|
||
| // use for min-widths | ||
| $xs-min: 576px; | ||
| $sm-min: 768px; | ||
| $md-min: 992px; | ||
| $lg-min: 1252px; | ||
| $xl-min: 1400px; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <ul id="user_utility_links" class="nav navbar-nav navbar-right"> | ||
| <%= render 'shared/locale_picker' if available_translations.size > 1 %> | ||
| <%#= Nav Links added here to improve mobile responsivity %> | ||
| <li <%= 'class=active' if current_page?(hyrax.root_path) %>> | ||
| <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li> | ||
| <li <%= 'class=active' if current_page?(hyrax.about_path) %>> | ||
| <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li> | ||
| <% if defined?(resources_path) %> <%#= TODO remove when path fix is merged %> | ||
| <li <%= 'class=active' if current_page?(main_app.resources_path) %>> | ||
| <%= link_to t(:'hyrax.controls.resources'), main_app.resources_path, aria: current_page?(main_app.resources_path) ? {current: 'page'} : nil %></li> | ||
| <% end %> | ||
| <li <%= 'class=active' if current_page?(hyrax.contact_path) %>> | ||
| <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li> | ||
| <% if user_signed_in? %> | ||
| <li> | ||
| <%= render_notifications(user: current_user) %> | ||
| </li> | ||
| <li class="dropdown"> | ||
| <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %> | ||
| <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span> | ||
| <span class="hidden-xs"> <%= current_user.name %></span> | ||
| <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span> | ||
| <span class="fa fa-user"></span> | ||
| <span class="caret"></span> | ||
| <% end %> | ||
| <ul class="dropdown-menu dropdown-menu-right" role="menu"> | ||
| <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li> | ||
|
|
||
| <li class="divider"></li> | ||
| <% if Devise.mappings[:user].registerable? %> | ||
| <li><%= link_to t("hyku.toolbar.profile.edit_registration"), main_app.edit_user_registration_path %></li> | ||
| <% end %> | ||
| <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li> | ||
| </ul> | ||
| </li><!-- /.btn-group --> | ||
| <% else %> | ||
| <li> | ||
| <%= link_to main_app.new_user_session_path do %> | ||
| <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %> | ||
| <% end %> | ||
| </li> | ||
| <% end %> | ||
| </ul> |
11 changes: 11 additions & 0 deletions
11
app/views/hyrax/admin/appearances/_default_colors_form.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <%= simple_form_for @form, url: admin_appearance_path do |f| %> | ||
| <div class="panel-body defaultable-colors"> | ||
| <% @form.class::ADL_DEFAULT_COLORS.each do |color_name, hex| %> | ||
| <%= render 'color_input', f: f, color_name: color_name, hex: hex %> | ||
| <% end %> | ||
| </div> | ||
| <div class="panel-footer"> | ||
| <%= link_to 'Restore All Defaults', '#color', class: 'btn btn-default restore-all-default-colors' %> | ||
| <%= f.submit class: 'btn btn-primary pull-right' %> | ||
| </div> | ||
| <% end %> |
19 changes: 19 additions & 0 deletions
19
app/views/hyrax/admin/appearances/_default_fonts_form.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <%# OVERRIDE: Use custom default values for fonts rather than default from Hyku %> | ||
| <%= simple_form_for @form, url: admin_appearance_path do |f| %> | ||
| <div class="panel-body defaultable-fonts"> | ||
| <% df = @form.default_values %> | ||
| <% font = f.object.body_font %> | ||
| <%= f.input :body_font, label: 'Select Body Font', required: false, input_html: { class: 'font-fields', data: { default_value: df['body_font'] } } %> | ||
| <%= link_to 'Restore Default', '#font', class: 'btn btn-default restore-default-font', data: { default_target: 'body_font' } %> | ||
| <%= f.input :headline_font, label: 'Select Header Font', required: false, input_html: { class: 'font-fields', data: { default_value: df['headline_font'] } } %> | ||
| <%= link_to 'Restore Default', '#font', class: 'btn btn-default restore-default-font', data: { default_target: 'headline_font' } %> | ||
|
|
||
| </div> | ||
| <div class="panel-footer"> | ||
| <%= link_to 'Restore All Defaults', '#font', class: 'btn btn-default restore-all-default-fonts' %> | ||
| <%= f.submit class: 'btn btn-primary pull-right' %> | ||
| </div> | ||
| <% end %> |
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters