8000 Include print styles in main stylesheet (#6922) · activeadmin/activeadmin@f083634 · GitHub
[go: up one dir, main page]
Skip to content

Commit f083634

Browse files
deivid-rodriguezjavierjulio
deivid-rodriguez
and
javierjulio
authored
Include print styles in main stylesheet (#6922)
No need to do this separately which makes an extra http request, plus this has the benefit of delaying print styles until needed. I’ve been doing this for a long time now and as its been well supported to include print styles using a media block. The HTML5 Boilerplate has stressed this as a good default approach for many years now. https://github.com/h5bp/html5-boilerplate/blob/c9f88cc79d380150e4e2e39e3c2deccfe8aa3d8c/dist/css/style.css#L189-L193 Co-authored-by: Javier Julio <jjfutbol@gmail.com>
1 parent 455210a commit f083634

File tree

4 files changed

+45
-40
lines changed

4 files changed

+45
-40
lines changed

‎app/assets/stylesheets/active_admin/_base.scss

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,47 @@
11
/* Active Admin CSS */
2-
// Normalize
3-
@import "./normalize";
2+
@media screen {
3+
// Normalize
4+
@import "./normalize";
45

5-
// Partials
6-
@import "./typography";
7-
@import "./header";
8-
@import "./forms";
9-
@import "./components/comments";
10-
@import "./components/flash_messages";
11-
@import "./components/date_picker";
12-
@import "./components/tables";
13-
@import "./components/batch_actions";
14-
@import "./components/modal_dialog";
15-
@import "./components/blank_slates";
16-
@import "./components/breadcrumbs";
17-
@import "./components/dropdown_menu";
18-
@import "./components/buttons";
19-
@import "./components/grid";
20-
@import "./components/links";
21-
@import "./components/pagination";
22-
@import "./components/panels";
23-
@import "./components/columns";
24-
@import "./components/scopes";
25-
@import "./components/status_tags";
26-
@import "./components/table_tools";
27-
@import "./components/index_list";
28-
@import "./components/unsupported_browser";
29-
@import "./components/tabs";
30-
@import "./pages/ 8000 logged_out";
31-
@import "./structure/footer";
32-
@import "./structure/main_structure";
33-
@import "./structure/title_bar";
6+
// Partials
7+
@import "./typography";
8+
@import "./header";
9+
@import "./forms";
10+
@import "./components/comments";
11+
@import "./components/flash_messages";
12+
@import "./components/date_picker";
13+
@import "./components/tables";
14+
@import "./components/batch_actions";
15+
@import "./components/modal_dialog";
16+
@import "./components/blank_slates";
17+
@import "./components/breadcrumbs";
18+
@import "./components/dropdown_menu";
19+
@import "./components/buttons";
20+
@import "./components/grid";
21+
@import "./components/links";
22+
@import "./components/pagination";
23+
@import "./components/panels";
24+
@import "./components/columns";
25+
@import "./components/scopes";
26+
@import "./components/status_tags";
27+
@import "./components/table_tools";
28+
@import "./components/index_list";
29+
@import "./components/unsupported_browser";
30+
@import "./components/tabs";
31+
@import "./pages/logged_out";
32+
@import "./structure/footer";
33+
@import "./structure/main_structure";
34+
@import "./structure/title_bar";
3435

35-
body {
36-
@include sans-family;
37-
line-height: 1.5;
38-
font-size: 72%;
39-
background: $body-background-color;
40-
color: $text-color;
36+
body {
37+
@include sans-family;
38+
line-height: 1.5;
39+
font-size: 72%;
40+
background: $body-background-color;
41+
color: $text-color;
42+
}
43+
}
44+
45+
@media print {
46+
@import "./print";
4147
}

‎app/assets/stylesheets/active_admin/print.scss renamed to ‎app/assets/stylesheets/active_admin/_print.scss

File renamed without changes.

‎features/step_definitions/asset_steps.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Then /^I should see the css file "([^"]*)"$/ do |path|
2-
step %{I should see the css file "#{path}" of media "screen"}
2+
step %{I should see the css file "#{path}" of media "all"}
33
end
44

55
Then /^I should see the css file "([^"]*)" of media "([^"]*)"$/ do |path, media|

‎lib/active_admin/application.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ def controllers_for_filters
164164
private
165165

166166
def register_default_assets
167-
register_stylesheet "active_admin.css", media: "screen"
168-
register_stylesheet "active_admin/print.css", media: "print"
167+
register_stylesheet "active_admin.css", media: "all"
169168
register_javascript "active_admin.js"
170169
end
171170

0 commit comments

Comments
 (0)
0