updates

builders · Jun 26, 2012 · 9093bf6 · 9093bf6
1 parent 759fb18
commit 9093bf6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 61 deletions.
diff --git a/www/httpdocs/workspace/themes/active/css/common.css b/www/httpdocs/workspace/themes/active/css/common.css
diff --git a/www/httpdocs/workspace/themes/active/less/common.less b/www/httpdocs/workspace/themes/active/less/common.less
@@ -1233,57 +1233,7 @@ h3 {
 .column-full-width,
 .column-center {
 
-    .row {
-
-    .span4 {
-    	width: 270px;
-        margin-top: @base * 7.2;
-		background: #E9E9E9;
-		padding: 15px;
-
-	    ul, li {
-		    list-style: none;
-		    list-style-type: none;
-	    }
-
-		.entry {
-		    border-bottom: 1px solid #ccc;
-		    padding: @base * 2 0;
-		    margin: 0;
-
-		    &.first {
-			    padding-top: 5px;
-		    }
-
-		    &.last {
-			    border-bottom: none;
-			    padding-bottom: 5px;
-		    }
-
-		    .edit {
-			    display: none;
-		    }
-
-		    a {
-			    .title {
-				    .body-text-serif;
-				    color: #303030;
-				    margin-bottom: 0;	    
-			    }
-			    .frequency {
-				    .small-grey-text;
-				    margin: 0;
-				    text-transform: none;
-			    }
-
-			    &:hover .frequency, &:hover .title {
-					 color: @color-accent;
-			    }
-		    }
-		}
-	}
-
-
+    .row {        
 
 	& > .component-events {
 
@@ -1604,14 +1554,17 @@ h3 {
 
 // recurring events
 
-.layout-meetings {
-	.entries {
+.component-events-recurring {
+
+	ul {
 		list-style: none;
 		list-style-type: none;
+		margin: 0;
 		width: 270px;
 		background: #E9E9E9;
 		padding: 15px;
 		margin-left: 0;
+		margin-top: @base * 3.2;
 
 	    li {
 		    list-style: none;

diff --git a/www/httpdocs/workspace/themes/active/xsl/events.xsl b/www/httpdocs/workspace/themes/active/xsl/events.xsl
@@ -249,12 +249,14 @@
 					<xsl:if test="$position = 'column-full-width' and not($single)">
 						<div class="span4 column-right">
 							<div class="component component-events-recurring">
-								<xsl:for-each select="//events-recurring-all-entries-filtered/entry">
-									<xsl:call-template name="events-entry-column-right">
-										<xsl:with-param name="component" select="$component" />
-										<xsl:with-param name="is-recurring" select="'Yes'" />
-									</xsl:call-template>
-								</xsl:for-each>
+								<ul>
+									<xsl:for-each select="//events-recurring-all-entries-filtered/entry">
+										<xsl:call-template name="events-entry-column-right">
+											<xsl:with-param name="component" select="$component" />
+											<xsl:with-param name="is-recurring" select="'Yes'" />
+										</xsl:call-template>
+									</xsl:for-each>
+								</ul>
 							</div>
 						</div>
 					</xsl:if>
@@ -270,7 +272,6 @@
 
 	<xsl:param name="component" />
 	<xsl:param name="is-recurring" />
-
 	<li class="clearfix">
 		<xsl:call-template name="class-rows" />
 		<a>