Merge pull request #197 from asaadmahmoodspin/master

MM-1401 - Removing most inline styles and other UI changes

9 files changed, 54 insertions, 9 deletions

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 8f4ff7b60..1fb970075 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -10,6 +10,9 @@ body {
   height: 100%;
   &.white {
     background: #fff;
+    > .container-fluid {
+      overflow: auto;
+    }
     .inner__wrap {
       > .row.content {
         min-height: 100%;
@@ -53,6 +56,9 @@ div.theme {
 
 .form-control {
   @include border-radius(2px);
+  &.no-resize {
+    resize: none;
+  }
 }
 
 .form-group {
@@ -127,7 +133,7 @@ div.theme {
 }
 
 .glyphicon-refresh-animate {
-    @include animation(spin .7s infinite linear);
+  @include animation(spin .7s infinite linear);
 }
 
 .black-bg {
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index c584c240d..56d03e171 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -32,6 +32,7 @@
     }
   }
   .preview-img {
+      display: block;
       height: auto;
       max-width: 100%;
   }
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 338f5ceb4..d876d8b37 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -95,11 +95,7 @@
 				}
 			}
 			.dropdown__icon {
-				background: url("../images/dropdown-icon.png");
-				width: 4px;
-				height: 16px;
-				@include background-size(100% 100%);
-				display: inline-block;
+				fill: #fff;
 			}
 		}
 		.user__picture {
@@ -163,7 +159,7 @@
 	#member_popover {
 		width: 45px;
 		color: #999;
-
+		cursor: pointer;
 	}
 	&.alt {
 		margin: 0;
@@ -230,3 +226,21 @@
 		top: 1px;
 	}
 }
+
+.channel-header__links {
+	height: 32px;
+	vertical-align: top;
+	display: inline-block;
+	width: 15px;
+	margin: 9px 3px 3px 0;
+	&:hover {
+		svg {
+			fill: #888;
+		}
+	}
+	svg {
+		vertical-align: top;
+		margin-top: 8px;
+		fill: #AAA;
+	}
+}
\ No newline at end of file
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 707e71cf0..1b0338884 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -154,6 +154,7 @@
 			background: #FFF;
 			position: relative;
 			max-width: 90%;
+			min-height: 50px;
 			min-width: 280px;
 			@include border-radius(3px);
 			display: table;
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
new file mode 100644
index 000000000..fa1b44841
--- /dev/null
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -0,0 +1,9 @@
+.user-popover {
+	cursor: pointer;
+	display: inline-block;
+}
+
+.user-popover__image {
+	margin: 0 0 10px;
+	@include border-radius(128px);
+}
\ No newline at end of file
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 40ed40b49..465c50296 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -425,4 +425,4 @@ body.ios {
 			width: 40px;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index e01739240..1f9643175 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -413,7 +413,7 @@
         }
     }
     .footer, .footer-pane, .footer-push {
-        height: 185px;
+        height: auto;
     }
     .footer-pane {
         .footer-link {
@@ -574,6 +574,8 @@
     .modal {
         .modal-image {
             .image-wrapper {
+                font-size: 12px;
+                max-width: 280px;
                 .modal-close {
                     @include opacity(1);
                 }
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index af759c650..e60bc290e 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -1,6 +1,10 @@
 .user-settings {
     background: #fff;
     min-height:300px;
+    .table-responsive {
+        max-width: 560px;
+        max-height: 300px;
+    }
 }
 
 .settings-modal {
diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss
index a0e82fd2f..d02a92448 100644
--- a/web/sass-files/sass/partials/_sidebar--right.scss
+++ b/web/sass-files/sass/partials/_sidebar--right.scss
@@ -10,6 +10,14 @@
     &.move--left {
         right: 0;
     }
+    .sidebar--right__back {
+        color: #666;
+        width: 20px;
+        text-align: center;
+        margin: 0 0 0 -6px;
+        font-size: 12px;
+        display: inline-block;
+    }
     .sidebar-right__body {
         border-left: $border-gray;
         border-top: $border-gray;