added select2 styling

AbhinavNepal · Apr 7, 2018 · 806e64c · 806e64c
1 parent 63ed3db
commit 806e64c
Show file tree

Hide file tree

Showing 5 changed files with 731 additions and 14 deletions.
diff --git a/app/assets/javascripts/components/_base.coffee b/app/assets/javascripts/components/_base.coffee
@@ -1,2 +1,5 @@
 $(document).on "turbolinks:load", ->
+  # init tooltips
   $('[data-toggle="tooltip"]').tooltip()
+  # default select2 theme
+  $.fn.select2.defaults.set( "theme", "bootstrap" )
diff --git a/app/assets/stylesheets/_base.scss b/app/assets/stylesheets/_base.scss
@@ -1,10 +1,5 @@
-p, .alert {
-  font-size: 14px;
-}
-
-.card .card-body {
-  padding: 0.75em;
-}
+p, .alert { font-size: 14px; }
+.card .card-body { padding: 0.75em; }
 
 .site-footer {
   font-size: 12px;

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -11,10 +11,13 @@
  * It is generally better to create a new file per style scope.
  *
  *= require_self
+
  *= require bootstrap
  *= require bootstrap-grid
  *= require bootstrap-reboot
+
  *= require select2.min
+ *= require select2-bootstrap
  */
 
 @import "font-awesome";

diff --git a/app/assets/stylesheets/modules/scholars.scss b/app/assets/stylesheets/modules/scholars.scss
@@ -1,11 +1,6 @@
 .scholars {
-  form#scholar_search {
-    .select2-container .select2-selection--single { height: 38px !important; }
-    .select2-container--default .select2-selection--single {
-      border: 1px solid #ced4da;
-      .select2-selection__arrow { height: 35px; }
-      .select2-selection__rendered { line-height: 38px; }
-    }
+  form {
+    input.form-control { height: 35px; }
   }
 
   .scholar-search-info {