summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/react/components/file_upload_overlay.jsx28
-rw-r--r--web/react/components/search_bar.jsx6
-rw-r--r--web/react/utils/constants.jsx12
-rw-r--r--web/react/utils/utils.jsx10
-rw-r--r--web/sass-files/sass/partials/_base.scss2
-rw-r--r--web/sass-files/sass/partials/_popover.scss38
-rw-r--r--web/sass-files/sass/partials/_post.scss15
-rw-r--r--web/sass-files/sass/partials/_responsive.scss21
-rw-r--r--web/sass-files/sass/partials/_settings.scss16
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss15
-rw-r--r--web/static/config/manifest.json2
-rw-r--r--web/static/images/favicon.icobin1379 -> 15708 bytes
-rw-r--r--web/static/images/icon50x50.gifbin2135 -> 0 bytes
-rw-r--r--web/static/images/icon50x50.pngbin0 -> 15502 bytes
-rw-r--r--web/static/images/logo.pngbin15407 -> 23393 bytes
-rw-r--r--web/static/images/redfavicon.icobin1502 -> 15753 bytes
-rw-r--r--web/templates/authorize.html2
17 files changed, 125 insertions, 42 deletions
diff --git a/web/react/components/file_upload_overlay.jsx b/web/react/components/file_upload_overlay.jsx
index d991dd625..dbba00022 100644
--- a/web/react/components/file_upload_overlay.jsx
+++ b/web/react/components/file_upload_overlay.jsx
@@ -12,19 +12,21 @@ export default class FileUploadOverlay extends React.Component {
return (
<div className={overlayClass}>
- <div className='overlay__circle'>
- <img
- className='overlay__files'
- src='/static/images/filesOverlay.png'
- alt='Files'
- />
- <span><i className='fa fa-upload'></i>{'Drop a file to upload it.'}</span>
- <img
- className='overlay__logo'
- src='/static/images/logoWhite.png'
- width='100'
- alt='Logo'
- />
+ <div className='overlay__indent'>
+ <div className='overlay__circle'>
+ <img
+ className='overlay__files'
+ src='/static/images/filesOverlay.png'
+ alt='Files'
+ />
+ <span><i className='fa fa-upload'></i>{'Drop a file to upload it.'}</span>
+ <img
+ className='overlay__logo'
+ src='/static/images/logoWhite.png'
+ width='100'
+ alt='Logo'
+ />
+ </div>
</div>
</div>
);
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index bf12ca160..7540b41a4 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -8,7 +8,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
var utils = require('../utils/utils.jsx');
var Constants = require('../utils/constants.jsx');
var ActionTypes = Constants.ActionTypes;
-var Tooltip = ReactBootstrap.Tooltip;
+var Popover = ReactBootstrap.Popover;
export default class SearchBar extends React.Component {
constructor() {
@@ -163,7 +163,7 @@ export default class SearchBar extends React.Component {
onMouseUp={this.handleMouseInput}
/>
{isSearching}
- <Tooltip
+ <Popover
placement='bottom'
className={helpClass}
>
@@ -176,7 +176,7 @@ export default class SearchBar extends React.Component {
<span>{'Use '}</span><b>{'from:'}</b><span>{' to find posts from specific users and '}</span><b>{'in:'}</b><span>{' to find posts in specific channels'}</span>
</li>
</ul>
- </Tooltip>
+ </Popover>
</form>
</div>
);
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index d891cc48b..7d2626fc1 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -139,7 +139,7 @@ module.exports = {
sidebarText: '#333333',
sidebarUnreadText: '#333333',
sidebarTextHoverBg: '#e6f2fa',
- sidebarTextActiveBg: '#e1e1e1',
+ sidebarTextActiveBorder: '#378FD2',
sidebarTextActiveColor: '#111111',
sidebarHeaderBg: '#2389d7',
sidebarHeaderTextColor: '#ffffff',
@@ -161,7 +161,7 @@ module.exports = {
sidebarText: '#fff',
sidebarUnreadText: '#fff',
sidebarTextHoverBg: '#136197',
- sidebarTextActiveBg: '#136197',
+ sidebarTextActiveBorder: '#7AB0D6',
sidebarTextActiveColor: '#FFFFFF',
sidebarHeaderBg: '#2f81b7',
sidebarHeaderTextColor: '#FFFFFF',
@@ -183,7 +183,7 @@ module.exports = {
sidebarText: '#fff',
sidebarUnreadText: '#fff',
sidebarTextHoverBg: '#4A5664',
- sidebarTextActiveBg: '#39769C',
+ sidebarTextActiveBorder: '#39769C',
sidebarTextActiveColor: '#FFFFFF',
sidebarHeaderBg: '#1B2C3E',
sidebarHeaderTextColor: '#FFFFFF',
@@ -205,7 +205,7 @@ module.exports = {
sidebarText: '#fff',
sidebarUnreadText: '#fff',
sidebarTextHoverBg: '#302e30',
- sidebarTextActiveBg: '#484748',
+ sidebarTextActiveBorder: '#196CAF',
sidebarTextActiveColor: '#FFFFFF',
sidebarHeaderBg: '#1f1f1f',
sidebarHeaderTextColor: '#FFFFFF',
@@ -248,8 +248,8 @@ module.exports = {
uiName: 'Sidebar Text Hover BG'
},
{
- id: 'sidebarTextActiveBg',
- uiName: 'Sidebar Text Active BG'
+ id: 'sidebarTextActiveBorder',
+ uiName: 'Sidebar Text Active Border'
},
{
id: 'sidebarTextActiveColor',
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index c72c3f32c..3d0cee562 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -118,7 +118,7 @@ export function notifyMe(title, body, channel) {
}
if (permission === 'granted') {
- var notification = new Notification(title, {body: body, tag: body, icon: '/static/images/icon50x50.gif'});
+ var notification = new Notification(title, {body: body, tag: body, icon: '/static/images/icon50x50.png'});
notification.onclick = function onClick() {
window.focus();
if (channel) {
@@ -425,18 +425,14 @@ export function applyTheme(theme) {
changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li:hover a', 'background:' + theme.sidebarTextHoverBg, 1);
}
- if (theme.sidebarTextActiveBg) {
- 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.sidebarTextActiveBorder) {
+ changeCss('.sidebar--left .nav li.active a:before, .settings-modal .nav-pills>li.active a:before', 'background:' + theme.sidebarTextActiveBorder, 1);
}
if (theme.sidebarTextActiveColor) {
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.sidebarTextActiveBg === theme.onlineIndicator) {
- changeCss('.sidebar--left .nav-pills__container li.active a .status .online--icon', 'fill:' + theme.sidebarTextActiveColor, 1);
- }
-
if (theme.sidebarHeaderBg) {
changeCss('.sidebar--left .team__header, .sidebar--menu .team__header', 'background:' + theme.sidebarHeaderBg, 1);
changeCss('.modal .modal-header', 'background:' + theme.sidebarHeaderBg, 1);
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index cb5ff67b5..6b2e79933 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -40,6 +40,7 @@ img {
}
.popover {
+ @include border-radius(3px);
color: #333;
&.bottom, &.right, &.top, &.left {
>.arrow:after {
@@ -118,6 +119,7 @@ a:focus, a:hover {
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
cursor: auto;
+ background: rgba(#fff, 0.1);
}
.form-group {
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
index c389ddf7d..484e63c7c 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -21,21 +21,43 @@
}
.search-help-popover {
- transition: opacity 0.3s;
+ visibility: hidden;
+ max-width: none;
+ width: 100%;
+ top: 36px;
+ @include single-transition(opacity, 0.3s, ease-in);
+ font-size: em(13px);
+
+ &.bottom > .arrow {
+ top: -18px;
+ border-width: 9px;
+ left: 30px;
+ }
+
+ .popover-content {
+ padding: 3px 13px;
+ }
h4 {
- text-align: left;
+ font-size: 1em;
}
+
ul {
- padding-left: 2em;
- text-align: left;
+ padding-left: 17px;
+ span {
+ @include opacity(0.8);
+ }
+ strong, b {
+ @include opacity(1);
+ }
}
+
.tooltip-inner {
max-width: 100%;
}
-}
-.search-help-popover.visible {
- opacity: 100;
- transition: opacity 0.3s;
+ &.visible {
+ visibility: visible;
+ @include opacity(1);
+ }
}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 6ecc0d965..db58d0347 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -54,6 +54,7 @@ body.ios {
height: 2em;
margin: 0;
position: relative;
+ z-index: 0;
&:before, &:after {
content: "";
height: 1em;
@@ -116,13 +117,25 @@ body.ios {
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0, 0, 0, 0.6);
text-align: center;
color: #FFF;
font-size: em(20px);
font-weight: 600;
z-index: 6;
+ .overlay__indent {
+ background-color: rgba(0, 0, 0, 0.6);
+ position: relative;
+ height: 100%;
+ @include clearfix;
+ }
+
+ &.center-file-overlay {
+ .overlay__indent {
+ margin-left: 220px;
+ }
+ }
+
&.right-file-overlay {
font-size: em(18px);
.overlay__circle {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index c8bb24f3a..f4e57eec5 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -179,6 +179,22 @@
}
@media screen and (max-width: 1140px) {
+ .inner__wrap {
+ &.move--left {
+ .file-overlay {
+ font-size: em(18px);
+ .overlay__circle {
+ width: 300px;
+ height: 300px;
+ margin: -150px 0 0 -150px;
+ }
+ .overlay__files {
+ margin: 60px auto 15px;
+ width: 150px;
+ }
+ }
+ }
+ }
.post {
.post__content {
width: 100%;
@@ -277,6 +293,11 @@
}
.file-overlay {
font-size: em(18px);
+ &.center-file-overlay {
+ .overlay__indent {
+ margin-left: 0;
+ }
+ }
.overlay__circle {
width: 300px;
height: 300px;
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index bc53dc0e4..9af045f98 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -211,6 +211,22 @@
a {
color: #111;
background-color: #E1E1E1;
+ &:before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 5px;
+ height: 100%;
+ background: #000;
+ }
+ }
+ a, a:hover, a:focus {
+ padding-right: 10px;
+ background-color: rgba(black, 0.1);
+ border-radius: 0;
+ font-weight: 400;
+ position: relative;
}
}
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 585a51f08..ab13d1b42 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -128,12 +128,23 @@
}
}
&.active {
+ a {
+ &:before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 5px;
+ height: 100%;
+ background: #000;
+ }
+ }
a, a:hover, a:focus {
- color: #111;
padding-right: 10px;
- background-color: #e1e1e1;
+ background-color: rgba(black, 0.1);
border-radius: 0;
font-weight: 400;
+ position: relative;
}
}
}
diff --git a/web/static/config/manifest.json b/web/static/config/manifest.json
index 6110122c2..8f29460b3 100644
--- a/web/static/config/manifest.json
+++ b/web/static/config/manifest.json
@@ -2,7 +2,7 @@
"name": "Mattermost",
"icons": [
{
- "src": "../static/iamges/icon50x50.gif",
+ "src": "../static/iamges/icon50x50.png",
"sizes": "50x50",
"type": "image/png"
}
diff --git a/web/static/images/favicon.ico b/web/static/images/favicon.ico
index 0e7d36616..af5505331 100644
--- a/web/static/images/favicon.ico
+++ b/web/static/images/favicon.ico
Binary files differ
diff --git a/web/static/images/icon50x50.gif b/web/static/images/icon50x50.gif
deleted file mode 100644
index d79991a0f..000000000
--- a/web/static/images/icon50x50.gif
+++ /dev/null
Binary files differ
diff --git a/web/static/images/icon50x50.png b/web/static/images/icon50x50.png
new file mode 100644
index 000000000..7ac6ce1c9
--- /dev/null
+++ b/web/static/images/icon50x50.png
Binary files differ
diff --git a/web/static/images/logo.png b/web/static/images/logo.png
index 36c43b94b..423d4d270 100644
--- a/web/static/images/logo.png
+++ b/web/static/images/logo.png
Binary files differ
diff --git a/web/static/images/redfavicon.ico b/web/static/images/redfavicon.ico
index 7f404d1ef..eefefc620 100644
--- a/web/static/images/redfavicon.ico
+++ b/web/static/images/redfavicon.ico
Binary files differ
diff --git a/web/templates/authorize.html b/web/templates/authorize.html
index b0fa3e475..430291676 100644
--- a/web/templates/authorize.html
+++ b/web/templates/authorize.html
@@ -6,7 +6,7 @@
<div class="oauth-prompt">
<div class="prompt__heading">
<div class="prompt__app-icon">
- <img src="/static/images/icon50x50.gif" width="50" height="50" alt="">
+ <img src="/static/images/icon50x50.png" width="50" height="50" alt="">
</div>
<div class="text">An application would like to connect to your {{.Props.TeamName}} account.</div>
</div>
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 08:14:45 +0000