Merge https://github.com/redmatrix/redmatrix into pending_merge

3 files changed, 23 insertions, 16 deletions

diff --git a/view/css/default.css b/view/css/default.css
index e1edc2cbf..f0c89a087 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -17,6 +17,7 @@ main {
 aside {
 	display: table-cell;
 	vertical-align: top;
+	padding: 80px 7px 0px 7px;
 
 }
 
@@ -24,4 +25,17 @@ section {
 	width: 100%;
 	display: table-cell;
 	vertical-align: top;
+	padding: 80px 7px 200px 7px;
+}
+
+@media screen and (max-width: 767px) {
+
+	section {
+		padding: 65px 7px 200px 7px;
+	}
+
+	aside#region_1 {
+		padding: 65px 7px 0px 7px;
+	}
+
 }
diff --git a/view/css/mod_display.css b/view/css/mod_display.css
new file mode 100644
index 000000000..dde242d4e
--- /dev/null
+++ b/view/css/mod_display.css
@@ -0,0 +1,3 @@
+#jot-popup {
+	display: none;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a44cf331c..939b9cf54 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -28,17 +28,12 @@ aside#region_1 {
 	width: $aside_widthpx;
 	min-width: $aside_widthpx;
 	max-width: $aside_widthpx;
-	padding: 80px 7px 0px 7px;
 }
 
 main {
 	max-width: $main_widthpx;
 }
 
-section {
-	padding: 80px 7px 200px 7px;
-}
-
 h1, .h1, h2, .h2 {
 	font-size: 1.667em;
 }
@@ -421,13 +416,18 @@ footer {
 
 #profile-photo-wrapper img {
 	width: 100%;
+	height: 100%;
 	max-width: 300px;
-	height: auto;
+	max-height: 300px;
 }
 
 #profile-photo-wrapper {
+	width: 251px;
+	height: 251px;
 	margin-top: -10px;
 	margin-bottom: 10px;
+	border: 1px solid #ccc;
+	border-radius: $radiuspx;
 }
 
 
@@ -519,7 +519,6 @@ footer {
 	display: block;
 }
 
-
 .pager {
   padding: 10px;
   text-align: center;
@@ -585,10 +584,6 @@ footer {
     margin-left: 5px;
 }
 
-.photo {
-    border: 1px solid #ccc;
-}
-
 .photo-top-photo, .photo-album-photo {
  /*   padding: 10px;
     max-width: 300px;
@@ -2125,14 +2120,9 @@ nav .badge.mail-update:hover {
 
 @media screen and (max-width: 767px) {
 
-	section {
-		padding: 65px 7px 200px 7px;
-	}
-
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
 		border-right: 1px solid $nav_bd;
-		padding: 65px 7px 0px 7px;
 	}
 
 	main {