6 files changed, 31 insertions, 10 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 592d5e62e..50946ed83 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -34,8 +34,14 @@ body {
   }
 }
 
-b, strong {
-  font-weight: 600;
+.popover {
+  color: #333;
+  a {
+    color: $primary-color;
+    &:hover, &:focus {
+      color: $primary-color;
+    }
+  }
 }
 
 a {
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index 405265f92..6dbb82810 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -157,23 +157,23 @@
     border-left: 1px solid #ddd;
     font-size: 13px;
     padding: 7px;
+    color: #333;
     .post-image__name {
       margin-bottom: 3px;
       display: block;
-      color: #333;
     }
     .post-image__download {
       display: inline-block;
       padding-right: 7px;
       cursor: pointer;
-      color: #555;
+      @include opacity(0.7);
     }
     .post-image__type {
-      color: grey;
+      @include opacity(0.6);
     }
     .post-image__size {
       margin-left: 4px;
-      color: grey;
+      @include opacity(0.6);
     }
   }
   a {
@@ -214,4 +214,3 @@
     }
   }
 }
-
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index bccea6e0e..de92e9d20 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -1,5 +1,5 @@
 .markdown__heading {
-	font-weight: bold;
+	font-weight: 700;
 }
 .markdown__paragraph-inline {
     display: inline;
@@ -32,3 +32,6 @@ pre {
 		color: #c7254e;
 	}
 }
+code {
+	background: #fff;
+}
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index aa893c535..a86cb8a73 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -65,6 +65,7 @@
 
 .mention-highlight {
 	background-color:#fff2bb;
+	color: #333;
 }
 
 .mention-link {
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 38e9b4174..62067c3b8 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -3,6 +3,7 @@
 }
 .modal {
 	width: 100%;
+	color: #333;
 	&.image_modal {
 		.modal-backdrop.in {
 			@include opacity(0.7);
@@ -11,6 +12,14 @@
 	a, a:focus, a:hover {
 		color: #2389D7;
 	}
+	.custom-textarea {
+		color: inherit;
+		border-color: #ccc;
+		&:focus {
+			border-color: #ccc;
+			box-shadow: none;
+		}
+	}
 	.btn.btn-primary {
 		background: #4285f4;
 		&:hover, &:focus, &:active {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index d4f02cf4b..e362e8f7a 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -2,13 +2,17 @@
 	white-space:pre-wrap;
 	word-wrap:break-word;
 	background:transparent;
-	border:1px solid #ccc !important;
+	border:1px solid #ccc;
 	position:absolute;
 	top:0px;
 	height:auto;
 	resize: none;
 	line-height:20px;
 	min-height:36px;
+	&:focus {
+		border-color: #ccc;
+		box-shadow: none;
+	}
 }
 
 .bad-connection {
@@ -235,7 +239,6 @@ body.ios {
 			}
 		}
 		textarea {
-			border: none;
 			box-shadow: none;
 		}
 	}