Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unencapsulate css global reset #1952

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 28 additions & 32 deletions app/assets/stylesheets/active_admin/_base.css.scss
Original file line number Diff line number Diff line change
@@ -1,39 +1,35 @@
/* Active Admin CSS */
// Reset Away!
body.active_admin {
@include global-reset;
}
@include global-reset;

// Partials
body.active_admin {
@import "active_admin/typography";
@import "active_admin/header";
@import "active_admin/forms";
@import "active_admin/components/comments";
@import "active_admin/components/flash_messages";
@import "active_admin/components/date_picker";
@import "active_admin/components/popovers";
@import "active_admin/components/tables";
@import "active_admin/components/batch_actions";
@import "active_admin/components/blank_slates";
@import "active_admin/components/breadcrumbs";
@import "active_admin/components/dropdown_menu";
@import "active_admin/components/buttons";
@import "active_admin/components/grid";
@import "active_admin/components/links";
@import "active_admin/components/pagination";
@import "active_admin/components/panels";
@import "active_admin/components/columns";
@import "active_admin/components/scopes";
@import "active_admin/components/status_tags";
@import "active_admin/components/table_tools";
@import "active_admin/components/index_list";
@import "active_admin/pages/dashboard";
@import "active_admin/pages/logged_out";
@import "active_admin/structure/footer";
@import "active_admin/structure/main_structure";
@import "active_admin/structure/title_bar";
}
@import "active_admin/typography";
@import "active_admin/header";
@import "active_admin/forms";
@import "active_admin/components/comments";
@import "active_admin/components/flash_messages";
@import "active_admin/components/date_picker";
@import "active_admin/components/popovers";
@import "active_admin/components/tables";
@import "active_admin/components/batch_actions";
@import "active_admin/components/blank_slates";
@import "active_admin/components/breadcrumbs";
@import "active_admin/components/dropdown_menu";
@import "active_admin/components/buttons";
@import "active_admin/components/grid";
@import "active_admin/components/links";
@import "active_admin/components/pagination";
@import "active_admin/components/panels";
@import "active_admin/components/columns";
@import "active_admin/components/scopes";
@import "active_admin/components/status_tags";
@import "active_admin/components/table_tools";
@import "active_admin/components/index_list";
@import "active_admin/pages/dashboard";
@import "active_admin/pages/logged_out";
@import "active_admin/structure/footer";
@import "active_admin/structure/main_structure";
@import "active_admin/structure/title_bar";

body.active_admin {
@include sans-family;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/active_admin/_typography.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

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

// Headings
h1,h2,h3,h4,h5,h6 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
&.logged_in {
body.logged_in {
.flash {
@include gradient(#f7f1d3, #f5edc5);
@include text-shadow(#fafafa);
Expand All @@ -25,7 +25,7 @@
}
}

&.logged_out {
body.logged_out {
.flash {
@include no-shadow;
@include text-shadow(#fff);
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/active_admin/pages/_logged_out.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
&.logged_out {
body.logged_out {
background: #e8e9ea;

#content_wrapper{
Expand Down
10 changes: 2 additions & 8 deletions app/assets/stylesheets/active_admin/print.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ $text-color: black;
@include global-reset;

// Partials
body.active_admin {
@import "active_admin/typography";
}
@import "active_admin/typography";

body.active_admin {
body {
font-family: Helvetica, Arial, sans-serif;
line-height: 150%;
font-size: 72%;
Expand All @@ -24,8 +22,6 @@ body.active_admin {
color: $text-color;
}

body.active_admin {

a {
color: $text-color;
text-decoration: none;
Expand Down Expand Up @@ -286,5 +282,3 @@ form {
}
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,5 @@
// Overriding any non-variable SASS must be done after the fact.
// For example, to change the default status-tag color:
//
// body.active_admin {
// .status_tag { background: #6090DB; }
// }
//
// Notice that Active Admin CSS rules are nested within a
// 'body.active_admin' selector to prevent conflicts with
// other pages in the app. It is best to wrap your changes in a
// namespace so they are properly recognized. You have options
// if you e.g. want different styles for different namespaces:
//
// .active_admin applies to any Active Admin namespace
// .admin_namespace applies to the admin namespace (eg: /admin)
// .other_namespace applies to a custom namespace named other (eg: /other)
// .status_tag { background: #6090DB; }