diff --git a/less/categories.less b/less/categories.less index 7bc8288..7b73232 100644 --- a/less/categories.less +++ b/less/categories.less @@ -35,7 +35,6 @@ line-height: 22px; margin: 0; margin-left: 62px; - width: 85%; strong { color: @gray-dark; diff --git a/less/category.less b/less/category.less index f9e950e..d5c003b 100644 --- a/less/category.less +++ b/less/category.less @@ -50,7 +50,6 @@ .transition(.2s ease-in-out opacity); } - width: 50px; float: left; } @@ -70,8 +69,13 @@ font-size: 10px; background: lighten(@gray-lighter, 2.5%); padding: 5px; + white-space: nowrap; } } + + .fa-stack { + font-size: 90%; + } } &:last-child li { @@ -84,6 +88,8 @@ font-weight: bold; } } + + } .category, .categories, .subcategory { diff --git a/less/mobile.less b/less/mobile.less index 3a45f44..448a70c 100644 --- a/less/mobile.less +++ b/less/mobile.less @@ -1,8 +1,17 @@ -#menu { + +.slideout-menu { + position: fixed; + left: auto; + top: 0; + bottom: 0; + right: 0; + z-index: 0; + width: 256px; + overflow-y: auto; + -webkit-overflow-scrolling: touch; display: none; } - @media (max-width: 980px) { body { padding-top: 0; @@ -20,6 +29,7 @@ } #menu { + padding-top: 100px; background-color: #1D1F20; background-image: linear-gradient(145deg, #1D1F20, #404348); @@ -69,7 +79,7 @@ .counter { font-style: normal; - + &:after { left: 5px; top: -1px; @@ -120,19 +130,6 @@ } } - .slideout-menu { - position: fixed; - left: auto; - top: 0; - bottom: 0; - right: 0; - z-index: 0; - width: 256px; - overflow-y: auto; - -webkit-overflow-scrolling: touch; - display: none; - } - .slideout-panel { position: relative; z-index: 1; @@ -148,7 +145,7 @@ .slideout-open .slideout-menu { display: block; } - + .slideout-open { overflow-y: hidden; height: 100%; diff --git a/less/topic.less b/less/topic.less index 36a1b2b..ce04f0d 100644 --- a/less/topic.less +++ b/less/topic.less @@ -2,7 +2,7 @@ h1 { line-height: 40px; margin-bottom: 30px; - + .topic-title { font-size: 28px; color:inherit; @@ -64,6 +64,19 @@ right: 25px; } + .bookmarked { + position: absolute; + top: 1px; + padding-top: 3px; + border-radius: 4px; + right: 72px; + font-size: 10px; + padding-bottom: 4px; + background: darken(@brand-info, 20%); + opacity: 0; + .transition(0.75s ease-in-out opacity); + } + [component="post/upvote"], [component="post/downvote"] { color: @gray-light; } @@ -110,9 +123,10 @@ .post-tools { text-transform: lowercase; - :before { + a::before { content: "\2022\0020"; } + a { .pointer; } @@ -241,13 +255,17 @@ border-color: darken(@brand-info, 20%); box-shadow: 0px 0px 1px @brand-info; } + + &.highlight .bookmarked { + opacity: 1; + } } .content { .fix-lists; blockquote { - font-size: 85%; + font-size: 12px; } > blockquote { @@ -305,6 +323,25 @@ } } } + + .pagination-block { + position: fixed; + width: 100%; + background-color: #eee; + bottom: 0px; + left: 0px; + z-index: 100; + + .wrapper { + padding: 5px 0px 5px 0px; + } + .progress-bar { + background-color: @brand-info; + display:block; + z-index: -1; + position: absolute; + } + } } .thread_active_users { diff --git a/lib/modules/slideout.min.js b/lib/modules/slideout.min.js index e381bf0..ba1afcf 100644 --- a/lib/modules/slideout.min.js +++ b/lib/modules/slideout.min.js @@ -1 +1,485 @@ -!function(t){var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.Slideout=t()}(function(){var t,e,n;return function i(t,e,n){function o(s,a){if(!e[s]){if(!t[s]){var u=typeof require=="function"&&require;if(!a&&u)return u(s,!0);if(r)return r(s,!0);var f=new Error("Cannot find module '"+s+"'");throw f.code="MODULE_NOT_FOUND",f}var l=e[s]={exports:{}};t[s][0].call(l.exports,function(e){var n=t[s][1][e];return o(n?n:e)},l,l.exports,i,t,e,n)}return e[s].exports}var r=typeof require=="function"&&require;for(var s=0;st._tolerance?t.open():t.close()}t._moved=false});this.panel.addEventListener(l.move,function(e){if(s||t._preventOpen||typeof e.touches==="undefined"){return}var n=e.touches[0].clientX-t._startOffsetX;var i=t._currentOffsetX=n;if(Math.abs(i)>t._padding){return}if(Math.abs(n)>20){t._opening=true;var o=n*t._orientation;if(t._opened&&o>0||!t._opened&&o<0){return}if(o<=0){i=n+t._padding*t._orientation;t._opening=false}if(!t._moved&&u.className.search("slideout-open")===-1){u.className+=" slideout-open"}t.panel.style[p+"transform"]=t.panel.style.transform="translate3d("+i+"px, 0, 0)";t.emit("translate",i);t._moved=true}})};e.exports=d},{decouple:2,emitter:3}],2:[function(t,e,n){"use strict";var i=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||function(t){window.setTimeout(t,1e3/60)}}();function o(t,e,n){var o,r=false;function s(t){o=t;a()}function a(){if(!r){i(u);r=true}}function u(){n.call(t,o);r=false}t.addEventListener(e,s,false)}e.exports=o},{}],3:[function(t,e,n){"use strict";var i=function(t,e){if(!(t instanceof e)){throw new TypeError("Cannot call a class as a function")}};n.__esModule=true;var o=function(){function t(){i(this,t)}t.prototype.on=function e(t,n){this._eventCollection=this._eventCollection||{};this._eventCollection[t]=this._eventCollection[t]||[];this._eventCollection[t].push(n);return this};t.prototype.once=function n(t,e){var n=this;function i(){n.off(t,i);e.apply(this,arguments)}i.listener=e;this.on(t,i);return this};t.prototype.off=function o(t,e){var n=undefined;if(!this._eventCollection||!(n=this._eventCollection[t])){return this}n.forEach(function(t,i){if(t===e||t.listener===e){n.splice(i,1)}});if(n.length===0){delete this._eventCollection[t]}return this};t.prototype.emit=function r(t){var e=this;for(var n=arguments.length,i=Array(n>1?n-1:0),o=1;o self._tolerance) ? self.open() : self.close(); + } + self._moved = false; + }; + this.panel.addEventListener(touch.end, this._onTouchEndFn); + + /** + * Translates panel on touchmove + */ + this._onTouchMoveFn = function(eve) { + self.emit('touchmove', eve.target); + if (scrolling || self._preventOpen || typeof eve.touches === 'undefined') { return; } + + var dif_x = eve.touches[0].clientX - self._startOffsetX; + var translateX = self._currentOffsetX = dif_x; + + if (Math.abs(translateX) > self._padding) { return; } + + if (Math.abs(dif_x) > 20) { + self._opening = true; + + var oriented_dif_x = dif_x * self._orientation; + if (self._opened && oriented_dif_x > 0 || !self._opened && oriented_dif_x < 0) { return; } + if (oriented_dif_x <= 0) { + translateX = dif_x + self._padding * self._orientation; + self._opening = false; + } + + if (!self._moved && html.className.search('slideout-open') === -1) { + html.className += ' slideout-open'; + } + + self.panel.style[prefix + 'transform'] = self.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)'; + self.emit('translate', translateX, eve.target); + self._moved = true; + } + + }; + this.panel.addEventListener(touch.move, this._onTouchMoveFn); +}; + +Slideout.prototype.enableTouch = function() { + this._touch = true; + return this; +}; + +Slideout.prototype.disableTouch = function() { + this._touch = false; + return this; +}; + +Slideout.prototype.destroy = function() { + // Close before clean + this.close(); + + // Remove event listeners + doc.removeEventListener(touch.move, this._preventMove); + this.panel.removeEventListener(touch.start, this._resetTouchFn); + this.panel.removeEventListener('touchcancel', this._onTouchCancelFn); + this.panel.removeEventListener(touch.end, this._onTouchEndFn); + this.panel.removeEventListener(touch.move, this._onTouchMoveFn); + doc.removeEventListener('scroll', this._onScrollFn); + + // Remove methods + this.open = this.close = function() {}; + + // Return the instance so it can be easily dereferenced + return this; +}; + +/** + * Expose Slideout + */ +module.exports = Slideout; + +},{"decouple":2,"emitter":3}],2:[function(require,module,exports){ +'use strict'; + +var requestAnimFrame = (function() { + return window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + function (callback) { + window.setTimeout(callback, 1000 / 60); + }; +}()); + +function decouple(node, event, fn) { + var eve, + tracking = false; + + function captureEvent(e) { + eve = e; + track(); + } + + function track() { + if (!tracking) { + requestAnimFrame(update); + tracking = true; + } + } + + function update() { + fn.call(node, eve); + tracking = false; + } + + node.addEventListener(event, captureEvent, false); + return captureEvent; +} + +/** + * Expose decouple + */ +module.exports = decouple; + +},{}],3:[function(require,module,exports){ +"use strict"; + +var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }; + +exports.__esModule = true; +/** + * Creates a new instance of Emitter. + * @class + * @returns {Object} Returns a new instance of Emitter. + * @example + * // Creates a new instance of Emitter. + * var Emitter = require('emitter'); + * + * var emitter = new Emitter(); + */ + +var Emitter = (function () { + function Emitter() { + _classCallCheck(this, Emitter); + } + + /** + * Adds a listener to the collection for the specified event. + * @memberof! Emitter.prototype + * @function + * @param {String} event - The event name. + * @param {Function} listener - A listener function to add. + * @returns {Object} Returns an instance of Emitter. + * @example + * // Add an event listener to "foo" event. + * emitter.on('foo', listener); + */ + + Emitter.prototype.on = function on(event, listener) { + // Use the current collection or create it. + this._eventCollection = this._eventCollection || {}; + + // Use the current collection of an event or create it. + this._eventCollection[event] = this._eventCollection[event] || []; + + // Appends the listener into the collection of the given event + this._eventCollection[event].push(listener); + + return this; + }; + + /** + * Adds a listener to the collection for the specified event that will be called only once. + * @memberof! Emitter.prototype + * @function + * @param {String} event - The event name. + * @param {Function} listener - A listener function to add. + * @returns {Object} Returns an instance of Emitter. + * @example + * // Will add an event handler to "foo" event once. + * emitter.once('foo', listener); + */ + + Emitter.prototype.once = function once(event, listener) { + var self = this; + + function fn() { + self.off(event, fn); + listener.apply(this, arguments); + } + + fn.listener = listener; + + this.on(event, fn); + + return this; + }; + + /** + * Removes a listener from the collection for the specified event. + * @memberof! Emitter.prototype + * @function + * @param {String} event - The event name. + * @param {Function} listener - A listener function to remove. + * @returns {Object} Returns an instance of Emitter. + * @example + * // Remove a given listener. + * emitter.off('foo', listener); + */ + + Emitter.prototype.off = function off(event, listener) { + + var listeners = undefined; + + // Defines listeners value. + if (!this._eventCollection || !(listeners = this._eventCollection[event])) { + return this; + } + + listeners.forEach(function (fn, i) { + if (fn === listener || fn.listener === listener) { + // Removes the given listener. + listeners.splice(i, 1); + } + }); + + // Removes an empty event collection. + if (listeners.length === 0) { + delete this._eventCollection[event]; + } + + return this; + }; + + /** + * Execute each item in the listener collection in order with the specified data. + * @memberof! Emitter.prototype + * @function + * @param {String} event - The name of the event you want to emit. + * @param {...Object} data - Data to pass to the listeners. + * @returns {Object} Returns an instance of Emitter. + * @example + * // Emits the "foo" event with 'param1' and 'param2' as arguments. + * emitter.emit('foo', 'param1', 'param2'); + */ + + Emitter.prototype.emit = function emit(event) { + var _this = this; + + for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + args[_key - 1] = arguments[_key]; + } + + var listeners = undefined; + + // Defines listeners value. + if (!this._eventCollection || !(listeners = this._eventCollection[event])) { + return this; + } + + // Clone listeners + listeners = listeners.slice(0); + + listeners.forEach(function (fn) { + return fn.apply(_this, args); + }); + + return this; + }; + + return Emitter; +})(); + +/** + * Exports Emitter + */ +exports["default"] = Emitter; +module.exports = exports["default"]; +},{}]},{},[1])(1) +}); +//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","index.js","node_modules/decouple/index.js","node_modules/emitter/dist/index.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7RA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\n/**\n * Module dependencies\n */\nvar decouple = require('decouple');\nvar Emitter = require('emitter');\n\n/**\n * Privates\n */\nvar scrollTimeout;\nvar scrolling = false;\nvar doc = window.document;\nvar html = doc.documentElement;\nvar msPointerSupported = window.navigator.msPointerEnabled;\nvar touch = {\n  'start': msPointerSupported ? 'MSPointerDown' : 'touchstart',\n  'move': msPointerSupported ? 'MSPointerMove' : 'touchmove',\n  'end': msPointerSupported ? 'MSPointerUp' : 'touchend'\n};\nvar prefix = (function prefix() {\n  var regex = /^(Webkit|Khtml|Moz|ms|O)(?=[A-Z])/;\n  var styleDeclaration = doc.getElementsByTagName('script')[0].style;\n  for (var prop in styleDeclaration) {\n    if (regex.test(prop)) {\n      return '-' + prop.match(regex)[0].toLowerCase() + '-';\n    }\n  }\n  // Nothing found so far? Webkit does not enumerate over the CSS properties of the style object.\n  // However (prop in style) returns the correct value, so we'll have to test for\n  // the precence of a specific property\n  if ('WebkitOpacity' in styleDeclaration) { return '-webkit-'; }\n  if ('KhtmlOpacity' in styleDeclaration) { return '-khtml-'; }\n  return '';\n}());\nfunction extend(destination, from) {\n  for (var prop in from) {\n    if (from[prop]) {\n      destination[prop] = from[prop];\n    }\n  }\n  return destination;\n}\nfunction inherits(child, uber) {\n  child.prototype = extend(child.prototype || {}, uber.prototype);\n}\n\n/**\n * Slideout constructor\n */\nfunction Slideout(options) {\n  options = options || {};\n\n  // Sets default values\n  this._startOffsetX = 0;\n  this._currentOffsetX = 0;\n  this._opening = false;\n  this._moved = false;\n  this._opened = false;\n  this._preventOpen = false;\n  this._touch = options.touch === undefined ? true : options.touch && true;\n\n  // Sets panel\n  this.panel = options.panel;\n  this.menu = options.menu;\n\n  // Sets  classnames\n  if(this.panel.className.search('slideout-panel') === -1) { this.panel.className += ' slideout-panel'; }\n  if(this.menu.className.search('slideout-menu') === -1) { this.menu.className += ' slideout-menu'; }\n\n\n  // Sets options\n  this._fx = options.fx || 'ease';\n  this._duration = parseInt(options.duration, 10) || 300;\n  this._tolerance = parseInt(options.tolerance, 10) || 70;\n  this._padding = this._translateTo = parseInt(options.padding, 10) || 256;\n  this._orientation = options.side === 'right' ? -1 : 1;\n  this._translateTo *= this._orientation;\n\n  // Init touch events\n  if (this._touch) {\n    this._initTouchEvents();\n  }\n}\n\n/**\n * Inherits from Emitter\n */\ninherits(Slideout, Emitter);\n\n/**\n * Opens the slideout menu.\n */\nSlideout.prototype.open = function() {\n  var self = this;\n  this.emit('beforeopen');\n  if (html.className.search('slideout-open') === -1) { html.className += ' slideout-open'; }\n  this._setTransition();\n  this._translateXTo(this._translateTo);\n  this._opened = true;\n  setTimeout(function() {\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = '';\n    self.emit('open');\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Closes slideout menu.\n */\nSlideout.prototype.close = function() {\n  var self = this;\n  if (!this.isOpen() && !this._opening) { return this; }\n  this.emit('beforeclose');\n  this._setTransition();\n  this._translateXTo(0);\n  this._opened = false;\n  setTimeout(function() {\n    html.className = html.className.replace(/ slideout-open/, '');\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = self.panel.style[prefix + 'transform'] = self.panel.style.transform = '';\n    self.emit('close');\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Toggles (open/close) slideout menu.\n */\nSlideout.prototype.toggle = function() {\n  return this.isOpen() ? this.close() : this.open();\n};\n\n/**\n * Returns true if the slideout is currently open, and false if it is closed.\n */\nSlideout.prototype.isOpen = function() {\n  return this._opened;\n};\n\n/**\n * Translates panel and updates currentOffset with a given X point\n */\nSlideout.prototype._translateXTo = function(translateX) {\n  this._currentOffsetX = translateX;\n  this.panel.style[prefix + 'transform'] = this.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n};\n\n/**\n * Set transition properties\n */\nSlideout.prototype._setTransition = function() {\n  this.panel.style[prefix + 'transition'] = this.panel.style.transition = prefix + 'transform ' + this._duration + 'ms ' + this._fx;\n};\n\n/**\n * Initializes touch event\n */\nSlideout.prototype._initTouchEvents = function() {\n  var self = this;\n\n  /**\n   * Decouple scroll event\n   */\n  this._onScrollFn = decouple(doc, 'scroll', function() {\n    if (!self._moved) {\n      clearTimeout(scrollTimeout);\n      scrolling = true;\n      scrollTimeout = setTimeout(function() {\n        scrolling = false;\n      }, 250);\n    }\n  });\n\n  /**\n   * Prevents touchmove event if slideout is moving\n   */\n  this._preventMove = function(eve) {\n    if (self._moved) {\n      eve.preventDefault();\n    }\n  };\n  doc.addEventListener(touch.move, this._preventMove);\n\n  /**\n   * Resets values on touchstart\n   */\n  this._resetTouchFn = function(eve) {\n    if (typeof eve.touches === 'undefined') { return; }\n\n    self._moved = false;\n    self._opening = false;\n    self._startOffsetX = eve.touches[0].pageX;\n    self._preventOpen = (!self._touch || (!self.isOpen() && self.menu.clientWidth !== 0));\n  };\n  this.panel.addEventListener(touch.start, this._resetTouchFn);\n\n  /**\n   * Resets values on touchcancel\n   */\n  this._onTouchCancelFn = function() {\n    self._moved = false;\n    self._opening = false;\n  };\n  this.panel.addEventListener('touchcancel', this._onTouchCancelFn);\n\n  /**\n   * Toggles slideout on touchend\n   */\n  this._onTouchEndFn = function() {\n    if (self._moved) {\n      (self._opening && Math.abs(self._currentOffsetX) > self._tolerance) ? self.open() : self.close();\n    }\n    self._moved = false;\n  };\n  this.panel.addEventListener(touch.end, this._onTouchEndFn);\n\n  /**\n   * Translates panel on touchmove\n   */\n  this._onTouchMoveFn = function(eve) {\n\n    if (scrolling || self._preventOpen || typeof eve.touches === 'undefined') { return; }\n\n    var dif_x = eve.touches[0].clientX - self._startOffsetX;\n    var translateX = self._currentOffsetX = dif_x;\n\n    if (Math.abs(translateX) > self._padding) { return; }\n\n    if (Math.abs(dif_x) > 20) {\n      self._opening = true;\n\n      var oriented_dif_x = dif_x * self._orientation;\n      if (self._opened && oriented_dif_x > 0 || !self._opened && oriented_dif_x < 0) { return; }\n      if (oriented_dif_x <= 0) {\n        translateX = dif_x + self._padding * self._orientation;\n        self._opening = false;\n      }\n\n      if (!self._moved && html.className.search('slideout-open') === -1) {\n        html.className += ' slideout-open';\n      }\n\n      self.panel.style[prefix + 'transform'] = self.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n      self.emit('translate', translateX);\n      self._moved = true;\n    }\n\n  };\n  this.panel.addEventListener(touch.move, this._onTouchMoveFn);\n};\n\nSlideout.prototype.enableTouch = function() {\n  this._touch = true;\n  return this;\n};\n\nSlideout.prototype.disableTouch = function() {\n  this._touch = false;\n  return this;\n};\n\nSlideout.prototype.destroy = function() {\n  // Close before clean\n  this.close();\n\n  // Remove event listeners\n  doc.removeEventListener(touch.move, this._preventMove);\n  this.panel.removeEventListener(touch.start, this._resetTouchFn);\n  this.panel.removeEventListener('touchcancel', this._onTouchCancelFn);\n  this.panel.removeEventListener(touch.end, this._onTouchEndFn);\n  this.panel.removeEventListener(touch.move, this._onTouchMoveFn);\n  doc.removeEventListener('scroll', this._onScrollFn);\n\n  // Remove methods\n  this.open = this.close = function() {};\n  \n  // Return the instance so it can be easily dereferenced  \n  return this;\n};\n\n/**\n * Expose Slideout\n */\nmodule.exports = Slideout;\n","'use strict';\n\nvar requestAnimFrame = (function() {\n  return window.requestAnimationFrame ||\n    window.webkitRequestAnimationFrame ||\n    function (callback) {\n      window.setTimeout(callback, 1000 / 60);\n    };\n}());\n\nfunction decouple(node, event, fn) {\n  var eve,\n      tracking = false;\n\n  function captureEvent(e) {\n    eve = e;\n    track();\n  }\n\n  function track() {\n    if (!tracking) {\n      requestAnimFrame(update);\n      tracking = true;\n    }\n  }\n\n  function update() {\n    fn.call(node, eve);\n    tracking = false;\n  }\n\n  node.addEventListener(event, captureEvent, false);\n  return captureEvent;\n}\n\n/**\n * Expose decouple\n */\nmodule.exports = decouple;\n","\"use strict\";\n\nvar _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } };\n\nexports.__esModule = true;\n/**\n * Creates a new instance of Emitter.\n * @class\n * @returns {Object} Returns a new instance of Emitter.\n * @example\n * // Creates a new instance of Emitter.\n * var Emitter = require('emitter');\n *\n * var emitter = new Emitter();\n */\n\nvar Emitter = (function () {\n  function Emitter() {\n    _classCallCheck(this, Emitter);\n  }\n\n  /**\n   * Adds a listener to the collection for the specified event.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The event name.\n   * @param {Function} listener - A listener function to add.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Add an event listener to \"foo\" event.\n   * emitter.on('foo', listener);\n   */\n\n  Emitter.prototype.on = function on(event, listener) {\n    // Use the current collection or create it.\n    this._eventCollection = this._eventCollection || {};\n\n    // Use the current collection of an event or create it.\n    this._eventCollection[event] = this._eventCollection[event] || [];\n\n    // Appends the listener into the collection of the given event\n    this._eventCollection[event].push(listener);\n\n    return this;\n  };\n\n  /**\n   * Adds a listener to the collection for the specified event that will be called only once.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The event name.\n   * @param {Function} listener - A listener function to add.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Will add an event handler to \"foo\" event once.\n   * emitter.once('foo', listener);\n   */\n\n  Emitter.prototype.once = function once(event, listener) {\n    var self = this;\n\n    function fn() {\n      self.off(event, fn);\n      listener.apply(this, arguments);\n    }\n\n    fn.listener = listener;\n\n    this.on(event, fn);\n\n    return this;\n  };\n\n  /**\n   * Removes a listener from the collection for the specified event.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The event name.\n   * @param {Function} listener - A listener function to remove.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Remove a given listener.\n   * emitter.off('foo', listener);\n   */\n\n  Emitter.prototype.off = function off(event, listener) {\n\n    var listeners = undefined;\n\n    // Defines listeners value.\n    if (!this._eventCollection || !(listeners = this._eventCollection[event])) {\n      return this;\n    }\n\n    listeners.forEach(function (fn, i) {\n      if (fn === listener || fn.listener === listener) {\n        // Removes the given listener.\n        listeners.splice(i, 1);\n      }\n    });\n\n    // Removes an empty event collection.\n    if (listeners.length === 0) {\n      delete this._eventCollection[event];\n    }\n\n    return this;\n  };\n\n  /**\n   * Execute each item in the listener collection in order with the specified data.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The name of the event you want to emit.\n   * @param {...Object} data - Data to pass to the listeners.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Emits the \"foo\" event with 'param1' and 'param2' as arguments.\n   * emitter.emit('foo', 'param1', 'param2');\n   */\n\n  Emitter.prototype.emit = function emit(event) {\n    var _this = this;\n\n    for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {\n      args[_key - 1] = arguments[_key];\n    }\n\n    var listeners = undefined;\n\n    // Defines listeners value.\n    if (!this._eventCollection || !(listeners = this._eventCollection[event])) {\n      return this;\n    }\n\n    // Clone listeners\n    listeners = listeners.slice(0);\n\n    listeners.forEach(function (fn) {\n      return fn.apply(_this, args);\n    });\n\n    return this;\n  };\n\n  return Emitter;\n})();\n\n/**\n * Exports Emitter\n */\nexports[\"default\"] = Emitter;\nmodule.exports = exports[\"default\"];"]} \ No newline at end of file diff --git a/lib/persona.js b/lib/persona.js index bfd56f2..14530bf 100644 --- a/lib/persona.js +++ b/lib/persona.js @@ -6,7 +6,6 @@ $(document).ready(function() { setupNProgress(); setupTaskbar(); setupEditedByIcon(); - setupPaginator(); setupMobileMenu(); var env = utils.findBootstrapEnvironment(); @@ -88,81 +87,13 @@ $(document).ready(function() { $(window).on('action:posts.loaded', activateEditedTooltips); } - function setupPaginator() { - function appendPageNumber(ev, data) { - var el = data.after ? data.after : data.before; - if (!el) { - return; - } - var page = Math.ceil((el.attr('data-index') - 1) / config.postsPerPage), - handle = $('
' + page + '
'), - shadow = $('
'); - - el.append(handle); - el.append(shadow); - - handle.tooltip({ - title: 'Slide to paginate', - placement: 'auto left' - }); - - var dragging = false, originalX = 0, toPage = page; - handle.on('touchstart', function(ev) { - dragging = true; - originalX = ev.originalEvent.touches[0].clientX; - }); - - $('#content').on('touchend', function() { - if (dragging === true) { - dragging = false; - if (page !== toPage) { - ajaxify.go('topic/' + ajaxify.data.slug + '/' + (toPage * config.postsPerPage)); - } - - shadow.removeClass('active'); - } - }); - - $('#content').on('touchmove', function(ev) { - if (!dragging) { - return; - } - - var distance = ev.originalEvent.touches[0].clientX - originalX, - handlePos = parseInt(handle.css('left'), 10), - postWidth = handle.parents('[component="post"]').width(); - - toPage = Math.ceil((handlePos + distance) / postWidth * ajaxify.data.pageCount); - - if (toPage >= ajaxify.data.pageCount) { - toPage = (ajaxify.data.pageCount - 1); - } - - if (toPage < 0) { - toPage = 0; - } - - if (parseInt(handle.html(), 10) !== toPage) { - handle.html(toPage); - handle.removeClass('animated'); - setTimeout(function() { handle.addClass('animated');}, 10); - } - - shadow.addClass('active'); - shadow.css('left', toPage / ajaxify.data.pageCount * postWidth + 'px'); - }); - - handle.css('left', page / ajaxify.data.pageCount * handle.parents('[component="post"]').width() + 'px'); - } - - $(window).on('action:posts.loading', appendPageNumber); - } - function setupMobileMenu() { if (!window.addEventListener) { return; } + $('#menu').removeClass('hidden'); + var slideout = new Slideout({ 'panel': document.getElementById('panel'), 'menu': document.getElementById('menu'), @@ -172,7 +103,6 @@ $(document).ready(function() { }); $('#mobile-menu').on('click', function() { - $('#menu').show(); slideout.toggle(); }); @@ -180,11 +110,7 @@ $(document).ready(function() { slideout.close(); }); - $(window).on('resize', function() { - slideout.close(); - }); - - $(window).on('action:ajaxify.start', function() { + $(window).on('resize action:ajaxify.start', function() { slideout.close(); }); @@ -194,8 +120,6 @@ $(document).ready(function() { } function openingMenu() { - $('#menu').show(); - $('#header-menu').css({ 'top': $(window).scrollTop() + 'px', 'position': 'absolute' @@ -211,9 +135,13 @@ $(document).ready(function() { }); } - slideout.on('beforeopen', openingMenuAndLoad); slideout.on('open', openingMenuAndLoad); - slideout.on('translate', openingMenu); + slideout.on('touchmove', function(target) { + var $target = $(target); + if ($target.length && ($target.is('code') || $target.parents('code').length)) { + slideout._preventOpen = true; + } + }); slideout.on('close', function() { $('#header-menu').css({ @@ -221,7 +149,6 @@ $(document).ready(function() { 'position': 'fixed' }); $('.slideout-open').removeClass('slideout-open'); - $('#menu').hide(); }); $('#menu [data-section="navigation"] ul').html($('#main-nav').html() + ($('#logged-out-menu').html() || '')); diff --git a/modules.less b/modules.less index ec1d8e7..5f41036 100644 --- a/modules.less +++ b/modules.less @@ -1,3 +1,2 @@ @import "modules/taskbar"; -@import "modules/alerts"; -@import "modules/paginator"; \ No newline at end of file +@import "modules/alerts"; \ No newline at end of file diff --git a/modules/paginator.less b/modules/paginator.less deleted file mode 100644 index e8a69dc..0000000 --- a/modules/paginator.less +++ /dev/null @@ -1,41 +0,0 @@ -.topic { - .page-number { - position: absolute; - bottom: 6px; - background: rgb(219, 68, 55); - padding: 4px; - width: 26px; - height: 26px; - text-align: center; - border-radius: 50%; - color: white; - font-size: 11px; - z-index: 1; - - .user-select(none); - - &.animated { - -webkit-animation-name: bounceIn; - animation-name: bounceIn; - -webkit-animation-duration: 0.5s; - animation-duration: 0.5s; - -webkit-animation-fill-mode: both; - animation-fill-mode: both; - } - } - - .shadow.active { - border-radius: 50%; - width: 13px; - height: 13px; - border: 1px solid #333; - position: absolute; - bottom: 13px; - } - - @media (min-width: @screen-md-min) { - .page-number { - display: none; - } - } -} \ No newline at end of file diff --git a/package.json b/package.json index d398fd6..99c1140 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "nodebb-theme-persona", - "version": "3.0.23", + "version": "3.0.38", "nbbpm": { - "compatibility": "^0.9.0" + "compatibility": "^0.8.2" }, "description": "Persona theme for NodeBB", "main": "theme.less", diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl index 207582d..19f6445 100644 --- a/templates/account/edit.tpl +++ b/templates/account/edit.tpl @@ -145,6 +145,7 @@
+
@@ -155,10 +156,8 @@
+ - - - diff --git a/templates/footer.tpl b/templates/footer.tpl index e93b664..ff8493d 100644 --- a/templates/footer.tpl +++ b/templates/footer.tpl @@ -1,7 +1,7 @@ -
+
diff --git a/templates/header.tpl b/templates/header.tpl index 9d3d860..c0da56e 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -38,7 +38,7 @@ -
+ diff --git a/templates/partials/modals/upload_picture_from_url_modal.tpl b/templates/partials/modals/upload_picture_from_url_modal.tpl index b8d1222..f2a5545 100644 --- a/templates/partials/modals/upload_picture_from_url_modal.tpl +++ b/templates/partials/modals/upload_picture_from_url_modal.tpl @@ -1,4 +1,4 @@ -