summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--web/react/components/channel_loader.jsx2
-rw-r--r--web/react/components/post_info.jsx2
-rw-r--r--web/react/components/user_profile.jsx1
-rw-r--r--web/react/utils/utils.jsx3
-rw-r--r--web/sass-files/sass/partials/_markdown.scss38
-rw-r--r--web/sass-files/sass/partials/_mentions.scss4
-rw-r--r--web/sass-files/sass/partials/_post.scss7
-rw-r--r--web/sass-files/sass/partials/_responsive.scss2
-rw-r--r--web/sass-files/sass/partials/_videos.scss9
-rw-r--r--web/templates/channel.html1
10 files changed, 49 insertions, 20 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx
index 39c86405c..ac4f57ce2 100644
--- a/web/react/components/channel_loader.jsx
+++ b/web/react/components/channel_loader.jsx
@@ -84,6 +84,8 @@ export default class ChannelLoader extends React.Component {
});
});
+ $('body').tooltip({selector: '[data-toggle=tooltip]', trigger: 'hover click'});
+
$('body').on('mouseenter mouseleave', '.post', function mouseOver(ev) {
if (ev.type === 'mouseenter') {
$(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after');
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index c38edf6a2..8ad2336fb 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -153,7 +153,9 @@ export default class PostInfo extends React.Component {
<li className='post-header-col'>
<time
className='post-profile-time'
+ data-toggle='tooltip'
title={`${utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}`}
+ data-placement='top'
>
{utils.displayDateTime(post.create_at)}
</time>
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx
index c5d028d31..61bf647ca 100644
--- a/web/react/components/user_profile.jsx
+++ b/web/react/components/user_profile.jsx
@@ -32,7 +32,6 @@ export default class UserProfile extends React.Component {
componentDidMount() {
UserStore.addChangeListener(this.onChange);
$('#profile_' + this.uniqueId).popover({placement: 'right', container: 'body', trigger: 'hover', html: true, delay: {show: 200, hide: 100}});
- $('body').tooltip({selector: '[data-toggle=tooltip]', trigger: 'hover click'});
}
componentWillUnmount() {
UserStore.removeChangeListener(this.onChange);
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 50438c6cf..fba57e8e6 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -616,8 +616,9 @@ export function applyTheme(theme) {
}
if (theme.centerChannelColor) {
- changeCss('.app__content', 'color:' + theme.centerChannelColor, 2);
+ changeCss('.app__content, .post-create__container .post-create-body .btn-file', 'color:' + theme.centerChannelColor, 1);
changeCss('#post-create', 'color:' + theme.centerChannelColor, 2);
+ 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);
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index de92e9d20..122586354 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -2,10 +2,20 @@
font-weight: 700;
}
.markdown__paragraph-inline {
- display: inline;
- + .markdown__paragraph-inline {
- margin-left: 4px;
- }
+ display: inline;
+ + .markdown__paragraph-inline {
+ margin-left: 4px;
+ }
+}
+.post-body {
+ hr {
+ height: 4px;
+ padding: 0;
+ margin: 15px 0 16px;
+ background-color: #e7e7e7;
+ border: 0 none;
+ @include opacity(0.2);
+ }
}
.markdown__table {
background: #fff;
@@ -21,6 +31,26 @@
}
}
}
+blockquote {
+ border: none;
+ position: relative;
+ font-size: 16px;
+ padding: 10px 10px 10px 38px;
+ margin-bottom: 0;
+ &:before {
+ font-family: FontAwesome;
+ font-weight: normal;
+ font-style: normal;
+ display: inline-block;
+ text-decoration: inherit;
+ content: "\f10d";
+ left: 8px;
+ top: 5px;
+ position: absolute;
+ font-size: 20px;
+ @include opacity(0.6);
+ }
+}
pre {
border: none;
background-color: #f7f7f7;
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index a86cb8a73..83cdde53b 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -66,8 +66,4 @@
.mention-highlight {
background-color:#fff2bb;
color: #333;
-}
-
-.mention-link {
- color:$primary-color;
} \ 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 e362e8f7a..a1958af3b 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -185,7 +185,7 @@ body.ios {
.post-create__container {
form {
width: 100%;
- padding: 0 1em;
+ padding: 10px 1em 0 1em;
margin: 0;
}
.post-create-body {
@@ -229,12 +229,13 @@ body.ios {
right: 0;
position: absolute;
top: 1px;
- color: #999;
+ color: #444;
+ @include opacity(0.5);
@include single-transition(all, 0.15s);
font-size: 16px;
padding: 7px 9px 6px;
&:hover, &:active {
- color: #444;
+ @include opacity(0.9);
box-shadow: none;
}
}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index d29c653ff..e0b35d0bf 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -417,7 +417,7 @@
padding: 0 1em;
}
form {
- padding: 0;
+ padding: 10px 0 0 0;
}
.post-create-body {
padding-bottom: 10px;
diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss
index de18aa08a..6d5d929be 100644
--- a/web/sass-files/sass/partials/_videos.scss
+++ b/web/sass-files/sass/partials/_videos.scss
@@ -19,7 +19,7 @@
}
.video-type {
- color:grey;
+ @include opacity(0.8);
font-size:15px;
font-weight:200;
margin:0px;
@@ -27,10 +27,9 @@
}
.video-uploader {
- font-size:15px;
- margin-top:3px;
- margin-bottom:0px;
- padding:0px;
+ font-size: 15px;
+ margin: 18px 0 15px;
+ font-weight: 600;
}
.video-title {
diff --git a/web/templates/channel.html b/web/templates/channel.html
index 2af94e415..b5fe4de01 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -53,7 +53,6 @@
<div id="register_app_modal"></div>
<script>
window.setup_channel_page({{ .Props }});
- $('body').tooltip( {selector: '[data-toggle=tooltip]'} );
$('.modal-body').css('max-height', $(window).height() * 0.7);
$('.modal-body').perfectScrollbar();
</script>
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-30 12:08:50 +0000