diff options
| -rw-r--r-- | bucky/app/api.js | 9 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/assets/css/hootstream.css | 8 | ||||
| -rw-r--r-- | public/assets/js/lib/views/details/commentform.js | 2 | ||||
| -rw-r--r-- | public/assets/js/lib/views/stream/hootstream.js | 3 |
5 files changed, 11 insertions, 13 deletions
diff --git a/bucky/app/api.js b/bucky/app/api.js index 0645145..dcda5ea 100644 --- a/bucky/app/api.js +++ b/bucky/app/api.js @@ -130,15 +130,6 @@ function route(app) { }); } ); - app.post( - "/api/keyword/new", - bucky.ensureLastlog, - middleware.ensureAuthenticated, - bucky.createKeyword, - function (req, res) { - res.json({ keyword: res.keyword }); - } - ); app.post( "/api/keyword/new", diff --git a/package.json b/package.json index 9590ae4..351c15c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bucky", - "version": "3.0.0", + "version": "4.0.0", "description": "bucky", "main": "index.js", "scripts": { diff --git a/public/assets/css/hootstream.css b/public/assets/css/hootstream.css index b54dad5..7533b2c 100644 --- a/public/assets/css/hootstream.css +++ b/public/assets/css/hootstream.css @@ -425,7 +425,7 @@ .streamForm { width: 100%; - max-width: 720px; + max-width: 960px; padding-left: 4rem; } .streamForm form { @@ -433,15 +433,19 @@ } .streamForm textarea { width: 100%; - height: 5rem; + height: 8rem; font-family: "Trebuchet MS", sans-serif; font-size: 1rem; + line-height: 1.4; padding: 0.5rem; border: 2px solid #211; outline: 0; background: rgba(127, 127, 127, 0.2); color: #fff; } +.streamThread .streamForm textarea { + height: min(42rem, calc(100vh - 15rem)); +} /** HOOT FILTERS */ diff --git a/public/assets/js/lib/views/details/commentform.js b/public/assets/js/lib/views/details/commentform.js index 66add7d..abda1e4 100644 --- a/public/assets/js/lib/views/details/commentform.js +++ b/public/assets/js/lib/views/details/commentform.js @@ -33,7 +33,7 @@ var CommentForm = FormView.extend({ }, keydown: function (e) { - console.log(e.keyCode); + // console.log(e.keyCode); if (e.ctrlKey || e.metaKey || e.altKey) { if (e.keyCode === 83 || e.keyCode === 13) { // "s" or "enter" key diff --git a/public/assets/js/lib/views/stream/hootstream.js b/public/assets/js/lib/views/stream/hootstream.js index ebef14a..cde591c 100644 --- a/public/assets/js/lib/views/stream/hootstream.js +++ b/public/assets/js/lib/views/stream/hootstream.js @@ -320,6 +320,9 @@ var HootStream = View.extend({ }.bind(this) ); this.$hootevents.empty(); + this.$el.toggleClass("streamThread", !!data.query.thread); + this.$el.toggleClass("streamKeyword", !!data.query.username); + this.$el.toggleClass("streamUser", !!data.query.keyword); this.$hootevents.append($els); audio.init(); }, |
