Merge remote-tracking branch 'upstream/master'

weblab · Oct 8, 2014 · 42f77f7 · 42f77f7
2 parents d505e61 + 2a932d7
commit 42f77f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/favicon.ico b/favicon.ico
diff --git a/header.php b/header.php
@@ -18,6 +18,7 @@
 <!--<![endif]-->
 <head>
 <meta charset="<?php bloginfo( 'charset' ); ?>">
+<link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/favicon.ico" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title><?php wp_title( '|', true, 'right' ); ?></title>

diff --git a/sass/widgets.scss b/sass/widgets.scss
@@ -179,6 +179,15 @@
 		th {
 			white-space:nowrap;		
 		}
+		td{
+			&.uc-output-email{
+				word-break: break-all;
+			}
+			&.uc-output-more{
+				word-break: break-all;
+			}
+
+		}
 	}
 	&.uc-ecw {
 		padding-bottom:$widget-content-margin;