Skip to content

Commit

Permalink
Merge cd8ee88 into f960014
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Jul 13, 2018
2 parents f960014 + cd8ee88 commit f03ccb9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
34 changes: 17 additions & 17 deletions app/assets/stylesheets/blacklight/_blacklight_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
not to use the Blacklight CSS file at all in your local app. */

@import "mixins";
@import 'blacklight/blacklight_defaults';
@import "blacklight/bootstrap_overrides";
@import "blacklight/layout";
@import "blacklight/header";
@import "blacklight/constraints";
@import "blacklight/controls";
@import "blacklight/search_form";
@import "blacklight/search_results";
@import "blacklight/pagination";
@import "blacklight/group";
@import "blacklight/bookmark";
@import "blacklight/balanced_list";
@import "blacklight/facets";
@import "blacklight/search_history";
@import "blacklight/modal";
@import "blacklight/twitter_typeahead";
@import "blacklight/icons";
@import 'blacklight_defaults';
@import "bootstrap_overrides";
@import "layout";
@import "header";
@import "constraints";
@import "controls";
@import "search_form";
@import "search_results";
@import "pagination";
@import "group";
@import "bookmark";
@import "balanced_list";
@import "facets";
@import "search_history";
@import "modal";
@import "twitter_typeahead";
@import "icons";
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blacklight/blacklight.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

/* This is the default blacklight theme. */

@import 'blacklight/blacklight_base';
@import 'blacklight_base';

0 comments on commit f03ccb9

Please sign in to comment.