Update cal.scss

sass/cal.scss

@@ -3,23 +3,23 @@
 - - - - - - - - - - - - - - - - - - - */
 #vb {
 	#vb-timespan {
-		
+
 		list-style-type:none;
 		padding:0; 
 		margin:0;
 		font-size:2em;
-		
+
 		.glyphicon-new-window {
 			display:none;	
 		}
 	}
-	
-	
+
+
 }
 #events-grid-wrap {
 	li {
 		margin-bottom:1em!important;
-		
+
 		strong {
 			font-weight:normal;
 		}
@@ -38,36 +38,36 @@
 		padding:0;
 		.uc-cal-item {
 			margin-bottom:1em;	
-			
+
 			.uc-cal-event-title {
 				font-style:normal;
 				margin-left:1em;
 			}
-			
+
 			.glyphicon-new-window {
 				display:none;	
 			}
 		}
 	}
-	
+
 }
 
 
 // Style for Shortcode Calendar 
 #events-table {
-	
+
 	#events-toolbar {
 		margin-bottom:1em;	
-		
+
 		// set a width so that the buttons don't shift between long-named months and short-named months. 
 		#events-month {
 			width:10em;
 		}
 	}
-	
+
 	table {
 		font-size:85%;
-		
+
 		thead {
 			th {
 				width:14%;
@@ -85,51 +85,41 @@
 				opacity:.7;
 			}
 			th.today{
-<<<<<<< HEAD
-<<<<<<< HEAD
-				background: $uc-ecw-month-bg;
-				color: $uc-ecw-month-color;  
-=======
-				background: $uc-shortcal-today-bg;
-				color: $uc-shortcal-today-color;
->>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
-=======
 				background: $uc-shortcal-today-bg;
 				color: $uc-shortcal-today-color;
->>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 			}
 			td {
 				border-top-width:0;
 				padding-top:0;
-				
+
 				a {
 					text-decoration:none;
-					
+
 					&:hover {
 						text-decoration:underline;	
 					}
-					
+
 					strong {
 						font-weight:normal;
 					}
-					
+
 					//every link is external, no need to fly lnk flags here. 
 					.glyphicon {
 						display:none;
 					}
 				}
-				
+
 				.event-list {
 					&+.event-list {
 						margin-top:1em !important;	
 					}
-					
+
 					li+li {
 						margin-top:.5em !important;
 					}
-	
+
 				}
 			}
 		}	
 	}
-}
+}