summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2017-12-12 05:31:06 +0100
committerJules Laplace <julescarbon@gmail.com>2017-12-12 05:31:06 +0100
commit3b0cde84d5186693dd48c9f136a47480b3c23c89 (patch)
tree4c5103400d6f9fc97491f45fed04b742ff0e04ff /public
parent041efed20500c145a639d8303c2a0e770bba4552 (diff)
creating users
Diffstat (limited to 'public')
-rw-r--r--public/assets/css/bucky.css4
-rw-r--r--public/assets/js/lib/views/details/index.js2
-rw-r--r--public/assets/js/vendor/view/formview.js9
3 files changed, 10 insertions, 5 deletions
diff --git a/public/assets/css/bucky.css b/public/assets/css/bucky.css
index 1ba5010..45b2ed0 100644
--- a/public/assets/css/bucky.css
+++ b/public/assets/css/bucky.css
@@ -364,6 +364,7 @@ tr:nth-child(even) td.black { background-color: #eee; border-bottom-color:
margin-bottom: 2px;
background-position: center center;
}
+#comments tr#comment_form + tr .comment,
#comments tr:first-child .comment {
border-top: 1px solid #ccc;
}
@@ -380,8 +381,9 @@ tr:nth-child(even) td.black { background-color: #eee; border-bottom-color:
.comment .body {
font-size: 12px;
line-height: 1.3;
- max-width: 100%;
+ width: 100%;
padding-bottom: 3px;
+ margin-right: 110px;
}
.comment .date {
position: absolute;
diff --git a/public/assets/js/lib/views/details/index.js b/public/assets/js/lib/views/details/index.js
index 871ac62..b10e5cc 100644
--- a/public/assets/js/lib/views/details/index.js
+++ b/public/assets/js/lib/views/details/index.js
@@ -29,7 +29,7 @@ var DetailsView = View.extend({
populate: function(data){
this.data = data
console.log(data)
- set_background_color(data.thread.color || data.keyword.color)
+ set_background_color(data.thread.color || (data.keyword ? data.keyword.color : 'plain'))
$("body").removeClass('loading')
var thread = data.thread
$("h1").html(sanitize(thread.title))
diff --git a/public/assets/js/vendor/view/formview.js b/public/assets/js/vendor/view/formview.js
index 1f681cb..6b03849 100644
--- a/public/assets/js/vendor/view/formview.js
+++ b/public/assets/js/vendor/view/formview.js
@@ -100,11 +100,14 @@ var FormView = View.extend({
dataType: "json",
processData: false,
success: function(response){
- console.log(response)
if (response.error) {
var errors = []
- for (var key in response.error.errors) {
- errors.push(response.error.errors[key].message);
+ if (response.error.errors) {
+ for (var key in response.error.errors) {
+ errors.push(response.error.errors[key].message);
+ }
+ } else {
+ errors.push(response.error)
}
if (errorCallback) {
errorCallback(errors)