Merge branch 'jem08002-master'

weblab · Feb 3, 2015 · 0b9a65c · 0b9a65c
2 parents 329399c + 14c8262
commit 0b9a65c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/sass/cal.scss b/sass/cal.scss
@@ -84,6 +84,10 @@
 				// opacity so it'll "grey" out whatever the main text color is set to in future themes. 
 				opacity:.7;
 			}
+			th.today{
+				background: $uc-shortcal-today-bg;
+				color: $uc-shortcal-today-color;
+			}
 			td {
 				border-top-width:0;
 				padding-top:0;

diff --git a/sass/variables.scss b/sass/variables.scss
@@ -182,7 +182,8 @@ $comment-top-border: 			#ccc !default;
 $comment-thread-odd: 			#f5f5f5 !default;
 
 
-
+$uc-shortcal-today-bg:		#ccc !default;
+$uc-shortcal-today-color:		#000 !default;
 
 
 

diff --git a/style.css b/style.css
@@ -7779,6 +7779,10 @@ q:before, table q:after {
   font-weight: normal;
   opacity: .7;
 }
+#events-table table tbody th.today {
+  background: #cccccc;
+  color: black;
+}
 #events-table table tbody td {
   border-top-width: 0;
   padding-top: 0;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -182,7 +182,8 @@ $comment-top-border: #ccc !default;
		$comment-thread-odd: #f5f5f5 !default;



		$uc-shortcal-today-bg: #ccc !default;
		$uc-shortcal-today-color: #000 !default;



Expand Down