Fixed compile error

weblab · Jan 28, 2015 · 8e1ac6b · 8e1ac6b
1 parent 8db93a3
commit 8e1ac6b
Show file tree

Hide file tree

Showing 5 changed files with 170 additions and 263 deletions.
diff --git a/sass/test.scss b/sass/test.scss
@@ -1,81 +1,7 @@
-.uc-cal {
-	margin:$widget-content-margin !important;	
-	padding:0 !important;
-}			
 
-// reset all the damn css from the damn plugin damn it. I apologize to future generations for all the !importants. 
-
-.uc-cal * {
-
-	margin: 0 !important;
-	padding: 0!important;
-	border: 0!important;
-	font-size: 100%!important;
-	font: inherit!important;
-	vertical-align: baseline!important;
-	background:none!important;
-	position:inherit!important;
-	width:auto !important;
-	height: auto !important;
-	color:inherit !important;
-	display:block !important;
-	box-shadow:none !important;
-	text-transform:none !important;
-	min-height:inherit !important;
-	border-radius: 0 !important;
-
-}
 
 /*- - - - - */
 
-// SHARED 
-.uc-cal-item {
-	@if $parent == '#megafooter' {
-		margin: $megafooter-ecw-item-margin !important;
-	} else {
-		margin: $ecw-item-margin !important;
-	}
-
-	.uc-cal-event {	
-		position:relative !important;		
-
-		.uc-cal-event-date {
-			float: left !important;
-			position: relative !important;
-			top:0;
-		}
-
-		.uc-cal-event-title {
-			@if $parent == '#megafooter' {
-				color:$megafooter-ecw-title-color !important;	
-			} else {
-				color:$ecw-title-color !important;	
-			}
-		}
-
-		&:hover {
-			.uc-cal-event-title {
-				@if $parent == '#megafooter' {
-					color:$megafooter-ecw-title-color-hover !important;
-				} else {
-					color:$ecw-title-color-hover !important;
-				}
-			}
-		}
-
-
-		&:after {
-			visibility: hidden !important;
-			display: block !important;
-			font-size: 0!important;
-			content: " "!important;
-			clear: both!important;
-			height: 0!important;
-		}
-
-	}
-}
-
 
 /**/
 
@@ -164,12 +90,11 @@
 // LIST VIEW
 .uc-listcal {
 
-		padding-left:$ecw-list-dateWidth !important;
-
-		.uc-cal-event-date {
-			width: $ecw-list-dateWidth !important;
-			left:-($ecw-list-dateWidth) !important;
-			margin-right:-($ecw-list-dateWidth) !important;
-		}
+	padding-left:$ecw-list-dateWidth !important;
+
+	.uc-cal-event-date {
+		width: $ecw-list-dateWidth !important;
+		left:-($ecw-list-dateWidth) !important;
+		margin-right:-($ecw-list-dateWidth) !important;
 	}
-}
+}
diff --git a/sass/variables.scss b/sass/variables.scss
@@ -65,7 +65,7 @@ $widget-head-padding:			.5em .5em .5em 1em 	!default;
 $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 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;
@@ -95,53 +95,76 @@ $megafooter-widget-head-size:			$widget-head-size 			!default;
 // Events Calendar
 
 // SHARED
-$uc-ecw-item-margin: 			1em 0 	!default;
-$uc-ecw-font:					inherit !default;
-$uc-ecw-title-color:			$widget-link-color !default;
-$uc-ecw-title-color-hover: 	$widget-link-hover !default;
+$ecw-item-margin: 			1em 0 	!default;
+$ecw-font:					inherit !default;
+$ecw-title-color:			$widget-link-color !default;
+$ecw-title-color-hover: 	$widget-link-hover !default;
 
 // LIST VIEW
 
-$uc-ecw-list-dateWidth: 3.7em !default;
+$ecw-list-dateWidth: 3.7em !default;
 
-$uc-ecw-list-date-color:			inherit !default;
-$uc-ecw-list-date-color-hover: 	inherit !default;
+$ecw-list-date-color:			inherit !default;
+$ecw-list-date-color-hover: 	inherit !default;
 
 // ICON VIEW
 
-// number only in these ones.. no 'px'
-$uc-ecw-icon-dateWidth: 			55 				!default; 
-$uc-ecw-icon-gutter: 				15 				!default;
-
-$uc-ecw-icon-month-padding: 		.7em 0 0			!default;
-$uc-ecw-icon-month-color: 		inherit			!default;
-$uc-ecw-icon-month-color-hover: 	inherit			!default;
-$uc-ecw-icon-month-bg: 			#FFFFFF		 	!default;
-$uc-ecw-icon-month-bg-hover: 	#000000		 	!default;
-$uc-ecw-icon-month-border-width:			1px 1px 0 !default;
-$uc-ecw-icon-month-border-style: 		solid !default;
-$uc-ecw-icon-month-border-color: $widget-border-color	 !default;
-$uc-ecw-icon-month-border-color-hover: 	$widget-border-color !default;
-$uc-ecw-icon-month-font-size:			70% !default;
-$uc-ecw-icon-month-font-transform:		uppercase !default;
-$uc-ecw-icon-month-font-letter-spacing: 	1px !default;
 
-$uc-ecw-icon-day-padding: 		0 0 .2em 0			!default;
-$uc-ecw-icon-day-color: 			#000000			!default;
-$uc-ecw-icon-day-color-hover: 	#000000			!default;
-$uc-ecw-icon-day-bg: 				#FFFFFF		 	!default;
-$uc-ecw-icon-day-bg-hover: 		#FFFFFF		 	!default;
-$uc-ecw-icon-day-border-width:			0 1px 1px !default;
-$uc-ecw-icon-day-border-style: 			solid !default;
-$uc-ecw-icon-day-border-color: 			$widget-border-color !default;
-$uc-ecw-icon-day-border-color-hover: 	$widget-border-color !default;
-$uc-ecw-icon-day-font-size:				130% !default;
-
-$uc-ecw-time-color: inherit !default;
+// number only in these ones.. no 'px'
+$ecw-icon-dateWidth: 				55 				!default; 
+$ecw-icon-gutter: 				15 				!default;
+
+$ecw-icon-month-padding: 		.7em 0 0			!default;
+$ecw-icon-month-color: 		inherit			!default;
+$ecw-icon-month-color-hover: 	inherit			!default;
+$ecw-icon-month-bg: 			#FFFFFF		 	!default;
+$ecw-icon-month-bg-hover: 	#000000		 	!default;
+$ecw-icon-month-border-width:			1px 1px 0 !default;
+$ecw-icon-month-border-style: 		solid !default;
+$ecw-icon-month-border-color: $widget-border-color	 !default;
+$ecw-icon-month-border-color-hover: 	$widget-border-color !default;
+$ecw-icon-month-font-size:			70% !default;
+$ecw-icon-month-font-transform:		uppercase !default;
+$ecw-icon-month-font-letter-spacing: 	1px !default;
+
+$ecw-icon-day-padding: 		0 0 .2em 0			!default;
+$ecw-icon-day-color: 			#000000			!default;
+$ecw-icon-day-color-hover: 	#000000			!default;
+$ecw-icon-day-bg: 				#FFFFFF		 	!default;
+$ecw-icon-day-bg-hover: 		#FFFFFF		 	!default;
+$ecw-icon-day-border-width:			0 1px 1px !default;
+$ecw-icon-day-border-style: 			solid !default;
+$ecw-icon-day-border-color: 			$widget-border-color !default;
+$ecw-icon-day-border-color-hover: 	$widget-border-color !default;
+$ecw-icon-day-font-size:				130% !default;
+
+$ecw-time-color: inherit !default;
+
+
+/* Megafooter versions of ECW variables. Same as widgets, default to the home/sidebar version, but can be overridden. */
+// SHARED
+$megafooter-ecw-title-color:			$ecw-title-color !default;
+$megafooter-ecw-title-color-hover: 	$ecw-title-color-hover !default;
 
+// LIST VIEW
+$megafooter-ecw-list-date-color:			$ecw-list-date-color !default;
+$megafooter-ecw-list-date-color-hover: 	$ecw-list-date-color-hover !default;
 
+// ICON VIEW
+$megafooter-ecw-icon-month-color: 		$ecw-icon-month-color			!default;
+$megafooter-ecw-icon-month-color-hover: 	$ecw-icon-month-color-hover			!default;
+$megafooter-ecw-icon-month-bg: 			$ecw-icon-month-bg	 	!default;
+$megafooter-ecw-icon-month-bg-hover: 	$ecw-icon-month-bg-hover	 	!default;
+$megafooter-ecw-icon-month-border-color: $ecw-icon-month-border-color	 !default;
+$megafooter-ecw-icon-month-border-color-hover: 	$ecw-icon-month-border-color-hover !default;
 
+$megafooter-ecw-icon-day-color: 			$ecw-icon-day-color			!default;
+$megafooter-ecw-icon-day-color-hover: 	$ecw-icon-day-color-hover		!default;
+$megafooter-ecw-icon-day-bg: 				$ecw-icon-day-bg	 	!default;
+$megafooter-ecw-icon-day-bg-hover: 		$ecw-icon-day-bg-hover		 	!default;
 
+$megafooter-ecw-icon-day-border-color: 			$ecw-icon-day-border-color !default;
+$megafooter-ecw-icon-day-border-color-hover: 	$ecw-icon-day-border-color-hover !default;
 
 
 
@@ -188,143 +211,7 @@ $uc-footer-link-spacing:			1em !default;
 
 @mixin uc-ecw() {
 
-	.uc-cal {
-			margin:$widget-content-margin !important;	
-			padding:0 !important;
-		}
-
-		// reset all the damn css from the damn plugin damnit. 
-		.uc-cal * {
-
-			margin: 0 !important;
-			padding: 0!important;
-			border: 0!important;
-			font-size: 100%!important;
-			font: inherit!important;
-			vertical-align: baseline!important;
-			background:none!important;
-			position:inherit!important;
-			width:auto !important;
-			height: auto !important;
-			color:inherit !important;
-			display:block !important;
-			box-shadow:none !important;
-			text-transform:none !important;
-			min-height:inherit !important;
-			border-radius: 0 !important;
-
-		}
-
-		// SHARED 
-		.uc-cal-item {
-			margin: $uc-ecw-item-margin !important;
-			.uc-cal-event {	
-				position:relative !important;		
-
-
-
-				.uc-cal-event-date {
-					float: left !important;
-					position: relative !important;
-					top:0;
-				}
-
-				.uc-cal-event-title {
-					color:$uc-ecw-title-color !important;	
-				}
-
-				&:hover {
-					.uc-cal-event-title {
-						color:$uc-ecw-title-color-hover !important;	
-					}
-				}
-
-
-				&:after {
-					visibility: hidden !important;
-					display: block !important;
-					font-size: 0!important;
-					content: " "!important;
-					clear: both!important;
-					height: 0!important;
-				}
-
-			}
-		}
-
-
-		// ICON VIEW
-		.uc-iconcal {
-			.uc-cal-list {
-				.uc-cal-item {				
-					.uc-cal-event {						
-						padding-left: #{($uc-ecw-icon-dateWidth + $uc-ecw-icon-gutter)}px !important;
-
-						.uc-cal-event-date {						
-							left:-#{($uc-ecw-icon-dateWidth + $uc-ecw-icon-gutter)}px;
-							margin-right:-#{($uc-ecw-icon-dateWidth)}px !important;
-							width:#{($uc-ecw-icon-dateWidth)}px !important;
-
-							.uc-cal-event-month{
-								padding: $uc-ecw-icon-month-padding !important;
-								border-width:$uc-ecw-icon-month-border-width !important;
-								border-style:$uc-ecw-icon-month-border-style !important;
-								border-color: $uc-ecw-icon-month-border-color !important;
-								text-align:center !important;
-								background-color:$uc-ecw-icon-month-bg !important;
-								font-size:$uc-ecw-icon-month-font-size !important;
-								color: $uc-ecw-icon-month-color!important;
-								text-transform:$uc-ecw-icon-month-font-transform !important;
-								letter-spacing: $uc-ecw-icon-month-font-letter-spacing !important;								
-							}
-							.uc-cal-event-day {
-								padding: $uc-ecw-icon-day-padding !important;
-								border-width:$uc-ecw-icon-day-border-width !important;
-								border-style:$uc-ecw-icon-day-border-style !important;
-								border-color: $uc-ecw-icon-day-border-color !important;
-								text-align:center !important;
-								background-color:$uc-ecw-icon-day-bg !important;
-								font-size:$uc-ecw-icon-day-font-size !important;
-							}
-						}
-						.uc-cal-event-time {
-							color: $uc-ecw-time-color !important;
-						}
-
-						// hover styles
-						&:hover {
-							.uc-cal-event-month{
-
-							}
-							.uc-cal-event-day {
-							}
-							.uc-cal-event-title {
-							}
-							.uc-cal-event-time {
-							}
-						}
-
-					} // cal-event
-
-
-				} //cal-item
-			} // cal-list
-
-
-		} //icon-cal
-
-		// styles unique to list view. 
-		.uc-listcal {
-			.uc-cal-event {
-				padding-left:$uc-ecw-list-dateWidth !important;
-
-				.uc-cal-event-date {
-					width: $uc-ecw-list-dateWidth !important;
-					left:-($uc-ecw-list-dateWidth) !important;
-					margin-right:-($uc-ecw-list-dateWidth) !important;
-				}
-			}
-		}
+
 }
 
 

diff --git a/sass/widgets.scss b/sass/widgets.scss
@@ -469,13 +469,12 @@
 			// LIST VIEW
 			.uc-listcal {
 
-					padding-left:$ecw-list-dateWidth !important;
-
-					.uc-cal-event-date {
-						width: $ecw-list-dateWidth !important;
-						left:-($ecw-list-dateWidth) !important;
-						margin-right:-($ecw-list-dateWidth) !important;
-					}
+				padding-left:$ecw-list-dateWidth !important;
+
+				.uc-cal-event-date {
+					width: $ecw-list-dateWidth !important;
+					left:-($ecw-list-dateWidth) !important;
+					margin-right:-($ecw-list-dateWidth) !important;
 				}
 			}