8000 Merge 'unencapsulate-css-global-reset' of github.com/tinynumbers/acti… · activeadmin/activeadmin@ec99964 · GitHub
[go: up one dir, main page]
Skip to content

Commit ec99964

Browse files
seanlinsleyseanlinsley
committed
Merge 'unencapsulate-css-global-reset' of github.com/tinynumbers/active_admin
Conflicts: app/assets/stylesheets/active_admin/_base.css.scss lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss
2 parents 0cad913 + 6238c12 commit ec99964

File tree

7 files changed

+39
-64
lines changed

7 files changed

+39
-64
lines changed

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

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,36 @@
11
/* Active Admin CSS */
22
// Reset Away!
3-
body.active_admin {
4-
@include global-reset;
5-
}
3+
@include global-reset;
64

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

37-
body.active_admin {
33+
body {
3834
@include sans-family;
3935
line-height: 150%;
4036
font-size: 72%;

‎app/assets/stylesheets/active_admin/_typography.css.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
// Default font settings. The font-size percentage is of 16px. (0.75 * 16px = 12px) */
2727
html { font-size:100.01%; }
28-
& { font-size: 75%; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
28+
body { font-size: 75%; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
2929

3030
// Headings
3131
h1,h2,h3,h4,h5,h6 {

‎app/assets/stylesheets/active_admin/components/_flash_messages.css.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
&.logged_in {
1+
body.logged_in {
22
.flash {
33
@include gradient(#f7f1d3, #f5edc5);
44
@include text-shadow(#fafafa);
@@ -25,7 +25,7 @@
2525
}
2626
}
2727

28-
&.logged_out {
28+
body.logged_out {
2929
.flash {
3030
@include no-shadow;
3131
@include text-shadow(#fff);

‎app/assets/stylesheets/active_admin/mixins/_icons.css.scss

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
body.active_admin {
2-
span.icon { vertical-align: middle; display: inline-block; }
3-
span.icon svg { vertical-align: baseline; }
4-
}
1+
span.icon { vertical-align: middle; display: inline-block; }
2+
span.icon svg { vertical-align: baseline; }
3+
54

65
@mixin icon-color ($color) {
76
span.icon svg {
@@ -19,6 +18,4 @@ body.active_admin {
1918
@include icon-size($size);
2019
}
2120

22-
body.active_admin {
23-
@include icon-size(0.8em);
24-
}
21+
@include icon-size(0.8em);

‎app/assets/stylesheets/active_admin/pages/_logged_out.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
&.logged_out {
1+
body.logged_out {
22
background: #e8e9ea;
33

44
#content_wrapper{

‎app/assets/stylesheets/active_admin/print.css.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ $text-color: black;
99
@include global-reset;
1010

1111
// Partials
12-
body.active_admin {
13-
@import "active_admin/typography";
14-
}
12+
@import "active_admin/typography";
1513

16-
body.active_admin {
14+
body {
1715
font-family: Helvetica, Arial, sans-serif;
1816
line-height: 150%;
1917
font-size: 72%;
@@ -24,8 +22,6 @@ body.active_admin {
2422
color: $text-color;
2523
}
2624

27-
body.active_admin {
28-
2925
a {
3026
color: $text-color;
3127
text-decoration: none;
@@ -286,5 +282,3 @@ form {
286282
}
287283
}
288284
}
289-
290-
}

‎lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,4 @@
1414
// Overriding any non-variable SASS must be done after the fact.
1515
// For example, to change the default status-tag color:
1616
//
17-
// body.active_admin {
18-
// .status_tag { background: #6090DB; }
19-
// }
20-
//
21-
// Notice that Active Admin CSS rules are nested within a
22-
// 'body.active_admin' selector to prevent conflicts with
23-
// other pages in the app. It is best to wrap your changes in a
24-
// namespace so they are properly recognized. You have options
25-
// if you e.g. want different styles for different namespaces:
26-
//
27-
// .active_admin applies to any Active Admin namespace
28-
// .admin_namespace applies to the admin namespace (eg: /admin)
29-
// .other_namespace applies to a custom namespace named other (eg: /other)
17+
// .status_tag { background: #6090DB; }

0 commit comments

Comments
 (0)
0