Merge pull request #777 from asaadmahmoodspin/plt-363

plt-363 - Adding organisation theme

web/react/utils/constants.jsx

@@ -134,24 +134,24 @@ module.exports = {
             buttonBg: '#2389d7',
             buttonColor: '#FFFFFF'
         },
-        slack: {
+        organization: {
-            type: 'Slack',
+            type: 'Organization',
-            sidebarBg: '#4D394B',
+            sidebarBg: '#2071a7',
-            sidebarText: '#ab9ba9',
+            sidebarText: '#bfcde8',
-            sidebarUnreadText: '#FFFFFF',
+            sidebarUnreadText: '#fff',
-            sidebarTextHoverBg: '#3e313c',
+            sidebarTextHoverBg: '#136197',
-            sidebarTextHoverColor: '#ab9ba9',
+            sidebarTextHoverColor: '#bfcde8',
-            sidebarTextActiveBg: '#4c9689',
+            sidebarTextActiveBg: '#136197',
             sidebarTextActiveColor: '#FFFFFF',
-            sidebarHeaderBg: '#4D394B',
+            sidebarHeaderBg: '#2f81b7',
             sidebarHeaderTextColor: '#FFFFFF',
-            onlineIndicator: '#4c9689',
+            onlineIndicator: '#7DBE00',
-            mentionBj: '#eb4d5c',
+            mentionBj: '#136197',
-            mentionColor: '#FFFFFF',
+            mentionColor: '#bfcde8',
-            centerChannelBg: '#FFFFFF',
+            centerChannelBg: '#f2f4f8',
             centerChannelColor: '#333333',
-            linkColor: '#2389d7',
+            linkColor: '#2f81b7',
-            buttonBg: '#26a970',
+            buttonBg: '#1dacfc',
             buttonColor: '#FFFFFF'
         },
         dark: {
@@ -165,13 +165,13 @@ module.exports = {
             sidebarTextActiveColor: '#FFFFFF',
             sidebarHeaderBg: '#1B2C3E',
             sidebarHeaderTextColor: '#FFFFFF',
-            onlineIndicator: '#4c9689',
+            onlineIndicator: '#55C5B2',
             mentionBj: '#B74A4A',
             mentionColor: '#FFFFFF',
             centerChannelBg: '#2F3E4E',
             centerChannelColor: '#DDDDDD',
             linkColor: '#A4FFEB',
-            buttonBg: '#2B9C99',
+            buttonBg: '#1dacfc',
             buttonColor: '#FFFFFF'
         }
     },

web/react/utils/utils.jsx

@@ -553,7 +553,6 @@ export function applyTheme(theme) {
         changeCss('.sidebar--left .nav li>h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.8), 1);
         changeCss('.sidebar--left .add-channel-btn:hover, .sidebar--left .add-channel-btn:focus', 'color:' + theme.sidebarText, 1);
         changeCss('.sidebar--left, .sidebar--right .sidebar--right__header', 'border-color:' + changeOpacity(theme.sidebarText, 0.2), 1);
-        changeCss('.sidebar--right .sidebar-right__body', 'border-color:' + changeOpacity(theme.sidebarText, 0.2), 2);
         changeCss('.sidebar--left .status path', 'fill:' + changeOpacity(theme.sidebarText, 0.5), 1);
     }
 
@@ -607,11 +606,12 @@ export function applyTheme(theme) {
     }
 
     if (theme.centerChannelBg) {
-        changeCss('.app__content', 'background:' + theme.centerChannelBg, 1);
+        changeCss('.app__content, .markdown__table, .markdown__table tbody tr', 'background:' + theme.centerChannelBg, 1);
         changeCss('#post-list .post-list-holder-by-time', 'background:' + theme.centerChannelBg, 1);
         changeCss('#post-create', 'background:' + theme.centerChannelBg, 1);
         changeCss('.search-bar__container .search__form .search-bar', 'background:' + theme.centerChannelBg, 1);
         changeCss('.date-separator .separator__text, .new-separator .separator__text', 'background:' + theme.centerChannelBg, 1);
+        changeCss('.post-image__column .post-image__details', 'background:' + theme.centerChannelBg, 1);
         changeCss('.sidebar--right', 'background:' + theme.centerChannelBg, 1);
     }
 
@@ -619,9 +619,14 @@ export function applyTheme(theme) {
         changeCss('.app__content', 'color:' + theme.centerChannelColor, 2);
         changeCss('#post-create', 'color:' + theme.centerChannelColor, 2);
         changeCss('.channel-header .heading', 'color:' + theme.centerChannelColor, 1);
+        changeCss('.markdown__table tbody tr:nth-child(2n)', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
         changeCss('.channel-header__info>div.dropdown .header-dropdown__icon', 'color:' + changeOpacity(theme.centerChannelColor, 0.8), 1);
         changeCss('.channel-header #member_popover', 'color:' + changeOpacity(theme.centerChannelColor, 0.8), 1);
-        changeCss('.custom-textarea', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2) + '!important; color: ' + theme.centerChannelColor, 1);
+        changeCss('.custom-textarea, .custom-textarea:focus, .preview-container .preview-div, .post-image__column .post-image__details, .sidebar--right .sidebar-right__body, .markdown__table th, .markdown__table td', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+        changeCss('.custom-textarea', 'color:' + theme.centerChannelColor, 1);
+        changeCss('.post-image__column', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 2);
+        changeCss('.post-image__column .post-image__details', 'color:' + theme.centerChannelColor, 2);
+        changeCss('.post-image__column a, .post-image__column a:hover, .post-image__column a:focus', 'color:' + theme.centerChannelColor, 1);
         changeCss('.search-bar__container .search__form .search-bar', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2) + '; color: ' + theme.centerChannelColor, 2);
         changeCss('.search-bar__container .search__form', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
         changeCss('.channel-intro .channel-intro__content', 'background:' + changeOpacity(theme.centerChannelColor, 0.05), 1);
@@ -629,7 +634,8 @@ export function applyTheme(theme) {
         changeCss('.date-separator .separator__hr, .new-separator .separator__hr, .post-right__container .post.post--root hr, .search-item-container', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
         changeCss('.channel-intro', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
         changeCss('.post.current--user .post-body, .post.post--comment.other--root.current--user .post-comment', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
-        changeCss('.post.current--user .post-body, .post.post--comment.other--root.current--user .post-comment', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
+        changeCss('.post.current--user .post-body, .post.post--comment.other--root.current--user .post-comment, .post.post--comment.other--root .post-comment, .post.same--root .post-body', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
+        changeCss('@media(max-width: 1440px){.post.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
         changeCss('@media(max-width: 1440px){.post.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
         changeCss('@media(max-width: 1800px){.inner__wrap.move--left .post.post--comment.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
         changeCss('.post:hover, .sidebar--right .sidebar--right__header', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);

web/sass-files/sass/partials/_base.scss

@@ -34,8 +34,14 @@ body {
   }
 }
 
-b, strong {
+.popover {
-  font-weight: 600;
+  color: #333;
+  a {
+    color: $primary-color;
+    &:hover, &:focus {
+      color: $primary-color;
+    }
+  }
 }
 
 a {

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 @@
     }
   }
 }
-

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;
+}

web/sass-files/sass/partials/_mentions.scss

@@ -65,6 +65,7 @@
 
 .mention-highlight {
 	background-color:#fff2bb;
+	color: #333;
 }
 
 .mention-link {

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 {

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;
 		}
 	}