Merge remote-tracking branch 'upstream/master'

weblab · Sep 8, 2014 · d5b85b0 · d5b85b0
2 parents 8283536 + 7cdaa69
commit d5b85b0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/css/titlebar.css b/css/titlebar.css
@@ -73,3 +73,7 @@
 #site-title .searchform .form-group .form-control {
   width: 150px;
 }
+
+.lte7.form-control {
+  width: 20px;
+}
diff --git a/css/uup.css b/css/uup.css
@@ -58,12 +58,21 @@
 /*
 	 Profile Page
 */
+.uup-user {
+  padding: 1em;
+}
 .uup-user > span {
   display: block;
 }
+.uup-user .uup-image {
+  margin-bottom: 1em;
+}
 .uup-user .uup-name {
   font-weight: bold;
 }
 .uup-user .uup-name .uup-first:after {
   content: ' ';
 }
+.uup-user .uup-phones .uup-phone2 {
+  display: block;
+}
diff --git a/sass/titlebar.scss b/sass/titlebar.scss
@@ -67,6 +67,9 @@
 				width:150px;
 			}
 		}
-
 	}
 }
+// IE Fixes 
+.lte7.form-control {
+	width:20px;
+}
diff --git a/sass/uup.scss b/sass/uup.scss
@@ -100,10 +100,13 @@
 	 Profile Page
 */
 .uup-user {
+	padding: 1em;
 	& > span {
 		display:block;
 	}
-
+	.uup-image{
+		margin-bottom:1em;
+	}
 	.uup-name {
 		font-weight:bold;
 
@@ -118,7 +121,9 @@
 	}
 	.uup-phones {
 		.uup-phone1 {}
-		.uup-phone2 {}
+		.uup-phone2 {
+			display:block;
+		}
 	}
 	.uup-email {
 	}
@@ -131,4 +136,3 @@
 	.uup-mailing-address {
 	}	
 }
-
diff --git a/style.css b/style.css
@@ -6809,6 +6809,10 @@ button.close {
   width: 150px;
 }
 
+.lte7.form-control {
+  width: 20px;
+}
+
 /*	NAV
 --------------------------------------------------------------*/
 #nav-secondary {
@@ -7689,15 +7693,24 @@ q:before, table q:after {
 /*
 	 Profile Page
 */
+.uup-user {
+  padding: 1em;
+}
 .uup-user > span {
   display: block;
 }
+.uup-user .uup-image {
+  margin-bottom: 1em;
+}
 .uup-user .uup-name {
   font-weight: bold;
 }
 .uup-user .uup-name .uup-first:after {
   content: ' ';
 }
+.uup-user .uup-phones .uup-phone2 {
+  display: block;
+}
 
 /* - - - - - - - - - - - - - - - - - - - 
 	== Calendar