Skip to content

Commit

Permalink
New styles for content area widgets, new variables for same.
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Jun 1, 2015
1 parent 1d0ac20 commit b309d22
Show file tree
Hide file tree
Showing 4 changed files with 744 additions and 260 deletions.
11 changes: 6 additions & 5 deletions sass/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
== Content
- - - - - - - - - - - - - - - - - - - */

#content {
@include widgets("#content");
.home #content {
@include widgets(".home #content");
}
.subpage {
@include widgets(".subpage");
}


img {
height: auto;
Expand All @@ -29,8 +31,7 @@ code {
}
}

@include btnReset(".content");

@include btnReset("#page #content .widget");



Expand Down
125 changes: 114 additions & 11 deletions sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ $widget-head-size: $widget-size !default;

/* Megafooter often inverts the tones, so these variables allow you to override teh defaults used in the homepage/sidebars. */

$megafooter-widget-border-color: $widget-border-color !default;
$megafooter-widget-border-radius: $widget-border-radius !default;
$megafooter-widget-border-width: $widget-border-width !default;
$megafooter-widget-margin: $widget-margin !default;
$megafooter-widget-padding: $widget-padding !default;
$megafooter-widget-bg: $widget-bg !default;
$megafooter-widget-content-margin: $widget-content-margin !default;
$megafooter-widget-color: $widget-color !default;
$megafooter-widget-size: $widget-size !default;
$megafooter-widget-link-color: $widget-link-color !default;
$megafooter-widget-link-hover: $widget-link-hover !default;
$megafooter-widget-border-color: $widget-border-color !default;
$megafooter-widget-border-radius: $widget-border-radius !default;
$megafooter-widget-border-width: $widget-border-width !default;
$megafooter-widget-margin: $widget-margin !default;
$megafooter-widget-padding: $widget-padding !default;
$megafooter-widget-bg: $widget-bg !default;
$megafooter-widget-content-margin: $widget-content-margin !default;
$megafooter-widget-color: $widget-color !default;
$megafooter-widget-size: $widget-size !default;
$megafooter-widget-link-color: $widget-link-color !default;
$megafooter-widget-link-hover: $widget-link-hover !default;

$megafooter-widget-head-bg: $widget-head-bg !default;
$megafooter-widget-head-color: $widget-head-color !default;
Expand All @@ -87,6 +87,51 @@ $megafooter-widget-head-padding: $widget-head-padding !default;
$megafooter-widget-head-size: $widget-head-size !default;


/* Subpage widgets */

$subpage-widget-border-color: $widget-border-color !default;
$subpage-widget-border-radius: $widget-border-radius !default;
$subpage-widget-border-width: 0 !default;
$subpage-widget-margin: $widget-margin !default;
$subpage-widget-padding: 0 !default;
$subpage-widget-bg: transparent !default;
$subpage-widget-content-margin: 0 !default;
$subpage-widget-color: $widget-color !default;
$subpage-widget-size: $widget-size !default;
$subpage-widget-link-color: $widget-link-color !default;
$subpage-widget-link-hover: $widget-link-hover !default;

/* not used... panels widgets do not include a head. */
$subpage-widget-head-bg: $widget-head-bg !default;
$subpage-widget-head-color: $widget-head-color !default;
$subpage-widget-head-border-width: $widget-head-border-width !default;
$subpage-widget-head-border-color: $widget-head-border-color !default;
$subpage-widget-head-padding: $widget-head-padding !default;
$subpage-widget-head-size: $widget-head-size !default;


/* Maxmegamenu widgets */

$maxmegamenu-widget-border-color: $widget-border-color !default;
$maxmegamenu-widget-border-radius: $widget-border-radius !default;
$maxmegamenu-widget-border-width: 0 !default;
$maxmegamenu-widget-margin: $widget-margin !default;
$maxmegamenu-widget-padding: $widget-padding !default;
$maxmegamenu-widget-bg: transparent !default;
$maxmegamenu-widget-content-margin: $widget-content-margin !default;
$maxmegamenu-widget-color: $widget-color !default;
$maxmegamenu-widget-size: $widget-size !default;
$maxmegamenu-widget-link-color: $widget-link-color !default;
$maxmegamenu-widget-link-hover: $widget-link-hover !default;

$maxmegamenu-widget-head-bg: $widget-head-bg !default;
$maxmegamenu-widget-head-color: $widget-head-color !default;
$maxmegamenu-widget-head-border-width: $widget-head-border-width !default;
$maxmegamenu-widget-head-border-color: $widget-head-border-color !default;
$maxmegamenu-widget-head-padding: $widget-head-padding !default;
$maxmegamenu-widget-head-size: $widget-head-size !default;




/* Specific Widgets */
Expand Down Expand Up @@ -171,6 +216,64 @@ $megafooter-ecw-time-color: $megafooter-widget-color !default;
$megafooter-ecw-time-color-hover: $megafooter-ecw-title-color-hover !default;


/* Subpage */
// SHARED
$subpage-ecw-title-color: $subpage-widget-link-color !default;
$subpage-ecw-title-color-hover: $subpage-widget-link-hover !default;

// LIST VIEW
$subpage-ecw-list-date-color: $subpage-widget-link-color !default;
$subpage-ecw-list-date-color-hover: $subpage-widget-link-hover !default;

// ICON VIEW
$subpage-ecw-icon-month-color: $subpage-widget-color !default;
$subpage-ecw-icon-month-color-hover: $subpage-widget-color !default;
$subpage-ecw-icon-month-bg: $subpage-widget-bg !default;
$subpage-ecw-icon-month-bg-hover: $subpage-widget-bg !default;
$subpage-ecw-icon-month-border-color: $subpage-widget-border-color !default;
$subpage-ecw-icon-month-border-color-hover: $subpage-widget-border-color !default;

$subpage-ecw-icon-day-color: $subpage-widget-color !default;
$subpage-ecw-icon-day-color-hover: $subpage-widget-color !default;
$subpage-ecw-icon-day-bg: $subpage-widget-bg !default;
$subpage-ecw-icon-day-bg-hover: $subpage-widget-bg !default;

$subpage-ecw-icon-day-border-color: $subpage-widget-border-color !default;
$subpage-ecw-icon-day-border-color-hover: $subpage-widget-border-color !default;

$subpage-ecw-time-color: $subpage-widget-color !default;
$subpage-ecw-time-color-hover: $subpage-ecw-title-color-hover !default;


/* maxmegamenu */
// SHARED
$maxmegamenu-ecw-title-color: $maxmegamenu-widget-link-color !default;
$maxmegamenu-ecw-title-color-hover: $maxmegamenu-widget-link-hover !default;

// LIST VIEW
$maxmegamenu-ecw-list-date-color: $maxmegamenu-widget-link-color !default;
$maxmegamenu-ecw-list-date-color-hover: $maxmegamenu-widget-link-hover !default;

// ICON VIEW
$maxmegamenu-ecw-icon-month-color: $maxmegamenu-widget-color !default;
$maxmegamenu-ecw-icon-month-color-hover: $maxmegamenu-widget-color !default;
$maxmegamenu-ecw-icon-month-bg: $maxmegamenu-widget-bg !default;
$maxmegamenu-ecw-icon-month-bg-hover: $maxmegamenu-widget-bg !default;
$maxmegamenu-ecw-icon-month-border-color: $maxmegamenu-widget-border-color !default;
$maxmegamenu-ecw-icon-month-border-color-hover: $maxmegamenu-widget-border-color !default;

$maxmegamenu-ecw-icon-day-color: $maxmegamenu-widget-color !default;
$maxmegamenu-ecw-icon-day-color-hover: $maxmegamenu-widget-color !default;
$maxmegamenu-ecw-icon-day-bg: $maxmegamenu-widget-bg !default;
$maxmegamenu-ecw-icon-day-bg-hover: $maxmegamenu-widget-bg !default;

$maxmegamenu-ecw-icon-day-border-color: $maxmegamenu-widget-border-color !default;
$maxmegamenu-ecw-icon-day-border-color-hover: $maxmegamenu-widget-border-color !default;

$maxmegamenu-ecw-time-color: $maxmegamenu-widget-color !default;
$maxmegamenu-ecw-time-color-hover: $maxmegamenu-ecw-title-color-hover !default;




/* == Main Content Area */
Expand Down
Loading

0 comments on commit b309d22

Please sign in to comment.