Merge pull request #887 from asaadmahmoodspin/plt-375

plt-375 - Making modals compatible with themes

web/react/components/user_settings/premade_theme_chooser.jsx

@@ -24,7 +24,7 @@ export default class PremadeThemeChooser extends React.Component {
 
                 premadeThemes.push(
                     <div
-                        className='col-sm-3 premade-themes'
+                        className='col-xs-6 col-sm-3 premade-themes'
                         key={'premade-theme-key' + k}
                     >
                         <div

web/react/utils/constants.jsx

@@ -179,7 +179,7 @@ module.exports = {
             centerChannelColor: '#DDDDDD',
             newMessageSeparator: '#5de5da',
             linkColor: '#A4FFEB',
-            buttonBg: '#1dacfc',
+            buttonBg: '#4CBBA4',
             buttonColor: '#FFFFFF'
         },
         windows10: {

web/react/utils/utils.jsx

@@ -395,35 +395,39 @@ export function toTitleCase(str) {
 
 export function applyTheme(theme) {
     if (theme.sidebarBg) {
-        changeCss('.sidebar--left', 'background:' + theme.sidebarBg, 1);
+        changeCss('.sidebar--left, .settings-modal .settings-table .settings-links, .sidebar--menu', 'background:' + theme.sidebarBg, 1);
     }
 
     if (theme.sidebarText) {
-        changeCss('.sidebar--left .nav li>a, .sidebar--right', 'color:' + theme.sidebarText, 1);
+        changeCss('.sidebar--left .nav-pills__container li>a, .sidebar--right, .settings-modal .nav-pills>li a, .sidebar--menu', 'color:' + theme.sidebarText, 1);
-        changeCss('.sidebar--left .nav li>h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.8), 1);
+        changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'color:' + theme.sidebarText, 1);
+        changeCss('.sidebar--left .nav-pills__container 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--left .status path', 'fill:' + changeOpacity(theme.sidebarText, 0.5), 1);
+        changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'border-color:' + changeOpacity(theme.sidebarText, 0.2), 2);
     }
 
     if (theme.sidebarUnreadText) {
-        changeCss('.sidebar--left .nav li>a.unread-title', 'color:' + theme.sidebarUnreadText + '!important;', 1);
+        changeCss('.sidebar--left .nav-pills__container li>a.unread-title', 'color:' + theme.sidebarUnreadText + '!important;', 2);
     }
 
     if (theme.sidebarTextHoverBg) {
-        changeCss('.sidebar--left .nav li>a:hover, .sidebar--left .nav li>a:focus', 'background:' + theme.sidebarTextHoverBg, 1);
+        changeCss('.sidebar--left .nav-pills__container li>a:hover, .sidebar--left .nav-pills__container li>a:focus, .settings-modal .nav-pills>li:hover a, .settings-modal .nav-pills>li:focus a', 'background:' + theme.sidebarTextHoverBg, 1);
+        changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li:hover a', 'background:' + theme.sidebarTextHoverBg, 1);
     }
 
     if (theme.sidebarTextHoverColor) {
-        changeCss('.sidebar--left .nav li>a:hover, .sidebar--left .nav li>a:focus', 'color:' + theme.sidebarTextHoverColor, 2);
+        changeCss('.sidebar--left .nav-pills__container li>a:hover, .sidebar--left .nav-pills__container li>a:focus, .settings-modal .nav-pills>li:hover a, .settings-modal .nav-pills>li:focus a', 'color:' + theme.sidebarTextHoverColor, 2);
+        changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li:hover a', 'color:' + theme.sidebarTextHoverColor, 2);
     }
 
     if (theme.sidebarTextActiveBg) {
-        changeCss('.sidebar--left .nav li.active a, .sidebar--left .nav li.active a:hover, .sidebar--left .nav li.active a:focus', 'background:' + theme.sidebarTextActiveBg, 1);
+        changeCss('.sidebar--left .nav-pills__container li.active a, .sidebar--left .nav-pills__container li.active a:hover, .sidebar--left .nav-pills__container li.active a:focus, .settings-modal .nav-pills>li.active a, .settings-modal .nav-pills>li.active a:hover, .settings-modal .nav-pills>li.active a:active', 'background:' + theme.sidebarTextActiveBg, 1);
     }
 
     if (theme.sidebarTextActiveColor) {
-        changeCss('.sidebar--left .nav li.active a, .sidebar--left .nav li.active a:hover, .sidebar--left .nav li.active a:focus', 'color:' + theme.sidebarTextActiveColor, 2);
+        changeCss('.sidebar--left .nav-pills__container li.active a, .sidebar--left .nav-pills__container li.active a:hover, .sidebar--left .nav-pills__container li.active a:focus, .settings-modal .nav-pills>li.active a, .settings-modal .nav-pills>li.active a:hover, .settings-modal .nav-pills>li.active a:active', 'color:' + theme.sidebarTextActiveColor, 2);
     }
 
     if (theme.sidebarHeaderBg) {
@@ -458,45 +462,51 @@ export function applyTheme(theme) {
     }
 
     if (theme.centerChannelBg) {
-        changeCss('.app__content, .markdown__table, .markdown__table tbody tr, .command-box', 'background:' + theme.centerChannelBg, 1);
+        changeCss('.app__content, .markdown__table, .markdown__table tbody tr, .command-box, .modal .modal-content, .mentions-name, .mentions--top .mentions-box', 'background:' + theme.centerChannelBg, 1);
         changeCss('#post-list .post-list-holder-by-time', 'background:' + theme.centerChannelBg, 1);
         changeCss('#post-create', '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);
+        changeCss('.sidebar--right, .dropdown-menu, .popover', 'background:' + theme.centerChannelBg, 1);
     }
 
     if (theme.centerChannelColor) {
-        changeCss('.app__content, .post-create__container .post-create-body .btn-file, .post-create__container .post-create-footer .msg-typing, .loading-screen .loading__content .round, .command-name', 'color:' + theme.centerChannelColor, 1);
+        changeCss('.app__content, .post-create__container .post-create-body .btn-file, .post-create__container .post-create-footer .msg-typing, .loading-screen .loading__content .round, .command-name, .modal .modal-content, .dropdown-menu, .popover, .mentions-name', 'color:' + theme.centerChannelColor, 1);
         changeCss('#post-create', 'color:' + theme.centerChannelColor, 2);
         changeCss('.mentions--top, .command-box', 'box-shadow:' + changeOpacity(theme.centerChannelColor, 0.2) + ' 1px -3px 12px', 3);
         changeCss('.mentions--top, .command-box', '-webkit-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.2) + ' 1px -3px 12px', 2);
         changeCss('.mentions--top, .command-box', '-moz-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.2) + ' 1px -3px 12px', 1);
+        changeCss('.dropdown-menu, .popover ', 'box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 3);
+        changeCss('.dropdown-menu, .popover ', '-webkit-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 2);
+        changeCss('.dropdown-menu, .popover ', '-moz-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 1);
         changeCss('.post-body hr', 'background:' + theme.centerChannelColor, 1);
         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, .custom-textarea:focus, .preview-container .preview-div, .post-image__column .post-image__details, .sidebar--right .sidebar-right__body, .markdown__table th, .markdown__table td, .command-box', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 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, .command-box, .modal .modal-content, .settings-modal .settings-table .settings-content .divider-light, .dropdown-menu, .modal .modal-header, .popover, .mentions--top .mentions-box', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
-        changeCss('.command-name', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+        changeCss('.command-name, .popover .popover-title', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+        changeCss('.dropdown-menu .divider', 'background:' + theme.centerChannelColor, 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('@media(max-width: 768px){.search-bar__container .search__form .search-bar', 'background:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+        changeCss('.search-bar__container .search__form .search-bar', 'background: transparent; color:' + theme.centerChannelColor, 1);
+        changeCss('@media(max-width: 768px){.search-bar__container .search__form .search-bar', 'background:' + changeOpacity(theme.centerChannelColor, 0.2) + '; color: inherit;', 1);
         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);
         changeCss('.date-separator .separator__text', 'color:' + theme.centerChannelColor, 2);
-        changeCss('.date-separator .separator__hr, .post-right__container .post.post--root hr, .search-item-container', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+        changeCss('.date-separator .separator__hr, .modal-footer, .modal .custom-textarea, .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('.modal .custom-textarea:focus', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.3), 1);
+        changeCss('.channel-intro, .settings-modal .settings-table .settings-content .divider-dark, hr, .settings-modal .settings-table .settings-links', '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, .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);
+        changeCss('.post:hover, .sidebar--right .sidebar--right__header, .settings-modal .settings-table .settings-content .section-min:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
-        changeCss('.date-separator.hovered--before:after, .new-separator.hovered--before:after', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
+        changeCss('.date-separator.hovered--before:after, .date-separator.hovered--after:before, .new-separator.hovered--after:before, .new-separator.hovered--before:after', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
-        changeCss('.date-separator.hovered--after:before, .new-separator.hovered--after:before, .command-name:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
+        changeCss('.command-name:hover, .mentions-name:hover, .mentions-focus, .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1);
         changeCss('.post.current--user:hover .post-body ', 'background: none;', 1);
         changeCss('.sidebar--right', 'color:' + theme.centerChannelColor, 2);
     }
@@ -507,7 +517,7 @@ export function applyTheme(theme) {
     }
 
     if (theme.linkColor) {
-        changeCss('a, a:focus, a:hover', 'color:' + theme.linkColor, 1);
+        changeCss('a, a:focus, a:hover, .btn, .btn:focus, .btn:hover', 'color:' + theme.linkColor, 1);
         changeCss('.post .comment-icon__container', 'fill:' + theme.linkColor, 1);
     }
 

web/sass-files/sass/partials/_admin-console.scss

@@ -144,7 +144,6 @@
     }
     .popover {
         border-radius: 3px;
-        border: 1px solid #ccc;
         width: 100%;
         font-size: 0.95em;
     }

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

@@ -42,6 +42,21 @@ body {
       color: $primary-color;
     }
   }
+  .popover-title {
+    background: rgba(black, 0.1);
+  }
+}
+
+.dropdown-menu {
+  .divider {
+    @include opacity(0.15);
+  }
+  > li > a {
+    color: inherit;
+    &:focus, &:hover {
+      color: inherit;
+    }
+  }
 }
 
 .word-break--all {
@@ -68,6 +83,19 @@ a:focus, a:hover {
  margin: 0;
 }
 
+.text-danger {
+  color: #E05F5D;
+}
+
+.btn {
+  &.btn-danger {
+    color: #fff;
+    &:hover, &:active {
+      color: #fff;
+    }
+  }
+}
+
 .form-control {
   @include border-radius(2px);
   &.no-resize {

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

@@ -114,23 +114,6 @@
 				}
 			}
 		}
-		&.theme--black {
-			&:hover {
-				&:before {
-					background: rgba(white, 0.2);
-				}
-			}
-		}
-		&.theme--gray {
-			&:hover {
-				&:before {
-					background: rgba(white, 0.1);
-				}
-			}
-		}
-		a {
-			color: #fff;
-		}
 		.navbar-right {
 			font-size: 0.85em;
 			position: absolute;
@@ -145,7 +128,6 @@
 			.dropdown-menu {
 				li a {
 					padding: 3px 20px;
-					color: #555;
 					text-overflow: ellipsis;
 					overflow: hidden;
 				}

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

@@ -33,13 +33,6 @@
 	line-height: 36px;
 	font-size: 13px;
 	cursor: pointer;
-	&:hover {
-		background-color: #E6F2FA;
-	}
-}
-
-.mentions-focus {
-	background-color: #E6F2FA;
 }
 
 .mentions-text {
@@ -54,7 +47,6 @@
 	display: block;
 	font-size: 20px;
 	text-align: center;
-	color: #555;
 	@include border-radius(32px);
 }
 

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

@@ -9,12 +9,6 @@
 			@include opacity(0.7);
 		}
 	}
-	a, a:focus, a:hover {
-		color: #2389D7;
-		&.text-danger {
-			color: #a94442;
-		}
-	}
 	.custom-textarea {
 		color: inherit;
 		border-color: #ccc;
@@ -25,12 +19,9 @@
 	}
 	.btn {
 		font-size: 13px;
-		&.btn-primary {
+		&.btn-default {
-			background: #4285f4;
+			border: none;
-			&:hover, &:focus, &:active {
+			background: transparent;
-				background: $primary-color--hover;
-				color: #fff;
-			}
 		}
 	}
 	.info__label {
@@ -70,7 +61,7 @@
 		background: $primary-color;
 		color: #FFF;
 		padding: 15px 15px 11px;
-		border: none;
+		border: 1px solid #ddd;
 		min-height: 56px;
 		@include clearfix;
 		.modal-title {

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

@@ -402,12 +402,6 @@
                             margin-left: 7px;
                         }
                     }
-                    &.active, &:hover {
-                        a {
-                            color: #555;
-                            background: #fff;
-                        }
-                    }
                 }
             }
         }

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

@@ -2,7 +2,6 @@
 @import "activity-log";
 
 .user-settings {
-    background: #fff;
     min-height:300px;
     .table-responsive {
         max-width: 560px;
@@ -71,7 +70,7 @@
             }
 
             .section-max {
-                background: #f2f2f2;
+                background: rgba(black, 0.05);
                 padding: 1em 0 1.3em;
                 margin-bottom: 0;
                 @include clearfix;
@@ -121,7 +120,7 @@
                 .fa {
                     margin-right: 7px;
                     font-size: 12px;
-                    color: #aaa;
+                    @include opacity(0.5);
                     display: none;
                 }
             }
@@ -131,7 +130,7 @@
             }
 
             .section-describe {
-                color:grey;
+                @include opacity(0.7);
             }
 
             .divider-dark {
@@ -167,15 +166,11 @@
                     }
                 }
                 .control-label {
-                    color: #555;
                     font-weight: 600;
                     &.text-left {
                         text-align: left;
                     }
                 }
-                hr {
-                    border-color: #ccc;
-                }
             }
 
             .file-status {

web/sass-files/sass/partials/_sidebar--left.scss

@@ -16,12 +16,6 @@
         overflow-y: auto;
         max-width: 200px;
         width: 200px;
-        a {
-            color: #262626 !important;
-            &:hover, &:focus {
-                background: #f5f5f5 !important;
-            }
-        }
     }
     .search__form {
         margin: 0;
@@ -75,7 +69,7 @@
         top: 66px;
     }
     .nav-pills__unread-indicator-bottom {
-        bottom: 0px;
+        bottom: 10px;
     }
 
     .nav {
@@ -98,7 +92,6 @@
                 padding: 3px 10px 3px 25px;
                 line-height: 1.5;
                 border-radius: 0;
-                color: #999;
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
@@ -109,12 +102,8 @@
                     text-decoration: underline;
                 }
                 &.unread-title {
-                    color: #333;
                     font-weight: 600;
                 }
-                &:hover, &:focus {
-                    background: #e6f2fa;
-                }
             }
             &.active {
                 a, a:hover, a:focus {

web/sass-files/sass/partials/_sidebar--menu.scss

@@ -54,7 +54,7 @@
             > a {
                 font-size: 15px;
                 background: none !important;
-                color: #444;
+                color: inherit;
                 line-height: 40px;
                 padding: 0 15px;
                 .glyphicon {