Merge remote-tracking branch 'upstream/master'

Conflicts:
	user-people.php

archive.php

@@ -10,11 +10,13 @@
 get_header(); ?>
 <div id="page-archive">
 	<div class="row">
+    <h1>Hello World </h1>
 		<div class="col-sm-9">
 			<section id="primary" class="content-area">
 				<main id="main" class="site-main" role="main">	
 				<?php if ( have_posts() ) : ?>
 					<header class="entry-header">
+
 						<h1 class="page-title">
 							<?php
 								if ( is_category() ) :

content-blank.php

@@ -12,4 +12,4 @@
 	<footer class="entry-footer">
 		<?php edit_post_link( __( 'Edit', 'cs' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-footer -->
-</article><!-- #post-## --> 
+</article><!-- #post-## -->  

sass/_widgets.scss

@@ -226,9 +226,50 @@
 
 
 	.widget {
+		/* === UC People
+		*/
+        &.uc-people-widget {  
+            padding:10px 30px !important;
+
+            .person {
+                padding-right:20px;
+                padding-bottom:20px;
+                padding-top:5px;
+
+                ul {
+                    list-style-type: disc;
+                }
+                ol {
+                    list-style-type: decimal;
+                }
+                a.person-permalink {
+                        h4.person-name {
+                            font-size:19px;
+                        }
+                }
+            }
+
+            h3.group-title {
+                border-bottom: 1px solid #eee;
+                color: #ac0000;
+                padding-bottom: 10px;
+                width: 100%;
+            }
+
+            table {
+                margin-bottom:0px;
+
+                td.person-thumbnail {
+                    img {
+                        max-width: none;
+                    }
+                }
+            }
+
+        }
 		/* === CORE WP Widgets
 		*/
-		&.widget_archive {}
+		&.widget_archive {}   
 		&.widget_nav_menu{}
 		&.widget_meta {}
 		&.widget_recent_comments {}
@@ -277,7 +318,34 @@
 				}
 			}
 			ul, ol {
-				padding-left:4em;
+				padding-left:2em;
+			}
+
+			ul {
+				li {
+					list-style-type: disc;
+				}
+			}
+			ol {
+				li {
+					list-style-type:decimal;
+				}
+			}
+		}
+        &.widget_black-studio-tinymce {
+			.textwidget {
+				@if $parent == "#mega-footer" {
+					margin:$megafooter-widget-content-margin;
+				} @else if $parent == "#maxmegamenu" {
+					margin:$maxmegamenu-widget-content-margin;
+				} @else if $parent == ".subpage" {
+					margin:$subpage-widget-content-margin;
+				} @else {
+					margin:$widget-content-margin;
+				}
+			}
+			ul, ol {
+				padding-left:2em;
 			}
 
 			ul {
@@ -452,7 +520,8 @@
 				}
 			}
 		}
-
+
+
 		// EVENTS CALENDAR WIDGET