blacklight 3.8.2 → 4.0.0.pre6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (206) hide show
  1. data/Gemfile +1 -0
  2. data/README.md +1 -1
  3. data/VERSION +1 -1
  4. data/app/assets/javascripts/blacklight/blacklight.js +12 -1
  5. data/app/assets/javascripts/blacklight/bootstrap_dropdowns.js +3 -0
  6. data/app/assets/javascripts/blacklight/checkbox_submit.js +12 -5
  7. data/app/assets/javascripts/blacklight/core.js +0 -1
  8. data/app/assets/javascripts/blacklight/css_dropdowns.js +10 -0
  9. data/app/assets/javascripts/blacklight/facet_expand_contract.js +5 -5
  10. data/app/assets/javascripts/blacklight/lightbox_dialog.js +68 -13
  11. data/app/assets/javascripts/blacklight/select_submit.js +19 -10
  12. data/app/assets/javascripts/improved-modal/bootstrap-modal.js +282 -0
  13. data/app/assets/javascripts/improved-modal/bootstrap-modalmanager.js +353 -0
  14. data/app/assets/stylesheets/blacklight/_blacklight_base.css.scss +16 -5
  15. data/app/assets/stylesheets/blacklight/_bookmark.css.scss +24 -6
  16. data/app/assets/stylesheets/blacklight/_catalog.css.scss +115 -141
  17. data/app/assets/stylesheets/blacklight/_dropdown.css.scss +57 -0
  18. data/app/assets/stylesheets/blacklight/_facets.css.scss +127 -58
  19. data/app/assets/stylesheets/blacklight/_footer.css.scss +20 -0
  20. data/app/assets/stylesheets/blacklight/_header.css.scss +90 -21
  21. data/app/assets/stylesheets/blacklight/_layout.css.scss +10 -9
  22. data/app/assets/stylesheets/blacklight/_modal.css.scss +23 -0
  23. data/app/assets/stylesheets/blacklight/_print.css.scss +0 -7
  24. data/app/assets/stylesheets/blacklight/_responsive.css.scss +3 -0
  25. data/app/assets/stylesheets/blacklight/_search_history.css.scss +2 -4
  26. data/app/assets/stylesheets/blacklight/blacklight.css.scss +0 -1
  27. data/app/assets/stylesheets/blacklight/blacklight_defaults.css.scss +9 -2
  28. data/app/assets/stylesheets/blacklight/responsive_partials/_catalog.css.scss +5 -0
  29. data/app/assets/stylesheets/blacklight/responsive_partials/_facets.css.scss +37 -0
  30. data/app/assets/stylesheets/blacklight/responsive_partials/_header.css.scss +30 -0
  31. data/app/assets/stylesheets/improved-modal/bootstrap-modal.css +199 -0
  32. data/app/controllers/bookmarks_controller.rb +16 -10
  33. data/app/helpers/blacklight/blacklight_helper_behavior.rb +124 -61
  34. data/app/helpers/blacklight/catalog_helper_behavior.rb +5 -3
  35. data/app/helpers/blacklight/facets_helper_behavior.rb +9 -9
  36. data/app/views/_flash_msg.html.erb +9 -4
  37. data/app/views/_user_util_links.html.erb +23 -17
  38. data/app/views/bookmarks/_tools.html.erb +7 -7
  39. data/app/views/bookmarks/index.html.erb +5 -13
  40. data/app/views/catalog/_bookmark_control.html.erb +2 -4
  41. data/app/views/catalog/_bookmark_form.html.erb +1 -1
  42. data/app/views/catalog/_citation.html.erb +21 -20
  43. data/app/views/catalog/_constraints.html.erb +8 -6
  44. data/app/views/catalog/_document_header.html.erb +6 -7
  45. data/app/views/catalog/_document_list.html.erb +1 -7
  46. data/app/views/catalog/_email_form.html.erb +42 -16
  47. data/app/views/catalog/_facet_layout.html.erb +1 -1
  48. data/app/views/catalog/_facet_limit.html.erb +1 -1
  49. data/app/views/catalog/_facet_pagination.html.erb +11 -14
  50. data/app/views/catalog/_facets.html.erb +16 -2
  51. data/app/views/catalog/_home.html.erb +2 -2
  52. data/app/views/catalog/_home_text.html.erb +5 -2
  53. data/app/views/catalog/_index_default.html.erb +2 -2
  54. data/app/views/catalog/_marc_view.html.erb +0 -1
  55. data/app/views/catalog/_paginate_compact.html.erb +5 -0
  56. data/app/views/catalog/_per_page_widget.html.erb +13 -7
  57. data/app/views/catalog/_previous_next_doc.html.erb +14 -4
  58. data/app/views/catalog/_refworks_form.html.erb +2 -2
  59. data/app/views/catalog/_results_pagination.html.erb +4 -1
  60. data/app/views/catalog/_search_form.html.erb +19 -13
  61. data/app/views/catalog/_show_default.html.erb +2 -2
  62. data/app/views/catalog/_show_more_like_this.html.erb +3 -0
  63. data/app/views/catalog/_show_sidebar.html.erb +14 -1
  64. data/app/views/catalog/_show_tools.html.erb +18 -18
  65. data/app/views/catalog/_sms_form.html.erb +35 -10
  66. data/app/views/catalog/_sort_and_per_page.html.erb +5 -3
  67. data/app/views/catalog/_sort_widget.html.erb +12 -6
  68. data/app/views/catalog/citation.html.erb +1 -1
  69. data/app/views/catalog/citation.js.erb +7 -0
  70. data/app/views/catalog/email.html.erb +5 -0
  71. data/app/views/catalog/facet.html.erb +28 -21
  72. data/app/views/catalog/index.html.erb +26 -26
  73. data/app/views/catalog/librarian_view.html.erb +7 -0
  74. data/app/views/catalog/show.html.erb +35 -29
  75. data/app/views/catalog/sms.html.erb +5 -0
  76. data/app/views/kaminari/blacklight/_first_page.html.erb +2 -2
  77. data/app/views/kaminari/blacklight/_gap.html.erb +4 -1
  78. data/app/views/kaminari/blacklight/_last_page.html.erb +2 -2
  79. data/app/views/kaminari/blacklight/_next_page.html.erb +3 -3
  80. data/app/views/kaminari/blacklight/_page.html.erb +4 -3
  81. data/app/views/kaminari/blacklight/_paginator.html.erb +5 -5
  82. data/app/views/kaminari/blacklight/_prev_page.html.erb +3 -3
  83. data/app/views/kaminari/blacklight_compact/_next_page.html.erb +9 -0
  84. data/app/views/kaminari/blacklight_compact/_paginator.html.erb +15 -0
  85. data/app/views/kaminari/blacklight_compact/_prev_page.html.erb +9 -0
  86. data/app/views/layouts/blacklight.html.erb +47 -27
  87. data/app/views/saved_searches/index.html.erb +2 -2
  88. data/app/views/search_history/index.html.erb +12 -7
  89. data/app/views/shared/_footer.html.erb +0 -0
  90. data/app/views/shared/_header_navbar.html.erb +25 -0
  91. data/blacklight.gemspec +2 -5
  92. data/config/locales/blacklight.en.yml +23 -15
  93. data/lib/blacklight.rb +2 -2
  94. data/lib/blacklight/catalog.rb +36 -14
  95. data/lib/blacklight/configuration.rb +10 -2
  96. data/lib/blacklight/mash.rb +151 -0
  97. data/lib/blacklight/solr/document.rb +73 -11
  98. data/lib/blacklight/solr/document/extensions.rb +0 -8
  99. data/lib/blacklight/solr/document/marc_export.rb +7 -2
  100. data/lib/blacklight/solr/document/more_like_this.rb +5 -0
  101. data/lib/blacklight/solr_helper.rb +43 -18
  102. data/lib/blacklight/solr_response.rb +60 -0
  103. data/lib/blacklight/solr_response/facets.rb +58 -0
  104. data/lib/blacklight/solr_response/more_like_this.rb +14 -0
  105. data/lib/blacklight/solr_response/spelling.rb +92 -0
  106. data/lib/generators/blacklight/assets_generator.rb +1 -14
  107. data/lib/generators/blacklight/blacklight_generator.rb +22 -21
  108. data/lib/generators/blacklight/jetty_generator.rb +1 -35
  109. data/{test_support → lib/generators/blacklight/templates}/alternate_controller.rb +0 -0
  110. data/lib/generators/blacklight/templates/blacklight.css.scss +4 -0
  111. data/lib/generators/blacklight/templates/config/SolrMarc/config-test.properties +2 -2
  112. data/lib/generators/blacklight/templates/config/jetty.yml +6 -0
  113. data/lib/generators/blacklight/test_support_generator.rb +35 -0
  114. data/lib/railties/all_tests.rake +5 -23
  115. data/lib/railties/blacklight_cucumber.rake +2 -11
  116. data/lib/railties/blacklight_rspec.rake +2 -12
  117. data/test_support/bin/run-tests.sh +1 -1
  118. data/test_support/bin/setup-test-app.sh +123 -0
  119. data/test_support/bin/test.sh +21 -21
  120. data/test_support/features/bookmarks.feature +9 -3
  121. data/test_support/features/saved_searches.feature +3 -3
  122. data/test_support/features/search.feature +3 -3
  123. data/test_support/features/search_filters.feature +24 -26
  124. data/test_support/features/search_history.feature +9 -10
  125. data/test_support/features/search_sort.feature +4 -6
  126. data/test_support/features/step_definitions/general_steps.rb +0 -4
  127. data/test_support/features/step_definitions/search_result_steps.rb +2 -1
  128. data/test_support/features/step_definitions/search_steps.rb +32 -2
  129. data/test_support/spec/controllers/application_controller_spec.rb +8 -0
  130. data/test_support/spec/controllers/catalog_controller_spec.rb +3 -18
  131. data/test_support/spec/helpers/blacklight_helper_spec.rb +116 -20
  132. data/test_support/spec/helpers/catalog_helper_spec.rb +14 -6
  133. data/test_support/spec/helpers/facets_helper_spec.rb +1 -1
  134. data/test_support/spec/lib/blacklight_solr_document_more_like_this_spec.rb +18 -0
  135. data/test_support/spec/lib/blacklight_solr_document_spec.rb +54 -1
  136. data/test_support/spec/lib/blacklight_solr_response_spec.rb +153 -0
  137. data/test_support/spec/lib/facet_paginator_spec.rb +1 -1
  138. data/test_support/spec/lib/marc_export_spec.rb +14 -6
  139. data/test_support/spec/lib/solr_helper_spec.rb +22 -6
  140. data/test_support/spec/models/solr_docment_spec.rb +1 -4
  141. data/test_support/spec/{features → requests}/alternate_controller_spec.rb +3 -2
  142. data/test_support/spec/views/catalog/_facets.html.erb_spec.rb +20 -4
  143. data/test_support/spec/views/catalog/_show_sidebar.erb_spec.rb +25 -0
  144. metadata +53 -131
  145. data/app/assets/javascripts/blacklight/more_facets.js +0 -16
  146. data/app/assets/javascripts/jquery-1.4.2.min.js +0 -154
  147. data/app/assets/javascripts/jquery-ui-1.8.1.custom.min.js +0 -756
  148. data/app/assets/javascripts/jquery.uiExt.ajaxyDialog.js +0 -180
  149. data/app/assets/stylesheets/blacklight/_formatting.css.scss +0 -164
  150. data/app/assets/stylesheets/blacklight/grids/_susy_grid.css.scss +0 -72
  151. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-anim_basic_16x16.gif +0 -0
  152. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png +0 -0
  153. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png +0 -0
  154. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_flat_10_000000_40x100.png +0 -0
  155. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png +0 -0
  156. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png +0 -0
  157. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png +0 -0
  158. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_gloss-wave_35_558fd0_500x100.png +0 -0
  159. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png +0 -0
  160. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png +0 -0
  161. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-icons_222222_256x240.png +0 -0
  162. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-icons_228ef1_256x240.png +0 -0
  163. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-icons_2e4f81_256x240.png +0 -0
  164. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png +0 -0
  165. data/app/assets/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png +0 -0
  166. data/app/assets/stylesheets/jquery/ui-lightness/jquery-ui-1.8.1.custom.css +0 -486
  167. data/app/models/solr_document.rb +0 -5
  168. data/app/views/catalog/email.erb +0 -1
  169. data/app/views/catalog/sms.erb +0 -1
  170. data/doc/Atom-Responses.md +0 -90
  171. data/doc/Blacklight-3.2-Release-Notes-and-Upgrade-Guide.md +0 -191
  172. data/doc/Blacklight-3.3-release-notes-and-upgrade-guide.md +0 -37
  173. data/doc/Blacklight-3.4-release-notes-and-upgrade-guide.md +0 -27
  174. data/doc/Blacklight-3.5-release-notes-and-upgrade-guide.md +0 -44
  175. data/doc/Blacklight-3.6-release-notes-and-upgrade-guide.md +0 -25
  176. data/doc/Blacklight-3.7-release-notes-and-upgrade-guide.md +0 -78
  177. data/doc/Blacklight-3.8-release-notes-and-upgrade-guide.md +0 -11
  178. data/doc/Blacklight-Add-ons.md +0 -28
  179. data/doc/Blacklight-configuration.md +0 -301
  180. data/doc/Blacklight-on-Heroku.md +0 -135
  181. data/doc/Community-principles.md +0 -44
  182. data/doc/Configuring-and-Customizing-Blacklight.md +0 -271
  183. data/doc/Contributing-to-Blacklight.md +0 -25
  184. data/doc/Examples.md +0 -62
  185. data/doc/Extending-or-Modifying-Blacklight-Search-Behavior.md +0 -141
  186. data/doc/Home.md +0 -77
  187. data/doc/How-to-release-a-version.md +0 -37
  188. data/doc/Indexing-your-data-into-solr.md +0 -5
  189. data/doc/Integration-with-Rails-Footnotes.md +0 -20
  190. data/doc/Pagination.md +0 -38
  191. data/doc/Providing-your-own-view-templates.md +0 -109
  192. data/doc/Quickstart.md +0 -116
  193. data/doc/README.md +0 -77
  194. data/doc/README_SOLR.md +0 -245
  195. data/doc/Release-Notes-And-Upgrade-Guides.md +0 -14
  196. data/doc/Sunspot-for-indexing.md +0 -46
  197. data/doc/User-Authentication.md +0 -60
  198. data/doc/testing.md +0 -115
  199. data/lib/generators/blacklight/solr_conf_generator.rb +0 -26
  200. data/lib/generators/blacklight/templates/assets/standard.css.scss +0 -59
  201. data/lib/generators/blacklight/templates/config/blacklight_config.rb +0 -3
  202. data/lib/generators/blacklight/templates/config/compass.rb +0 -2
  203. data/lib/generators/blacklight/templates/solr_conf/schema.xml +0 -689
  204. data/lib/generators/blacklight/templates/solr_conf/solrconfig.xml +0 -1846
  205. data/lib/solrmarc.log.1 +0 -849
  206. data/test_support/spec/controllers/bookmarks_controller_spec.rb +0 -48
@@ -0,0 +1,57 @@
1
+ .css-dropdown {
2
+ list-style: none;
3
+ position: relative;
4
+ margin: -5px 0 0 0;
5
+ display: inline-block;
6
+ li {
7
+ cursor: pointer;
8
+ padding: 5px 10px;
9
+ &:hover, &.hovering {
10
+ border-bottom-left-radius: 0;
11
+ border-bottom-right-radius: 0;
12
+ -webkit-border-bottom-left-radius: 0;
13
+ -webkit-border-bottom-right-radius: 0;
14
+ -moz-border-radius-bottom-left: 0;
15
+ -moz-border-radius-bottom-right: 0;
16
+ & > ul {
17
+ border-top: 1px solid white;
18
+ display: block;
19
+ }
20
+ }
21
+ a:hover {
22
+ display: block;
23
+ text-decoration: none;
24
+ }
25
+ }
26
+ ul {
27
+ list-style: none;
28
+ position: absolute;
29
+ top: 100%;
30
+ left: 0;
31
+ right: 0;
32
+ margin: 0;
33
+ display: none;
34
+ background: white;
35
+ border: 1px solid #cccccc;
36
+ -webkit-border-radius: 4px;
37
+ -moz-border-radius: 4px;
38
+ border-radius: 4px;
39
+ -webkit-border-top-left-radius: 0;
40
+ -moz-border-radius-top-left: 0;
41
+ border-top-left-radius: 0;
42
+ -webkit-border-top-right-radius: 0;
43
+ -moz-border-radius-top-right: 0;
44
+ border-top-right-radius: 0;
45
+ li {
46
+ padding: 0;
47
+ text-align: left;
48
+ &:hover {
49
+ background: whiteSmoke;
50
+ }
51
+ a {
52
+ padding: 5px 10px;
53
+ display: block;
54
+ }
55
+ }
56
+ }
57
+ }
@@ -1,31 +1,26 @@
1
1
  #facets
2
2
  {
3
- font-size:93%;
4
- padding:1em 0 0 1em;
5
-
6
-
7
- h2
8
- {
9
- color:#555;
3
+ div.facet_limit {
4
+ clear: both;
10
5
  }
11
-
12
- h3
13
- {
14
- color:#555;
15
- cursor:pointer;
16
- font-weight:400;
17
- margin-bottom:0;
18
- text-align:justify;
6
+ ul {
7
+ padding-top:0.5em;
8
+ margin-left: 14px;
19
9
  }
20
10
 
21
11
  li
22
12
  {
23
13
  list-style:none;
24
- margin:.3em 0;
25
-
14
+ margin-right:1em;
15
+ padding-bottom:0.3em;
16
+ padding-right: 50px;
17
+ clear: right;
18
+
26
19
  a.remove
27
20
  {
28
21
  color:#666;
22
+ margin-left: 0px;
23
+ padding: 3px 5px;
29
24
  }
30
25
 
31
26
  a:hover
@@ -33,9 +28,16 @@
33
28
  background-color:#eee;
34
29
  }
35
30
 
36
- &.more_facets_link
37
- {
31
+ .count {
38
32
  text-align:right;
33
+ float:right;
34
+ margin-right: -50px;
35
+ }
36
+
37
+ &.more_facets_link {
38
+ text-align:right;
39
+ float:right;
40
+ margin-right: -35px;
39
41
  }
40
42
  }
41
43
 
@@ -46,8 +48,6 @@
46
48
 
47
49
  ul,h3 +div
48
50
  {
49
- border-bottom:1px dotted $dotted_border_color;
50
- margin:0;
51
51
  padding-bottom:1em;
52
52
  }
53
53
  }
@@ -59,49 +59,12 @@
59
59
  text-align:right;
60
60
  }
61
61
 
62
- .next_page, .sort_options .numeric
63
- {
64
- @include border-radius(0 4px 4px 0);
65
- }
66
62
 
67
63
  .prev_next_links
68
64
  {
69
65
  float:left;
70
66
  }
71
67
 
72
- .prev_next_links .disabled
73
- {
74
- background:none;
75
- color:gray;
76
- font-weight:400;
77
- }
78
-
79
- .prev_page,.sort_options .az
80
- {
81
- @include border-radius(4px 0 0 4px);
82
- }
83
-
84
- .sort_options .az, .sort_options .numeric, .next_page,.prev_page
85
- {
86
- background: $facet_extended_button_bg_color;
87
- border:1px solid $facet_extended_button_border_color;
88
- display:inline-block;
89
- font-weight:700;
90
- padding:0.2em 1em;
91
- }
92
-
93
- .sort_options .disabled
94
- {
95
- background-color: $facet_extended_disabled_button_bg_color;
96
- border:1px solid $facet_extended_disabled_border_color;
97
- }
98
-
99
- .sort_options a:hover,.facet_extended_list .prev_next_links a:hover
100
- {
101
- background: $facet_extended_button_hover_bg_color;
102
- border:1px solid $facet_extended_button_hover_border_color;
103
- color: $facet_extended_button_hover_color;
104
- }
105
68
  }
106
69
 
107
70
  ul.facet_extended_list
@@ -114,4 +77,110 @@ ul.facet_extended_list
114
77
  list-style:none;
115
78
  margin:0.5em 0;
116
79
  }
80
+
81
+ .count {
82
+ float:right;
83
+ }
84
+ }
85
+
86
+
87
+ /* Sidenav
88
+ -------------------------------------------------- */
89
+
90
+ .sidenav {
91
+ margin-bottom:1em;
92
+ padding: 0;
93
+ background-color: transparent;
94
+ border: 1px solid $navbarBorder;
95
+ -webkit-border-radius: 6px;
96
+ -moz-border-radius: 6px;
97
+ border-radius: 6px;
98
+ -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065);
99
+ -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065);
100
+ box-shadow: 0 1px 4px rgba(0,0,0,.065);
101
+
102
+ h5, h4 {
103
+ display: block;
104
+ *width: 190px;
105
+ margin: 0 0 -1px;
106
+ padding: 8px 14px;
107
+ }
108
+ h5 {
109
+ cursor: pointer;
110
+ border-top: 1px solid $navbarBorder;
111
+
112
+ }
113
+
114
+ .facet_limit:last-child > h5 {
115
+
116
+ &.twiddle-open {
117
+ @include border-bottom-radius(0px);
118
+ }
119
+
120
+ @include border-bottom-radius(6px);
121
+ }
122
+ /* Chevrons */
123
+ .icon-chevron {
124
+ float: right;
125
+ margin-top: 2px;
126
+ margin-right: -6px;
127
+ opacity: .25;
128
+ }
129
+
130
+ .facet_limit h5:hover {
131
+ background-color: darken($bodyBackground, 10%);
132
+ }
133
+
134
+ .icon-chevron {
135
+ @extend .icon-chevron-right;
136
+ opacity: .5;
137
+ }
138
+
139
+ .twiddle-open .icon-chevron {
140
+ @extend .icon-chevron-down;
141
+ opacity: 1;
142
+ padding-right:2px;
143
+ }
144
+
145
+ /* hide the chevron when js isn't supported */
146
+ .no-js & .icon-chevron {
147
+ @extend .icon-chevron-down;
148
+ padding-right:2px;
149
+ }
150
+
151
+ h5:hover .icon-chevron,
152
+ .twiddle-open .icon-chevron {
153
+ opacity: 1;
154
+ }
155
+ }
156
+
157
+
158
+ #facets .btn-navbar {
159
+ // Navbar button for toggling navbar items in responsive layouts
160
+ // These definitions need to come after '.navbar .btn'
161
+ display: none;
162
+ float: right;
163
+ padding: 7px 10px;
164
+ margin-left: 5px;
165
+ margin-right: 5px;
166
+ @include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5%));
167
+ @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)});
168
+ & .icon-bar {
169
+ display: block;
170
+ width: 18px;
171
+ height: 2px;
172
+ background-color: #f5f5f5;
173
+ @include border-radius(1px);
174
+ @include box-shadow(0 1px 0 rgba(0,0,0,.25));
175
+ }
176
+ & .icon-bar + .icon-bar {
177
+ margin-top: 3px;
117
178
  }
179
+
180
+ }
181
+
182
+ .facet_pagination {
183
+ @extend .clearfix;
184
+ }
185
+
186
+
@@ -0,0 +1,20 @@
1
+ /* This ensures that any tool pop-up goes infront of the header */
2
+ .navbar-fixed-bottom {
3
+ z-index:1000;
4
+ }
5
+
6
+ .navbar-fixed-bottom {
7
+ margin-right:0px;
8
+ position: relative;
9
+ margin-top: 0;
10
+ }
11
+
12
+
13
+
14
+ #footer-title {
15
+ padding-bottom:10px;
16
+ }
17
+
18
+ #footer-row {
19
+ margin-top: 1em;
20
+ }
@@ -4,33 +4,102 @@
4
4
  padding:0;
5
5
  }
6
6
 
7
- h1.site_title
7
+ h2.search
8
8
  {
9
- background:transparent asset_url($logo_image,image) no-repeat top left;
10
- height:35px;
9
+ display:inline;
11
10
  margin:0;
12
- width:120px;
13
-
14
- a
15
- {
16
- border:0;
17
- display:block;
18
- height:35px;
19
- overflow:hidden;
20
- text-decoration:none;
21
- text-indent:-9999px;
22
- width:120px;
11
+ }
12
+
13
+
14
+
15
+ /*
16
+ The main logo image for the Blacklight instance
17
+ */
18
+
19
+
20
+ .navbar .brand {
21
+ width: 150px;
22
+ background:transparent asset_url($logo_image,image) no-repeat top left;
23
+ display: inline-block;
24
+ text-indent: 100%;
25
+ white-space: nowrap;
26
+ overflow: hidden;
27
+ padding-right:0;
28
+ margin-right:20px;
29
+ padding-left: 0;
30
+ }
31
+
32
+
33
+ /*
34
+ Header bar at top (Bootstrap nav-bar)
35
+ */
36
+
37
+ /* This ensures that any tool pop-up goes infront of the header */
38
+ .navbar-fixed-top {
39
+ z-index:1000;
40
+ }
41
+
42
+
43
+ #header-navbar-fixed-top {
44
+ box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
45
+ min-width: 395px;
46
+
47
+ .navbar-inner {
48
+ padding-top: 0.5em;
49
+ padding-bottom: 0.5em;
50
+ }
51
+
52
+
53
+ /*
54
+ Search form is in the header...
55
+ */
56
+ .desktop-search-bar {
57
+ opacity: 1 !important;
58
+ padding-top: 0.5em;
59
+
23
60
  }
24
61
  }
25
62
 
26
- h1.site_title a:link,h1.site_title a:visited,h1.site_title a:hover,h1.site_title a:active
27
- {
28
- border:0;
63
+ #searchbar {
64
+ padding-top:5px;
29
65
  }
30
66
 
31
- h2.search
32
- {
33
- display:inline;
34
- margin:0;
67
+ .search-query-form {
68
+ margin-bottom: 0;
69
+ }
70
+
71
+
72
+
73
+ .btn.search-btn {
74
+ margin-top: 0;
75
+ }
76
+
77
+ .search_field {
78
+ margin-right: 0.5em;
35
79
  }
36
80
 
81
+ .user-util-links {
82
+ text-align: right;
83
+ font-size: 0.9em;
84
+ }
85
+
86
+
87
+ /*
88
+ Selected items needs special css to deal with number of selected items
89
+ */
90
+ #selected-items {
91
+ #desktop-folder-link {
92
+ float:left;
93
+ padding-right:5px;
94
+ }
95
+ #folder {
96
+ float: right;
97
+ padding: 9px 10px 0 0;
98
+ }
99
+ }
100
+
101
+
102
+
103
+
104
+
105
+
@@ -4,15 +4,16 @@
4
4
  {
5
5
  display:none
6
6
  }
7
+
7
8
 
8
- /* Global */
9
- body
10
- {
11
- background: asset_url($background_image,image) repeat-x top left;
12
- background-color: #707070;
13
- font: 0.7em Verdana, "Lucida Grande", "Lucida Sans Unicode", "Arial Unicode MS", Arial, sans-serif;
14
- line-height: 1.4;
15
- margin: 0px;
16
- padding: 15px;
9
+ /* This provides a fixed distance between the header and the main content */
10
+ body {
11
+ padding-top: 6em;
12
+ }
13
+
14
+ /* prevent search bar space from collapsing when there's no search bar */
15
+ .desktop-search-bar, .tablet-search-bar {
16
+ min-height: 1em
17
17
  }
18
18
 
19
+