Permalink
Browse files

Correct the PR

  • Loading branch information...
qha-odoo committed Dec 6, 2018
1 parent 12ab37d commit 0a2f7d3f9254e2c693df9cdd27cc731102234815
@@ -54,16 +54,16 @@ def _get_default_faq(self):
'Welcome Message',
translate=True,
default="""<section class="bg-info shadow">
<div class="container p-5">
<div class="container py-5">
<div class="row">
<div class="col-lg-12">
<h1 class="text-center">Welcome!</h1>
<p class="text-400 text-center col-lg-8 mx-auto">
<p class="text-400 text-center">
This community is for professionals and enthusiasts of our products and services.
<br/>Share and discuss the best content and new marketing ideas, build your professional profile and become a better marketer together.
</p>
</div>
<div class="mt-3 mx-auto">
<div class="col text-center mt-3">
<a href="#" class="js_close_intro btn btn-outline-light">Hide Intro</a>
<a class="btn btn-light forum_register_url" href="/web/login">Register</a>
</div>
@@ -3,8 +3,8 @@ odoo.define('website_forum.website_forum', function (require) {
var core = require('web.core');
var sAnimations = require('website.content.snippets.animation');
var qweb = core.qweb;
var session = require('web.session');
var qweb = core.qweb;
var _t = core._t;
@@ -438,7 +438,6 @@ sAnimations.registry.websiteForum = sAnimations.Class.extend({
* @param {Event} ev
*/
_onCloseNotificationClick: function (ev) {
var session = require('web.session');
if (!session.is_website_user) {
ev.preventDefault();
var $link = $(ev.currentTarget);
@@ -528,15 +527,16 @@ sAnimations.registry.websiteForumSpam = sAnimations.Class.extend({
return this._rpc({
model: 'forum.post',
method: 'search_read',
args: [[
['id', 'in', self.spamIDs],
'|',
['name', 'ilike', toSearch],
['content', 'ilike', toSearch]],
['name', 'content']],
args: [
[['id', 'in', self.spamIDs],
'|',
['name', 'ilike', toSearch],
['content', 'ilike', toSearch]],
['name', 'content']
],
kwargs: {}
}).then(function(o) {
_.each(o, function(r) {
}).then(function (o) {
_.each(o, function (r) {
r.content = $('<p>' + $(r.content).html() + '</p>').text().substring(0, 250);
});
self.$('div.post_spam').html(qweb.render('website_forum.spam_search_name', {
@@ -53,44 +53,33 @@ $bronze: #eea91e;
}
}
.o_count_post_answer {
.o_wforum_post_count_answer_count {
border-left: 3px solid;
}
.validate_answer {
position: absolute;
top: 0;
left: 0;
@include o-position-absolute(0,0,0,0);
height: 100%;
.bg-success {
position: absolute;
top: 0;
left: 0;
@include o-position-absolute(0,0,0,0);
height: 100%;
width: 4px;
}
span {
position: absolute;
top: 10px;
left: -9px;
@include o-position-absolute(10px,0,0,-9px);
font-size: 20px;
i {
padding: 2px 3px;
border-radius: 100%;
}
}
}
.card-header.o_people {
overflow: hidden;
.o_people_photo_container {
position: relative;
}
}
.user_name_people {
font-weight: bold;
max-width: 60%;
}
.o_people_photo_container {
.o_wforum_people_photo_container {
width: 33%;
&.o_edit_profil {
margin: 1rem auto;
@@ -172,17 +161,15 @@ a.no-decoration {
line-height: 1.5;
}
.country_flag {
display: inline-block !important;
display: inline-block;
margin-left: 2px;
max-height: 13px;
width: auto !important;
}
img.country_flag_people {
position: absolute;
top: 0;
right: 0;
max-height: 20px;
@include o-position-absolute(0,0);
max-height: 25px;
width: auto;
}
Oops, something went wrong.

0 comments on commit 0a2f7d3

Please sign in to comment.