Tiny Tiny RSS - ".$line["title"]."

diff --git a/prefs.php b/prefs.php index 6c203bd2a..75b8c116d 100644 --- a/prefs.php +++ b/prefs.php @@ -32,15 +32,15 @@ Tiny Tiny RSS : <?php echo __("Preferences") ?> - - + + @@ -57,7 +57,7 @@ "lib/dojo/tt-rss-layer.js", "errors.php?mode=js") as $jsfile) { - javascript_tag($jsfile); + echo javascript_tag($jsfile); } ?> -- cgit v1.2.3-54-g00ecf From f3479db38493629f4affd0b382af7b3764359a14 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 01:42:17 +0400 Subject: add previously missed zoom.css remove unused scriptaculous parts --- css/zoom.css | 70 +++ index.php | 2 +- lib/scriptaculous/controls.js | 965 ----------------------------------------- lib/scriptaculous/dragdrop.js | 974 ------------------------------------------ prefs.php | 2 +- 5 files changed, 72 insertions(+), 1941 deletions(-) create mode 100644 css/zoom.css delete mode 100644 lib/scriptaculous/controls.js delete mode 100644 lib/scriptaculous/dragdrop.js (limited to 'css') diff --git a/css/zoom.css b/css/zoom.css new file mode 100644 index 000000000..166361a70 --- /dev/null +++ b/css/zoom.css @@ -0,0 +1,70 @@ +body#ttrssZoom { + margin-left : auto; + margin-right : auto; + padding : 20px; + max-width : 670px; + background : #f5f5f5; +} + +body#ttrssZoom div.postHeader div.postFeedTitle { + float : left; + text-align : right; + padding-left : 0px; + font-size : 10px; +} + +body#ttrssZoom div.postHeader a.postComments { + text-align : right; + padding-left : 0px; + font-size : 10px; +} + +body#ttrssZoom div.postHeader div.postDate { + float : none; + text-align : right; + padding-left : 0px; + color : #777; + font-size : 10px; +} + +body#ttrssZoom div.postHeader div.postTags { + color : #777; + font-size : 10px; +} + +body#ttrssZoom div.postHeader div.postTitle { + white-space : normal; +} + +body#ttrssZoom div.postContent p { + max-width : 650px; + -webkit-hyphens: auto; + -moz-hyphens: auto; + hyphens: auto; +} + +body#ttrssZoom div.postHeader { + margin : 10px; + border : 1px solid #eee; +} + +body#ttrssZoom div.postReply { + border : 1px solid #eee; + background : white; +} + +body#ttrssZoom div.postContent { + +} + +body#ttrssZoom div.footer { + margin-top : 1em; + text-align : center; +} + +body#ttrssZoom div.postContent img { + max-width : 650px; + height : auto; +} + + diff --git a/index.php b/index.php index 132fd1154..0abfd691d 100644 --- a/index.php +++ b/index.php @@ -86,7 +86,7 @@ '); - this.iefix = $(this.update.id+'_iefix'); - } - if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); - }, - - fixIEOverlapping: function() { - Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); - this.iefix.style.zIndex = 1; - this.update.style.zIndex = 2; - Element.show(this.iefix); - }, - - hide: function() { - this.stopIndicator(); - if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update); - if(this.iefix) Element.hide(this.iefix); - }, - - startIndicator: function() { - if(this.options.indicator) Element.show(this.options.indicator); - }, - - stopIndicator: function() { - if(this.options.indicator) Element.hide(this.options.indicator); - }, - - onKeyPress: function(event) { - if(this.active) - switch(event.keyCode) { - case Event.KEY_TAB: - case Event.KEY_RETURN: - this.selectEntry(); - Event.stop(event); - case Event.KEY_ESC: - this.hide(); - this.active = false; - Event.stop(event); - return; - case Event.KEY_LEFT: - case Event.KEY_RIGHT: - return; - case Event.KEY_UP: - this.markPrevious(); - this.render(); - Event.stop(event); - return; - case Event.KEY_DOWN: - this.markNext(); - this.render(); - Event.stop(event); - return; - } - else - if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || - (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return; - - this.changed = true; - this.hasFocus = true; - - if(this.observer) clearTimeout(this.observer); - this.observer = - setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); - }, - - activate: function() { - this.changed = false; - this.hasFocus = true; - this.getUpdatedChoices(); - }, - - onHover: function(event) { - var element = Event.findElement(event, 'LI'); - if(this.index != element.autocompleteIndex) - { - this.index = element.autocompleteIndex; - this.render(); - } - Event.stop(event); - }, - - onClick: function(event) { - var element = Event.findElement(event, 'LI'); - this.index = element.autocompleteIndex; - this.selectEntry(); - this.hide(); - }, - - onBlur: function(event) { - // needed to make click events working - setTimeout(this.hide.bind(this), 250); - this.hasFocus = false; - this.active = false; - }, - - render: function() { - if(this.entryCount > 0) { - for (var i = 0; i < this.entryCount; i++) - this.index==i ? - Element.addClassName(this.getEntry(i),"selected") : - Element.removeClassName(this.getEntry(i),"selected"); - if(this.hasFocus) { - this.show(); - this.active = true; - } - } else { - this.active = false; - this.hide(); - } - }, - - markPrevious: function() { - if(this.index > 0) this.index--; - else this.index = this.entryCount-1; - this.getEntry(this.index).scrollIntoView(true); - }, - - markNext: function() { - if(this.index < this.entryCount-1) this.index++; - else this.index = 0; - this.getEntry(this.index).scrollIntoView(false); - }, - - getEntry: function(index) { - return this.update.firstChild.childNodes[index]; - }, - - getCurrentEntry: function() { - return this.getEntry(this.index); - }, - - selectEntry: function() { - this.active = false; - this.updateElement(this.getCurrentEntry()); - }, - - updateElement: function(selectedElement) { - if (this.options.updateElement) { - this.options.updateElement(selectedElement); - return; - } - var value = ''; - if (this.options.select) { - var nodes = $(selectedElement).select('.' + this.options.select) || []; - if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); - } else - value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); - - var bounds = this.getTokenBounds(); - if (bounds[0] != -1) { - var newValue = this.element.value.substr(0, bounds[0]); - var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/); - if (whitespace) - newValue += whitespace[0]; - this.element.value = newValue + value + this.element.value.substr(bounds[1]); - } else { - this.element.value = value; - } - this.oldElementValue = this.element.value; - this.element.focus(); - - if (this.options.afterUpdateElement) - this.options.afterUpdateElement(this.element, selectedElement); - }, - - updateChoices: function(choices) { - if(!this.changed && this.hasFocus) { - this.update.innerHTML = choices; - Element.cleanWhitespace(this.update); - Element.cleanWhitespace(this.update.down()); - - if(this.update.firstChild && this.update.down().childNodes) { - this.entryCount = - this.update.down().childNodes.length; - for (var i = 0; i < this.entryCount; i++) { - var entry = this.getEntry(i); - entry.autocompleteIndex = i; - this.addObservers(entry); - } - } else { - this.entryCount = 0; - } - - this.stopIndicator(); - this.index = 0; - - if(this.entryCount==1 && this.options.autoSelect) { - this.selectEntry(); - this.hide(); - } else { - this.render(); - } - } - }, - - addObservers: function(element) { - Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this)); - Event.observe(element, "click", this.onClick.bindAsEventListener(this)); - }, - - onObserverEvent: function() { - this.changed = false; - this.tokenBounds = null; - if(this.getToken().length>=this.options.minChars) { - this.getUpdatedChoices(); - } else { - this.active = false; - this.hide(); - } - this.oldElementValue = this.element.value; - }, - - getToken: function() { - var bounds = this.getTokenBounds(); - return this.element.value.substring(bounds[0], bounds[1]).strip(); - }, - - getTokenBounds: function() { - if (null != this.tokenBounds) return this.tokenBounds; - var value = this.element.value; - if (value.strip().empty()) return [-1, 0]; - var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue); - var offset = (diff == this.oldElementValue.length ? 1 : 0); - var prevTokenPos = -1, nextTokenPos = value.length; - var tp; - for (var index = 0, l = this.options.tokens.length; index < l; ++index) { - tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1); - if (tp > prevTokenPos) prevTokenPos = tp; - tp = value.indexOf(this.options.tokens[index], diff + offset); - if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp; - } - return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]); - } -}); - -Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) { - var boundary = Math.min(newS.length, oldS.length); - for (var index = 0; index < boundary; ++index) - if (newS[index] != oldS[index]) - return index; - return boundary; -}; - -Ajax.Autocompleter = Class.create(Autocompleter.Base, { - initialize: function(element, update, url, options) { - this.baseInitialize(element, update, options); - this.options.asynchronous = true; - this.options.onComplete = this.onComplete.bind(this); - this.options.defaultParams = this.options.parameters || null; - this.url = url; - }, - - getUpdatedChoices: function() { - this.startIndicator(); - - var entry = encodeURIComponent(this.options.paramName) + '=' + - encodeURIComponent(this.getToken()); - - this.options.parameters = this.options.callback ? - this.options.callback(this.element, entry) : entry; - - if(this.options.defaultParams) - this.options.parameters += '&' + this.options.defaultParams; - - new Ajax.Request(this.url, this.options); - }, - - onComplete: function(request) { - this.updateChoices(request.responseText); - } -}); - -// The local array autocompleter. Used when you'd prefer to -// inject an array of autocompletion options into the page, rather -// than sending out Ajax queries, which can be quite slow sometimes. -// -// The constructor takes four parameters. The first two are, as usual, -// the id of the monitored textbox, and id of the autocompletion menu. -// The third is the array you want to autocomplete from, and the fourth -// is the options block. -// -// Extra local autocompletion options: -// - choices - How many autocompletion choices to offer -// -// - partialSearch - If false, the autocompleter will match entered -// text only at the beginning of strings in the -// autocomplete array. Defaults to true, which will -// match text at the beginning of any *word* in the -// strings in the autocomplete array. If you want to -// search anywhere in the string, additionally set -// the option fullSearch to true (default: off). -// -// - fullSsearch - Search anywhere in autocomplete array strings. -// -// - partialChars - How many characters to enter before triggering -// a partial match (unlike minChars, which defines -// how many characters are required to do any match -// at all). Defaults to 2. -// -// - ignoreCase - Whether to ignore case when autocompleting. -// Defaults to true. -// -// It's possible to pass in a custom function as the 'selector' -// option, if you prefer to write your own autocompletion logic. -// In that case, the other options above will not apply unless -// you support them. - -Autocompleter.Local = Class.create(Autocompleter.Base, { - initialize: function(element, update, array, options) { - this.baseInitialize(element, update, options); - this.options.array = array; - }, - - getUpdatedChoices: function() { - this.updateChoices(this.options.selector(this)); - }, - - setOptions: function(options) { - this.options = Object.extend({ - choices: 10, - partialSearch: true, - partialChars: 2, - ignoreCase: true, - fullSearch: false, - selector: function(instance) { - var ret = []; // Beginning matches - var partial = []; // Inside matches - var entry = instance.getToken(); - var count = 0; - - for (var i = 0; i < instance.options.array.length && - ret.length < instance.options.choices ; i++) { - - var elem = instance.options.array[i]; - var foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase()) : - elem.indexOf(entry); - - while (foundPos != -1) { - if (foundPos == 0 && elem.length != entry.length) { - ret.push("

" + elem.substr(0, entry.length) + "" + - elem.substr(entry.length) + "

"); - break; - } else if (entry.length >= instance.options.partialChars && - instance.options.partialSearch && foundPos != -1) { - if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { - partial.push("

" + elem.substr(0, foundPos) + "" + - elem.substr(foundPos, entry.length) + "" + elem.substr( - foundPos + entry.length) + "

"); - break; - } - } - - foundPos = instance.options.ignoreCase ? - elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : - elem.indexOf(entry, foundPos + 1); - - } - } - if (partial.length) - ret = ret.concat(partial.slice(0, instance.options.choices - ret.length)); - return "

" + ret.join('') + ""; - } - }, options || { }); - } -}); - -// AJAX in-place editor and collection editor -// Full rewrite by Christophe Porteneuve (April 2007). - -// Use this if you notice weird scrolling problems on some browsers, -// the DOM might be a bit confused when this gets called so do this -// waits 1 ms (with setTimeout) until it does the activation -Field.scrollFreeActivate = function(field) { - setTimeout(function() { - Field.activate(field); - }, 1); -}; - -Ajax.InPlaceEditor = Class.create({ - initialize: function(element, url, options) { - this.url = url; - this.element = element = $(element); - this.prepareOptions(); - this._controls = { }; - arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!! - Object.extend(this.options, options || { }); - if (!this.options.formId && this.element.id) { - this.options.formId = this.element.id + '-inplaceeditor'; - if ($(this.options.formId)) - this.options.formId = ''; - } - if (this.options.externalControl) - this.options.externalControl = $(this.options.externalControl); - if (!this.options.externalControl) - this.options.externalControlOnly = false; - this._originalBackground = this.element.getStyle('background-color') || 'transparent'; - this.element.title = this.options.clickToEditText; - this._boundCancelHandler = this.handleFormCancellation.bind(this); - this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this); - this._boundFailureHandler = this.handleAJAXFailure.bind(this); - this._boundSubmitHandler = this.handleFormSubmission.bind(this); - this._boundWrapperHandler = this.wrapUp.bind(this); - this.registerListeners(); - }, - checkForEscapeOrReturn: function(e) { - if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return; - if (Event.KEY_ESC == e.keyCode) - this.handleFormCancellation(e); - else if (Event.KEY_RETURN == e.keyCode) - this.handleFormSubmission(e); - }, - createControl: function(mode, handler, extraClasses) { - var control = this.options[mode + 'Control']; - var text = this.options[mode + 'Text']; - if ('button' == control) { - var btn = document.createElement('input'); - btn.type = 'submit'; - btn.value = text; - btn.className = 'editor_' + mode + '_button'; - if ('cancel' == mode) - btn.onclick = this._boundCancelHandler; - this._form.appendChild(btn); - this._controls[mode] = btn; - } else if ('link' == control) { - var link = document.createElement('a'); - link.href = '#'; - link.appendChild(document.createTextNode(text)); - link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler; - link.className = 'editor_' + mode + '_link'; - if (extraClasses) - link.className += ' ' + extraClasses; - this._form.appendChild(link); - this._controls[mode] = link; - } - }, - createEditField: function() { - var text = (this.options.loadTextURL ? this.options.loadingText : this.getText()); - var fld; - if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) { - fld = document.createElement('input'); - fld.type = 'text'; - var size = this.options.size || this.options.cols || 0; - if (0 < size) fld.size = size; - } else { - fld = document.createElement('textarea'); - fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows); - fld.cols = this.options.cols || 40; - } - fld.name = this.options.paramName; - fld.value = text; // No HTML breaks conversion anymore - fld.className = 'editor_field'; - if (this.options.submitOnBlur) - fld.onblur = this._boundSubmitHandler; - this._controls.editor = fld; - if (this.options.loadTextURL) - this.loadExternalText(); - this._form.appendChild(this._controls.editor); - }, - createForm: function() { - var ipe = this; - function addText(mode, condition) { - var text = ipe.options['text' + mode + 'Controls']; - if (!text || condition === false) return; - ipe._form.appendChild(document.createTextNode(text)); - }; - this._form = $(document.createElement('form')); - this._form.id = this.options.formId; - this._form.addClassName(this.options.formClassName); - this._form.onsubmit = this._boundSubmitHandler; - this.createEditField(); - if ('textarea' == this._controls.editor.tagName.toLowerCase()) - this._form.appendChild(document.createElement('br')); - if (this.options.onFormCustomization) - this.options.onFormCustomization(this, this._form); - addText('Before', this.options.okControl || this.options.cancelControl); - this.createControl('ok', this._boundSubmitHandler); - addText('Between', this.options.okControl && this.options.cancelControl); - this.createControl('cancel', this._boundCancelHandler, 'editor_cancel'); - addText('After', this.options.okControl || this.options.cancelControl); - }, - destroy: function() { - if (this._oldInnerHTML) - this.element.innerHTML = this._oldInnerHTML; - this.leaveEditMode(); - this.unregisterListeners(); - }, - enterEditMode: function(e) { - if (this._saving || this._editing) return; - this._editing = true; - this.triggerCallback('onEnterEditMode'); - if (this.options.externalControl) - this.options.externalControl.hide(); - this.element.hide(); - this.createForm(); - this.element.parentNode.insertBefore(this._form, this.element); - if (!this.options.loadTextURL) - this.postProcessEditField(); - if (e) Event.stop(e); - }, - enterHover: function(e) { - if (this.options.hoverClassName) - this.element.addClassName(this.options.hoverClassName); - if (this._saving) return; - this.triggerCallback('onEnterHover'); - }, - getText: function() { - return this.element.innerHTML.unescapeHTML(); - }, - handleAJAXFailure: function(transport) { - this.triggerCallback('onFailure', transport); - if (this._oldInnerHTML) { - this.element.innerHTML = this._oldInnerHTML; - this._oldInnerHTML = null; - } - }, - handleFormCancellation: function(e) { - this.wrapUp(); - if (e) Event.stop(e); - }, - handleFormSubmission: function(e) { - var form = this._form; - var value = $F(this._controls.editor); - this.prepareSubmission(); - var params = this.options.callback(form, value) || ''; - if (Object.isString(params)) - params = params.toQueryParams(); - params.editorId = this.element.id; - if (this.options.htmlResponse) { - var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions); - Object.extend(options, { - parameters: params, - onComplete: this._boundWrapperHandler, - onFailure: this._boundFailureHandler - }); - new Ajax.Updater({ success: this.element }, this.url, options); - } else { - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: params, - onComplete: this._boundWrapperHandler, - onFailure: this._boundFailureHandler - }); - new Ajax.Request(this.url, options); - } - if (e) Event.stop(e); - }, - leaveEditMode: function() { - this.element.removeClassName(this.options.savingClassName); - this.removeForm(); - this.leaveHover(); - this.element.style.backgroundColor = this._originalBackground; - this.element.show(); - if (this.options.externalControl) - this.options.externalControl.show(); - this._saving = false; - this._editing = false; - this._oldInnerHTML = null; - this.triggerCallback('onLeaveEditMode'); - }, - leaveHover: function(e) { - if (this.options.hoverClassName) - this.element.removeClassName(this.options.hoverClassName); - if (this._saving) return; - this.triggerCallback('onLeaveHover'); - }, - loadExternalText: function() { - this._form.addClassName(this.options.loadingClassName); - this._controls.editor.disabled = true; - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: 'editorId=' + encodeURIComponent(this.element.id), - onComplete: Prototype.emptyFunction, - onSuccess: function(transport) { - this._form.removeClassName(this.options.loadingClassName); - var text = transport.responseText; - if (this.options.stripLoadedTextTags) - text = text.stripTags(); - this._controls.editor.value = text; - this._controls.editor.disabled = false; - this.postProcessEditField(); - }.bind(this), - onFailure: this._boundFailureHandler - }); - new Ajax.Request(this.options.loadTextURL, options); - }, - postProcessEditField: function() { - var fpc = this.options.fieldPostCreation; - if (fpc) - $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate'](); - }, - prepareOptions: function() { - this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions); - Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks); - [this._extraDefaultOptions].flatten().compact().each(function(defs) { - Object.extend(this.options, defs); - }.bind(this)); - }, - prepareSubmission: function() { - this._saving = true; - this.removeForm(); - this.leaveHover(); - this.showSaving(); - }, - registerListeners: function() { - this._listeners = { }; - var listener; - $H(Ajax.InPlaceEditor.Listeners).each(function(pair) { - listener = this[pair.value].bind(this); - this._listeners[pair.key] = listener; - if (!this.options.externalControlOnly) - this.element.observe(pair.key, listener); - if (this.options.externalControl) - this.options.externalControl.observe(pair.key, listener); - }.bind(this)); - }, - removeForm: function() { - if (!this._form) return; - this._form.remove(); - this._form = null; - this._controls = { }; - }, - showSaving: function() { - this._oldInnerHTML = this.element.innerHTML; - this.element.innerHTML = this.options.savingText; - this.element.addClassName(this.options.savingClassName); - this.element.style.backgroundColor = this._originalBackground; - this.element.show(); - }, - triggerCallback: function(cbName, arg) { - if ('function' == typeof this.options[cbName]) { - this.options[cbName](this, arg); - } - }, - unregisterListeners: function() { - $H(this._listeners).each(function(pair) { - if (!this.options.externalControlOnly) - this.element.stopObserving(pair.key, pair.value); - if (this.options.externalControl) - this.options.externalControl.stopObserving(pair.key, pair.value); - }.bind(this)); - }, - wrapUp: function(transport) { - this.leaveEditMode(); - // Can't use triggerCallback due to backward compatibility: requires - // binding + direct element - this._boundComplete(transport, this.element); - } -}); - -Object.extend(Ajax.InPlaceEditor.prototype, { - dispose: Ajax.InPlaceEditor.prototype.destroy -}); - -Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, { - initialize: function($super, element, url, options) { - this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions; - $super(element, url, options); - }, - - createEditField: function() { - var list = document.createElement('select'); - list.name = this.options.paramName; - list.size = 1; - this._controls.editor = list; - this._collection = this.options.collection || []; - if (this.options.loadCollectionURL) - this.loadCollection(); - else - this.checkForExternalText(); - this._form.appendChild(this._controls.editor); - }, - - loadCollection: function() { - this._form.addClassName(this.options.loadingClassName); - this.showLoadingText(this.options.loadingCollectionText); - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: 'editorId=' + encodeURIComponent(this.element.id), - onComplete: Prototype.emptyFunction, - onSuccess: function(transport) { - var js = transport.responseText.strip(); - if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check - throw('Server returned an invalid collection representation.'); - this._collection = eval(js); - this.checkForExternalText(); - }.bind(this), - onFailure: this.onFailure - }); - new Ajax.Request(this.options.loadCollectionURL, options); - }, - - showLoadingText: function(text) { - this._controls.editor.disabled = true; - var tempOption = this._controls.editor.firstChild; - if (!tempOption) { - tempOption = document.createElement('option'); - tempOption.value = ''; - this._controls.editor.appendChild(tempOption); - tempOption.selected = true; - } - tempOption.update((text || '').stripScripts().stripTags()); - }, - - checkForExternalText: function() { - this._text = this.getText(); - if (this.options.loadTextURL) - this.loadExternalText(); - else - this.buildOptionList(); - }, - - loadExternalText: function() { - this.showLoadingText(this.options.loadingText); - var options = Object.extend({ method: 'get' }, this.options.ajaxOptions); - Object.extend(options, { - parameters: 'editorId=' + encodeURIComponent(this.element.id), - onComplete: Prototype.emptyFunction, - onSuccess: function(transport) { - this._text = transport.responseText.strip(); - this.buildOptionList(); - }.bind(this), - onFailure: this.onFailure - }); - new Ajax.Request(this.options.loadTextURL, options); - }, - - buildOptionList: function() { - this._form.removeClassName(this.options.loadingClassName); - this._collection = this._collection.map(function(entry) { - return 2 === entry.length ? entry : [entry, entry].flatten(); - }); - var marker = ('value' in this.options) ? this.options.value : this._text; - var textFound = this._collection.any(function(entry) { - return entry[0] == marker; - }.bind(this)); - this._controls.editor.update(''); - var option; - this._collection.each(function(entry, index) { - option = document.createElement('option'); - option.value = entry[0]; - option.selected = textFound ? entry[0] == marker : 0 == index; - option.appendChild(document.createTextNode(entry[1])); - this._controls.editor.appendChild(option); - }.bind(this)); - this._controls.editor.disabled = false; - Field.scrollFreeActivate(this._controls.editor); - } -}); - -//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! **** -//**** This only exists for a while, in order to let **** -//**** users adapt to the new API. Read up on the new **** -//**** API and convert your code to it ASAP! **** - -Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) { - if (!options) return; - function fallback(name, expr) { - if (name in options || expr === undefined) return; - options[name] = expr; - }; - fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' : - options.cancelLink == options.cancelButton == false ? false : undefined))); - fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' : - options.okLink == options.okButton == false ? false : undefined))); - fallback('highlightColor', options.highlightcolor); - fallback('highlightEndColor', options.highlightendcolor); -}; - -Object.extend(Ajax.InPlaceEditor, { - DefaultOptions: { - ajaxOptions: { }, - autoRows: 3, // Use when multi-line w/ rows == 1 - cancelControl: 'link', // 'link'|'button'|false - cancelText: 'cancel', - clickToEditText: 'Click to edit', - externalControl: null, // id|elt - externalControlOnly: false, - fieldPostCreation: 'activate', // 'activate'|'focus'|false - formClassName: 'inplaceeditor-form', - formId: null, // id|elt - highlightColor: '#ffff99', - highlightEndColor: '#ffffff', - hoverClassName: '', - htmlResponse: true, - loadingClassName: 'inplaceeditor-loading', - loadingText: 'Loading...', - okControl: 'button', // 'link'|'button'|false - okText: 'ok', - paramName: 'value', - rows: 1, // If 1 and multi-line, uses autoRows - savingClassName: 'inplaceeditor-saving', - savingText: 'Saving...', - size: 0, - stripLoadedTextTags: false, - submitOnBlur: false, - textAfterControls: '', - textBeforeControls: '', - textBetweenControls: '' - }, - DefaultCallbacks: { - callback: function(form) { - return Form.serialize(form); - }, - onComplete: function(transport, element) { - // For backward compatibility, this one is bound to the IPE, and passes - // the element directly. It was too often customized, so we don't break it. - new Effect.Highlight(element, { - startcolor: this.options.highlightColor, keepBackgroundImage: true }); - }, - onEnterEditMode: null, - onEnterHover: function(ipe) { - ipe.element.style.backgroundColor = ipe.options.highlightColor; - if (ipe._effect) - ipe._effect.cancel(); - }, - onFailure: function(transport, ipe) { - alert('Error communication with the server: ' + transport.responseText.stripTags()); - }, - onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls. - onLeaveEditMode: null, - onLeaveHover: function(ipe) { - ipe._effect = new Effect.Highlight(ipe.element, { - startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor, - restorecolor: ipe._originalBackground, keepBackgroundImage: true - }); - } - }, - Listeners: { - click: 'enterEditMode', - keydown: 'checkForEscapeOrReturn', - mouseover: 'enterHover', - mouseout: 'leaveHover' - } -}); - -Ajax.InPlaceCollectionEditor.DefaultOptions = { - loadingCollectionText: 'Loading options...' -}; - -// Delayed observer, like Form.Element.Observer, -// but waits for delay after last key input -// Ideal for live-search fields - -Form.Element.DelayedObserver = Class.create({ - initialize: function(element, delay, callback) { - this.delay = delay || 0.5; - this.element = $(element); - this.callback = callback; - this.timer = null; - this.lastValue = $F(this.element); - Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); - }, - delayedListener: function(event) { - if(this.lastValue == $F(this.element)) return; - if(this.timer) clearTimeout(this.timer); - this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000); - this.lastValue = $F(this.element); - }, - onTimerEvent: function() { - this.timer = null; - this.callback(this.element, $F(this.element)); - } -}); \ No newline at end of file diff --git a/lib/scriptaculous/dragdrop.js b/lib/scriptaculous/dragdrop.js deleted file mode 100644 index 15c6dbca6..000000000 --- a/lib/scriptaculous/dragdrop.js +++ /dev/null @@ -1,974 +0,0 @@ -// script.aculo.us dragdrop.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 - -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - -if(Object.isUndefined(Effect)) - throw("dragdrop.js requires including script.aculo.us' effects.js library"); - -var Droppables = { - drops: [], - - remove: function(element) { - this.drops = this.drops.reject(function(d) { return d.element==$(element) }); - }, - - add: function(element) { - element = $(element); - var options = Object.extend({ - greedy: true, - hoverclass: null, - tree: false - }, arguments[1] || { }); - - // cache containers - if(options.containment) { - options._containers = []; - var containment = options.containment; - if(Object.isArray(containment)) { - containment.each( function(c) { options._containers.push($(c)) }); - } else { - options._containers.push($(containment)); - } - } - - if(options.accept) options.accept = [options.accept].flatten(); - - Element.makePositioned(element); // fix IE - options.element = element; - - this.drops.push(options); - }, - - findDeepestChild: function(drops) { - deepest = drops[0]; - - for (i = 1; i < drops.length; ++i) - if (Element.isParent(drops[i].element, deepest.element)) - deepest = drops[i]; - - return deepest; - }, - - isContained: function(element, drop) { - var containmentNode; - if(drop.tree) { - containmentNode = element.treeNode; - } else { - containmentNode = element.parentNode; - } - return drop._containers.detect(function(c) { return containmentNode == c }); - }, - - isAffected: function(point, element, drop) { - return ( - (drop.element!=element) && - ((!drop._containers) || - this.isContained(element, drop)) && - ((!drop.accept) || - (Element.classNames(element).detect( - function(v) { return drop.accept.include(v) } ) )) && - Position.within(drop.element, point[0], point[1]) ); - }, - - deactivate: function(drop) { - if(drop.hoverclass) - Element.removeClassName(drop.element, drop.hoverclass); - this.last_active = null; - }, - - activate: function(drop) { - if(drop.hoverclass) - Element.addClassName(drop.element, drop.hoverclass); - this.last_active = drop; - }, - - show: function(point, element) { - if(!this.drops.length) return; - var drop, affected = []; - - this.drops.each( function(drop) { - if(Droppables.isAffected(point, element, drop)) - affected.push(drop); - }); - - if(affected.length>0) - drop = Droppables.findDeepestChild(affected); - - if(this.last_active && this.last_active != drop) this.deactivate(this.last_active); - if (drop) { - Position.within(drop.element, point[0], point[1]); - if(drop.onHover) - drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); - - if (drop != this.last_active) Droppables.activate(drop); - } - }, - - fire: function(event, element) { - if(!this.last_active) return; - Position.prepare(); - - if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) - if (this.last_active.onDrop) { - this.last_active.onDrop(element, this.last_active.element, event); - return true; - } - }, - - reset: function() { - if(this.last_active) - this.deactivate(this.last_active); - } -}; - -var Draggables = { - drags: [], - observers: [], - - register: function(draggable) { - if(this.drags.length == 0) { - this.eventMouseUp = this.endDrag.bindAsEventListener(this); - this.eventMouseMove = this.updateDrag.bindAsEventListener(this); - this.eventKeypress = this.keyPress.bindAsEventListener(this); - - Event.observe(document, "mouseup", this.eventMouseUp); - Event.observe(document, "mousemove", this.eventMouseMove); - Event.observe(document, "keypress", this.eventKeypress); - } - this.drags.push(draggable); - }, - - unregister: function(draggable) { - this.drags = this.drags.reject(function(d) { return d==draggable }); - if(this.drags.length == 0) { - Event.stopObserving(document, "mouseup", this.eventMouseUp); - Event.stopObserving(document, "mousemove", this.eventMouseMove); - Event.stopObserving(document, "keypress", this.eventKeypress); - } - }, - - activate: function(draggable) { - if(draggable.options.delay) { - this._timeout = setTimeout(function() { - Draggables._timeout = null; - window.focus(); - Draggables.activeDraggable = draggable; - }.bind(this), draggable.options.delay); - } else { - window.focus(); // allows keypress events if window isn't currently focused, fails for Safari - this.activeDraggable = draggable; - } - }, - - deactivate: function() { - this.activeDraggable = null; - }, - - updateDrag: function(event) { - if(!this.activeDraggable) return; - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - // Mozilla-based browsers fire successive mousemove events with - // the same coordinates, prevent needless redrawing (moz bug?) - if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; - this._lastPointer = pointer; - - this.activeDraggable.updateDrag(event, pointer); - }, - - endDrag: function(event) { - if(this._timeout) { - clearTimeout(this._timeout); - this._timeout = null; - } - if(!this.activeDraggable) return; - this._lastPointer = null; - this.activeDraggable.endDrag(event); - this.activeDraggable = null; - }, - - keyPress: function(event) { - if(this.activeDraggable) - this.activeDraggable.keyPress(event); - }, - - addObserver: function(observer) { - this.observers.push(observer); - this._cacheObserverCallbacks(); - }, - - removeObserver: function(element) { // element instead of observer fixes mem leaks - this.observers = this.observers.reject( function(o) { return o.element==element }); - this._cacheObserverCallbacks(); - }, - - notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' - if(this[eventName+'Count'] > 0) - this.observers.each( function(o) { - if(o[eventName]) o[eventName](eventName, draggable, event); - }); - if(draggable.options[eventName]) draggable.options[eventName](draggable, event); - }, - - _cacheObserverCallbacks: function() { - ['onStart','onEnd','onDrag'].each( function(eventName) { - Draggables[eventName+'Count'] = Draggables.observers.select( - function(o) { return o[eventName]; } - ).length; - }); - } -}; - -/*--------------------------------------------------------------------------*/ - -var Draggable = Class.create({ - initialize: function(element) { - var defaults = { - handle: false, - reverteffect: function(element, top_offset, left_offset) { - var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02; - new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur, - queue: {scope:'_draggable', position:'end'} - }); - }, - endeffect: function(element) { - var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0; - new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, - queue: {scope:'_draggable', position:'end'}, - afterFinish: function(){ - Draggable._dragging[element] = false - } - }); - }, - zindex: 1000, - revert: false, - quiet: false, - scroll: false, - scrollSensitivity: 20, - scrollSpeed: 15, - snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } - delay: 0 - }; - - if(!arguments[1] || Object.isUndefined(arguments[1].endeffect)) - Object.extend(defaults, { - starteffect: function(element) { - element._opacity = Element.getOpacity(element); - Draggable._dragging[element] = true; - new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); - } - }); - - var options = Object.extend(defaults, arguments[1] || { }); - - this.element = $(element); - - if(options.handle && Object.isString(options.handle)) - this.handle = this.element.down('.'+options.handle, 0); - - if(!this.handle) this.handle = $(options.handle); - if(!this.handle) this.handle = this.element; - - if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { - options.scroll = $(options.scroll); - this._isScrollChild = Element.childOf(this.element, options.scroll); - } - - Element.makePositioned(this.element); // fix IE - - this.options = options; - this.dragging = false; - - this.eventMouseDown = this.initDrag.bindAsEventListener(this); - Event.observe(this.handle, "mousedown", this.eventMouseDown); - - Draggables.register(this); - }, - - destroy: function() { - Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); - Draggables.unregister(this); - }, - - currentDelta: function() { - return([ - parseInt(Element.getStyle(this.element,'left') || '0'), - parseInt(Element.getStyle(this.element,'top') || '0')]); - }, - - initDrag: function(event) { - if(!Object.isUndefined(Draggable._dragging[this.element]) && - Draggable._dragging[this.element]) return; - if(Event.isLeftClick(event)) { - // abort on form elements, fixes a Firefox issue - var src = Event.element(event); - if((tag_name = src.tagName.toUpperCase()) && ( - tag_name=='INPUT' || - tag_name=='SELECT' || - tag_name=='OPTION' || - tag_name=='BUTTON' || - tag_name=='TEXTAREA')) return; - - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var pos = this.element.cumulativeOffset(); - this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); - - Draggables.activate(this); - Event.stop(event); - } - }, - - startDrag: function(event) { - this.dragging = true; - if(!this.delta) - this.delta = this.currentDelta(); - - if(this.options.zindex) { - this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); - this.element.style.zIndex = this.options.zindex; - } - - if(this.options.ghosting) { - this._clone = this.element.cloneNode(true); - this._originallyAbsolute = (this.element.getStyle('position') == 'absolute'); - if (!this._originallyAbsolute) - Position.absolutize(this.element); - this.element.parentNode.insertBefore(this._clone, this.element); - } - - if(this.options.scroll) { - if (this.options.scroll == window) { - var where = this._getWindowScroll(this.options.scroll); - this.originalScrollLeft = where.left; - this.originalScrollTop = where.top; - } else { - this.originalScrollLeft = this.options.scroll.scrollLeft; - this.originalScrollTop = this.options.scroll.scrollTop; - } - } - - Draggables.notify('onStart', this, event); - - if(this.options.starteffect) this.options.starteffect(this.element); - }, - - updateDrag: function(event, pointer) { - if(!this.dragging) this.startDrag(event); - - if(!this.options.quiet){ - Position.prepare(); - Droppables.show(pointer, this.element); - } - - Draggables.notify('onDrag', this, event); - - this.draw(pointer); - if(this.options.change) this.options.change(this); - - if(this.options.scroll) { - this.stopScrolling(); - - var p; - if (this.options.scroll == window) { - with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } - } else { - p = Position.page(this.options.scroll); - p[0] += this.options.scroll.scrollLeft + Position.deltaX; - p[1] += this.options.scroll.scrollTop + Position.deltaY; - p.push(p[0]+this.options.scroll.offsetWidth); - p.push(p[1]+this.options.scroll.offsetHeight); - } - var speed = [0,0]; - if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity); - if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity); - if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity); - if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); - this.startScrolling(speed); - } - - // fix AppleWebKit rendering - if(Prototype.Browser.WebKit) window.scrollBy(0,0); - - Event.stop(event); - }, - - finishDrag: function(event, success) { - this.dragging = false; - - if(this.options.quiet){ - Position.prepare(); - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - Droppables.show(pointer, this.element); - } - - if(this.options.ghosting) { - if (!this._originallyAbsolute) - Position.relativize(this.element); - delete this._originallyAbsolute; - Element.remove(this._clone); - this._clone = null; - } - - var dropped = false; - if(success) { - dropped = Droppables.fire(event, this.element); - if (!dropped) dropped = false; - } - if(dropped && this.options.onDropped) this.options.onDropped(this.element); - Draggables.notify('onEnd', this, event); - - var revert = this.options.revert; - if(revert && Object.isFunction(revert)) revert = revert(this.element); - - var d = this.currentDelta(); - if(revert && this.options.reverteffect) { - if (dropped == 0 || revert != 'failure') - this.options.reverteffect(this.element, - d[1]-this.delta[1], d[0]-this.delta[0]); - } else { - this.delta = d; - } - - if(this.options.zindex) - this.element.style.zIndex = this.originalZ; - - if(this.options.endeffect) - this.options.endeffect(this.element); - - Draggables.deactivate(this); - Droppables.reset(); - }, - - keyPress: function(event) { - if(event.keyCode!=Event.KEY_ESC) return; - this.finishDrag(event, false); - Event.stop(event); - }, - - endDrag: function(event) { - if(!this.dragging) return; - this.stopScrolling(); - this.finishDrag(event, true); - Event.stop(event); - }, - - draw: function(point) { - var pos = this.element.cumulativeOffset(); - if(this.options.ghosting) { - var r = Position.realOffset(this.element); - pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; - } - - var d = this.currentDelta(); - pos[0] -= d[0]; pos[1] -= d[1]; - - if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { - pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; - pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; - } - - var p = [0,1].map(function(i){ - return (point[i]-pos[i]-this.offset[i]) - }.bind(this)); - - if(this.options.snap) { - if(Object.isFunction(this.options.snap)) { - p = this.options.snap(p[0],p[1],this); - } else { - if(Object.isArray(this.options.snap)) { - p = p.map( function(v, i) { - return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this)); - } else { - p = p.map( function(v) { - return (v/this.options.snap).round()*this.options.snap }.bind(this)); - } - }} - - var style = this.element.style; - if((!this.options.constraint) || (this.options.constraint=='horizontal')) - style.left = p[0] + "px"; - if((!this.options.constraint) || (this.options.constraint=='vertical')) - style.top = p[1] + "px"; - - if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering - }, - - stopScrolling: function() { - if(this.scrollInterval) { - clearInterval(this.scrollInterval); - this.scrollInterval = null; - Draggables._lastScrollPointer = null; - } - }, - - startScrolling: function(speed) { - if(!(speed[0] || speed[1])) return; - this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; - this.lastScrolled = new Date(); - this.scrollInterval = setInterval(this.scroll.bind(this), 10); - }, - - scroll: function() { - var current = new Date(); - var delta = current - this.lastScrolled; - this.lastScrolled = current; - if(this.options.scroll == window) { - with (this._getWindowScroll(this.options.scroll)) { - if (this.scrollSpeed[0] || this.scrollSpeed[1]) { - var d = delta / 1000; - this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] ); - } - } - } else { - this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; - this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; - } - - Position.prepare(); - Droppables.show(Draggables._lastPointer, this.element); - Draggables.notify('onDrag', this); - if (this._isScrollChild) { - Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer); - Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000; - Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000; - if (Draggables._lastScrollPointer[0] < 0) - Draggables._lastScrollPointer[0] = 0; - if (Draggables._lastScrollPointer[1] < 0) - Draggables._lastScrollPointer[1] = 0; - this.draw(Draggables._lastScrollPointer); - } - - if(this.options.change) this.options.change(this); - }, - - _getWindowScroll: function(w) { - var T, L, W, H; - with (w.document) { - if (w.document.documentElement && documentElement.scrollTop) { - T = documentElement.scrollTop; - L = documentElement.scrollLeft; - } else if (w.document.body) { - T = body.scrollTop; - L = body.scrollLeft; - } - if (w.innerWidth) { - W = w.innerWidth; - H = w.innerHeight; - } else if (w.document.documentElement && documentElement.clientWidth) { - W = documentElement.clientWidth; - H = documentElement.clientHeight; - } else { - W = body.offsetWidth; - H = body.offsetHeight; - } - } - return { top: T, left: L, width: W, height: H }; - } -}); - -Draggable._dragging = { }; - -/*--------------------------------------------------------------------------*/ - -var SortableObserver = Class.create({ - initialize: function(element, observer) { - this.element = $(element); - this.observer = observer; - this.lastValue = Sortable.serialize(this.element); - }, - - onStart: function() { - this.lastValue = Sortable.serialize(this.element); - }, - - onEnd: function() { - Sortable.unmark(); - if(this.lastValue != Sortable.serialize(this.element)) - this.observer(this.element) - } -}); - -var Sortable = { - SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, - - sortables: { }, - - _findRootElement: function(element) { - while (element.tagName.toUpperCase() != "BODY") { - if(element.id && Sortable.sortables[element.id]) return element; - element = element.parentNode; - } - }, - - options: function(element) { - element = Sortable._findRootElement($(element)); - if(!element) return; - return Sortable.sortables[element.id]; - }, - - destroy: function(element){ - element = $(element); - var s = Sortable.sortables[element.id]; - - if(s) { - Draggables.removeObserver(s.element); - s.droppables.each(function(d){ Droppables.remove(d) }); - s.draggables.invoke('destroy'); - - delete Sortable.sortables[s.element.id]; - } - }, - - create: function(element) { - element = $(element); - var options = Object.extend({ - element: element, - tag: 'li', // assumes li children, override with tag: 'tagname' - dropOnEmpty: false, - tree: false, - treeTag: 'ul', - overlap: 'vertical', // one of 'vertical', 'horizontal' - constraint: 'vertical', // one of 'vertical', 'horizontal', false - containment: element, // also takes array of elements (or id's); or false - handle: false, // or a CSS class - only: false, - delay: 0, - hoverclass: null, - ghosting: false, - quiet: false, - scroll: false, - scrollSensitivity: 20, - scrollSpeed: 15, - format: this.SERIALIZE_RULE, - - // these take arrays of elements or ids and can be - // used for better initialization performance - elements: false, - handles: false, - - onChange: Prototype.emptyFunction, - onUpdate: Prototype.emptyFunction - }, arguments[1] || { }); - - // clear any old sortable with same element - this.destroy(element); - - // build options for the draggables - var options_for_draggable = { - revert: true, - quiet: options.quiet, - scroll: options.scroll, - scrollSpeed: options.scrollSpeed, - scrollSensitivity: options.scrollSensitivity, - delay: options.delay, - ghosting: options.ghosting, - constraint: options.constraint, - handle: options.handle }; - - if(options.starteffect) - options_for_draggable.starteffect = options.starteffect; - - if(options.reverteffect) - options_for_draggable.reverteffect = options.reverteffect; - else - if(options.ghosting) options_for_draggable.reverteffect = function(element) { - element.style.top = 0; - element.style.left = 0; - }; - - if(options.endeffect) - options_for_draggable.endeffect = options.endeffect; - - if(options.zindex) - options_for_draggable.zindex = options.zindex; - - // build options for the droppables - var options_for_droppable = { - overlap: options.overlap, - containment: options.containment, - tree: options.tree, - hoverclass: options.hoverclass, - onHover: Sortable.onHover - }; - - var options_for_tree = { - onHover: Sortable.onEmptyHover, - overlap: options.overlap, - containment: options.containment, - hoverclass: options.hoverclass - }; - - // fix for gecko engine - Element.cleanWhitespace(element); - - options.draggables = []; - options.droppables = []; - - // drop on empty handling - if(options.dropOnEmpty || options.tree) { - Droppables.add(element, options_for_tree); - options.droppables.push(element); - } - - (options.elements || this.findElements(element, options) || []).each( function(e,i) { - var handle = options.handles ? $(options.handles[i]) : - (options.handle ? $(e).select('.' + options.handle)[0] : e); - options.draggables.push( - new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); - Droppables.add(e, options_for_droppable); - if(options.tree) e.treeNode = element; - options.droppables.push(e); - }); - - if(options.tree) { - (Sortable.findTreeElements(element, options) || []).each( function(e) { - Droppables.add(e, options_for_tree); - e.treeNode = element; - options.droppables.push(e); - }); - } - - // keep reference - this.sortables[element.identify()] = options; - - // for onupdate - Draggables.addObserver(new SortableObserver(element, options.onUpdate)); - - }, - - // return all suitable-for-sortable elements in a guaranteed order - findElements: function(element, options) { - return Element.findChildren( - element, options.only, options.tree ? true : false, options.tag); - }, - - findTreeElements: function(element, options) { - return Element.findChildren( - element, options.only, options.tree ? true : false, options.treeTag); - }, - - onHover: function(element, dropon, overlap) { - if(Element.isParent(dropon, element)) return; - - if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) { - return; - } else if(overlap>0.5) { - Sortable.mark(dropon, 'before'); - if(dropon.previousSibling != element) { - var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering - dropon.parentNode.insertBefore(element, dropon); - if(dropon.parentNode!=oldParentNode) - Sortable.options(oldParentNode).onChange(element); - Sortable.options(dropon.parentNode).onChange(element); - } - } else { - Sortable.mark(dropon, 'after'); - var nextElement = dropon.nextSibling || null; - if(nextElement != element) { - var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix gecko rendering - dropon.parentNode.insertBefore(element, nextElement); - if(dropon.parentNode!=oldParentNode) - Sortable.options(oldParentNode).onChange(element); - Sortable.options(dropon.parentNode).onChange(element); - } - } - }, - - onEmptyHover: function(element, dropon, overlap) { - var oldParentNode = element.parentNode; - var droponOptions = Sortable.options(dropon); - - if(!Element.isParent(dropon, element)) { - var index; - - var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); - var child = null; - - if(children) { - var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); - - for (index = 0; index < children.length; index += 1) { - if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { - offset -= Element.offsetSize (children[index], droponOptions.overlap); - } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) { - child = index + 1 < children.length ? children[index + 1] : null; - break; - } else { - child = children[index]; - break; - } - } - } - - dropon.insertBefore(element, child); - - Sortable.options(oldParentNode).onChange(element); - droponOptions.onChange(element); - } - }, - - unmark: function() { - if(Sortable._marker) Sortable._marker.hide(); - }, - - mark: function(dropon, position) { - // mark on ghosting only - var sortable = Sortable.options(dropon.parentNode); - if(sortable && !sortable.ghosting) return; - - if(!Sortable._marker) { - Sortable._marker = - ($('dropmarker') || Element.extend(document.createElement('DIV'))). - hide().addClassName('dropmarker').setStyle({position:'absolute'}); - document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); - } - var offsets = dropon.cumulativeOffset(); - Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); - - if(position=='after') - if(sortable.overlap == 'horizontal') - Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); - else - Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); - - Sortable._marker.show(); - }, - - _tree: function(element, options, parent) { - var children = Sortable.findElements(element, options) || []; - - for (var i = 0; i < children.length; ++i) { - var match = children[i].id.match(options.format); - - if (!match) continue; - - var child = { - id: encodeURIComponent(match ? match[1] : null), - element: element, - parent: parent, - children: [], - position: parent.children.length, - container: $(children[i]).down(options.treeTag) - }; - - /* Get the element containing the children and recurse over it */ - if (child.container) - this._tree(child.container, options, child); - - parent.children.push (child); - } - - return parent; - }, - - tree: function(element) { - element = $(element); - var sortableOptions = this.options(element); - var options = Object.extend({ - tag: sortableOptions.tag, - treeTag: sortableOptions.treeTag, - only: sortableOptions.only, - name: element.id, - format: sortableOptions.format - }, arguments[1] || { }); - - var root = { - id: null, - parent: null, - children: [], - container: element, - position: 0 - }; - - return Sortable._tree(element, options, root); - }, - - /* Construct a [i] index for a particular node */ - _constructIndex: function(node) { - var index = ''; - do { - if (node.id) index = '[' + node.position + ']' + index; - } while ((node = node.parent) != null); - return index; - }, - - sequence: function(element) { - element = $(element); - var options = Object.extend(this.options(element), arguments[1] || { }); - - return $(this.findElements(element, options) || []).map( function(item) { - return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; - }); - }, - - setSequence: function(element, new_sequence) { - element = $(element); - var options = Object.extend(this.options(element), arguments[2] || { }); - - var nodeMap = { }; - this.findElements(element, options).each( function(n) { - if (n.id.match(options.format)) - nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; - n.parentNode.removeChild(n); - }); - - new_sequence.each(function(ident) { - var n = nodeMap[ident]; - if (n) { - n[1].appendChild(n[0]); - delete nodeMap[ident]; - } - }); - }, - - serialize: function(element) { - element = $(element); - var options = Object.extend(Sortable.options(element), arguments[1] || { }); - var name = encodeURIComponent( - (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); - - if (options.tree) { - return Sortable.tree(element, arguments[1]).children.map( function (item) { - return [name + Sortable._constructIndex(item) + "[id]=" + - encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); - }).flatten().join('&'); - } else { - return Sortable.sequence(element, arguments[1]).map( function(item) { - return name + "[]=" + encodeURIComponent(item); - }).join('&'); - } - } -}; - -// Returns true if child is contained within element -Element.isParent = function(child, element) { - if (!child.parentNode || child == element) return false; - if (child.parentNode == element) return true; - return Element.isParent(child.parentNode, element); -}; - -Element.findChildren = function(element, only, recursive, tagName) { - if(!element.hasChildNodes()) return null; - tagName = tagName.toUpperCase(); - if(only) only = [only].flatten(); - var elements = []; - $A(element.childNodes).each( function(e) { - if(e.tagName && e.tagName.toUpperCase()==tagName && - (!only || (Element.classNames(e).detect(function(v) { return only.include(v) })))) - elements.push(e); - if(recursive) { - var grandchildren = Element.findChildren(e, only, recursive, tagName); - if(grandchildren) elements.push(grandchildren); - } - }); - - return (elements.length>0 ? elements.flatten() : []); -}; - -Element.offsetSize = function (element, type) { - return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')]; -}; \ No newline at end of file diff --git a/prefs.php b/prefs.php index 75b8c116d..cd35637c8 100644 --- a/prefs.php +++ b/prefs.php @@ -52,7 +52,7 @@ Date: Tue, 28 Jan 2014 10:07:52 +0400 Subject: remove transition from disabled checkbox --- css/prefs.css | 2 +- css/tt-rss.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'css') diff --git a/css/prefs.css b/css/prefs.css index 7894cf9e8..b5763f4ab 100644 --- a/css/prefs.css +++ b/css/prefs.css @@ -55,7 +55,7 @@ div.prefProfileHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder { border-color : #eee; border-style : solid; margin : 0px 0px 5px 0px; - background-color : #f5f5f5; + background-color : white; } div.filterTestHolder, div.prefFeedOPMLHolder { border-width : 1px; diff --git a/css/tt-rss.css b/css/tt-rss.css index 98ff38290..32b27bf46 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -1151,6 +1151,10 @@ body#ttrssMain #headlines-frame .dijitCheckBox { opacity : 1; } +.claro .dijitCheckBox.dijitCheckBoxDisabled:hover { + opacity : 0.6; +} + .claro .dijitCheckBox.dijitCheckBoxChecked { border-color : #ddffdd; background-image : url("../images/tick.png"); -- cgit v1.2.3-54-g00ecf From 2842d7c2f1724422fc9bd989d5119bad55df10ee Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 11:08:32 +0400 Subject: bring back expando progressbars in feedtree --- css/tt-rss.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'css') diff --git a/css/tt-rss.css b/css/tt-rss.css index 32b27bf46..2009d8f81 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -1120,11 +1120,11 @@ span.highlight { .claro .dijitTreeRow .dijitTreeExpandoLeaf { background : none; -} +} -body#ttrssMain #feedTree .dijitTreeRow .dijitTreeExpandoLeaf { +/* body#ttrssMain #feedTree .dijitTreeRow .dijitTreeExpandoLeaf { display : none; -} +} */ div.enclosure_title { -- cgit v1.2.3-54-g00ecf From 0cdf4e401118c68bbf3b6d84219deb1e640be5fa Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 11:15:02 +0400 Subject: tree css tweaks --- css/tt-rss.css | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'css') diff --git a/css/tt-rss.css b/css/tt-rss.css index 2009d8f81..c3a36bd0f 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -1087,17 +1087,6 @@ body#ttrssPrefs hr { border-color : transparent; } -.claro .dijitTreeRowSelected .dijitTreeLabel, -.claro .dijitTreeRowSelected .dijitTreeLabel { - color : #4684ff; - font-weight : bold; -} - -.claro .dijitTreeRowHover .dijitTreeLabel, -.claro .dijitTreeRowHover .dijitTreeLabel { - color : #4684ff; -} - .claro .dijitTreeRowSelected .dijitTreeLabel { text-shadow : 1px 1px 2px #fff; } -- cgit v1.2.3-54-g00ecf From 4154cba3ae60a64847016fab5c97a1a5f877384e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 13:30:23 +0400 Subject: add bootstrap-like css overrides for dijit buttons --- css/tt-rss.css | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 1 deletion(-) (limited to 'css') diff --git a/css/tt-rss.css b/css/tt-rss.css index c3a36bd0f..c3bb7b810 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -309,6 +309,7 @@ div.prefHelp { display : table-cell; color : #999; font-family : "Segoe UI", Tahoma, sans-serif; + font-size : 12px; } #main-toolbar #headlines-toolbar { @@ -1129,7 +1130,7 @@ body#ttrssMain #headlines-frame .dijitCheckBox { width : 16px; height : 16px; background-position : center center; - opacity : 0.6; + opacity : 0.4; -webkit-transition : opacity 0.25s; transition : opacity 0.25s; border : 1px solid #eee; @@ -1150,6 +1151,153 @@ body#ttrssMain #headlines-frame .dijitCheckBox { opacity : 1; } +.claro .dijitButton .dijitButtonNode, +.claro .dijitComboButton .dijitButtonNode, +.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode, +.claro .dijitToolbar .dijitComboButton, +.claro .dijitToolbar .dijitComboButton .dijitButtonNode { + background : none; + border-color : transparent; + box-shadow : none; +} + +.claro .dijitButton, +.claro .dijitComboButton { + display: inline-block; + padding: 4px 12px; + margin-bottom: 0; + font-size: 14px; + line-height: 20px; + color: #333333; + text-align: center; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: middle; + cursor: pointer; + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + border: 1px solid #cccccc; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + border-bottom-color: #b3b3b3; + -webkit-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} + +.claro .dijitButton:hover, +.claro .dijitButton:focus, +.claro .dijitButton:active, +.claro .dijitComboButton:hover, +.claro .dijitComboButton:focus, +.claro .dijitComboButton:active, +.claro .dijitButton.dijitButtonDisabled { + color: #333333; + background-color: #e6e6e6; +} + +.claro .dijitButton:active, +.claro .dijitComboButton:active { + background-color: #cccccc \9; +} + +.claro .dijitToolbar .dijitButton, +.claro .dijitToolbar .dijitButton.dijitHover, +.claro .dijitToolbar .dijitComboButton, +.claro .dijitToolbar .dijitComboButton.dijitHover { + background : none; + border-color : transparent; + box-shadow : none; + padding : 0px; + margin : 0px; + line-height : auto; +} + +.claro .dijitToolbar .dijitButton.dijitHover, +.claro .dijitToolbar .dijitDropDownButton.dijitHover .dijitButtonNode, +.claro .dijitToolbar .dijitComboButton.dijitHover { + border-color : #ccc; +} + +.claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, +.claro .dijitToolbar .dijitButton.dijitButtonActive .dijitButtonNode { + background : none; +} + +.claro .dijitToolbar .dijitButton .dijitButtonContents, +.claro .dijitToolbar .dijitDropDownButton .dijitButtonContents, +.claro .dijitToolbar .dijitComboButton .dijitButtonContents { + font-size : 13px; +} + +.claro .dijitButton:hover, +.claro .dijitToolbar .dijitButton:hover .dijitButtonNode, +.claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, +.claro .dijitButton:focus, +.claro .dijitComboButton:hover, +.claro .dijitComboButton:focus { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} + +.claro .dijitButton:focus, +.claro .dijitComboButton:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} + +.claro .dijitButton:active, +.claro .dijitComboButton:active, +.claro .dijitToolbar .dijitDropDownButton.dijitOpened, +.claro .dijitToolbar .dijitComboButton.dijitOpened, +.claro .dijitToolbar .dijitButton.dijitButtonActive .dijitButtonNode { + background-image: none; + outline: 0; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); +} + +.claro .dijitButton[disabled], +.claro .dijitButton.dijitButtonDisabled, +.claro .dijitComboButton.dijitButtonDisabled { + cursor: default; + background-image: none; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + box-shadow: none; +} + +.claro .dijitButton .dijitButtonContents, +.claro .dijitComboButton .dijitButtonContents { + font-size : 14px; + font-weight : normal; + line-height : 20px; +} + +.claro .dijitMenu { + border-color : #ccc; +} + +.claro .dijitMenu .dijitMenuItem.dijitHover, +.claro .dijitMenu .dijitMenuItem.dijitFocused, +.claro .dijitMenuTable .dijitMenuItem.dijitHover .dijitMenuItemLabel, +.claro .dijitMenuTable .dijitMenuItem.dijitFocused .dijitMenuItemLabel { + background : #eee; + border-color : transparent; +} + +.claro .dijitButton .dijitButtonNode, +.claro .dijitComboButton .dijitButtonNode { + padding : 0px; +} + :focus { outline: none; } -- cgit v1.2.3-54-g00ecf From d0b72e7a92d0ed23dced0fc731ea8c499f426f3c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 13:33:53 +0400 Subject: extend button code for regular buttons --- css/tt-rss.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'css') diff --git a/css/tt-rss.css b/css/tt-rss.css index c3bb7b810..459413ed5 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -1161,6 +1161,12 @@ body#ttrssMain #headlines-frame .dijitCheckBox { box-shadow : none; } +button { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size : 14px; +} + +button, .claro .dijitButton, .claro .dijitComboButton { display: inline-block; @@ -1187,6 +1193,9 @@ body#ttrssMain #headlines-frame .dijitCheckBox { box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } +button:hover, +button:focus, +button:active, .claro .dijitButton:hover, .claro .dijitButton:focus, .claro .dijitButton:active, @@ -1198,6 +1207,7 @@ body#ttrssMain #headlines-frame .dijitCheckBox { background-color: #e6e6e6; } +button:active, .claro .dijitButton:active, .claro .dijitComboButton:active { background-color: #cccccc \9; @@ -1232,6 +1242,8 @@ body#ttrssMain #headlines-frame .dijitCheckBox { font-size : 13px; } +button:hover, +button:focus, .claro .dijitButton:hover, .claro .dijitToolbar .dijitButton:hover .dijitButtonNode, .claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, @@ -1245,6 +1257,7 @@ body#ttrssMain #headlines-frame .dijitCheckBox { transition: background-position 0.1s linear; } +button:focus, .claro .dijitButton:focus, .claro .dijitComboButton:focus { outline: thin dotted #333; @@ -1252,6 +1265,7 @@ body#ttrssMain #headlines-frame .dijitCheckBox { outline-offset: -2px; } +button:active, .claro .dijitButton:active, .claro .dijitComboButton:active, .claro .dijitToolbar .dijitDropDownButton.dijitOpened, @@ -1263,6 +1277,7 @@ body#ttrssMain #headlines-frame .dijitCheckBox { box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } +button[disabled], .claro .dijitButton[disabled], .claro .dijitButton.dijitButtonDisabled, .claro .dijitComboButton.dijitButtonDisabled { -- cgit v1.2.3-54-g00ecf From 6a4bb7be3370a706bd707089ac02095b727b12dc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 14:20:35 +0400 Subject: minor update to zoom css --- css/zoom.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'css') diff --git a/css/zoom.css b/css/zoom.css index 166361a70..d8d865d9c 100644 --- a/css/zoom.css +++ b/css/zoom.css @@ -45,7 +45,10 @@ body#ttrssZoom div.postContent p { body#ttrssZoom div.postHeader { margin : 10px; - border : 1px solid #eee; + border-width : 0px 0px 1px 0px; + border-style : solid; + border-color #eee; + background : white; } body#ttrssZoom div.postReply { -- cgit v1.2.3-54-g00ecf From ea2dbc7ad5a7dc9e16ec86f32dd9e37d58888534 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 14:21:32 +0400 Subject: update normal postHeader --- css/tt-rss.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'css') diff --git a/css/tt-rss.css b/css/tt-rss.css index 459413ed5..7f7a6b642 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -25,8 +25,7 @@ div.postReply div.postHeader { padding : 5px; margin-right : 4px; color : #909090; - background : #f5f5f5; - border-width : 1px; + border-width : 0px 0px 1px 0px; border-color : #eee; border-style : solid; } -- cgit v1.2.3-54-g00ecf From 196724d1b57e4cf47a1de9cd361f9a4f36472e1c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 15:12:22 +0400 Subject: add dijit.css to default theme --- css/dijit.css | 315 +++++++++++++++++++++++++++++++++++++++++++++++++++++ css/prefs.css | 5 + css/tt-rss.css | 313 +--------------------------------------------------- themes/default.css | 1 + 4 files changed, 323 insertions(+), 311 deletions(-) create mode 100644 css/dijit.css (limited to 'css') diff --git a/css/dijit.css b/css/dijit.css new file mode 100644 index 000000000..d13958dfb --- /dev/null +++ b/css/dijit.css @@ -0,0 +1,315 @@ +/* Tree */ + +.claro .dijitTreeLabel { + outline : 0; +} + +.claro .dijitTree .feedParam { + color : #555; + float : right; + margin-right : 1em; +} + +.claro .dijitTree .labelParam { + float : right; + margin-right : 1em; +} + +.claro .dijitTree .dijitTreeLabel.Disabled, +.claro .dijitTree .labelParam.Disabled { + color : #555; +} + +.claro .dijitTreeRow.Error { + color : red; +} + +.claro .dijitTreeRow.Hidden { + display : none; +} + +.claro .dijitTreeNode .loadingNode { + margin-left : 3px; + height : 9px; +} + +.claro .dijitFolderClosed, +.claro .dijitFolderOpened { + display : none; +} + +.claro .dijitTreeNode .dijitCheckBox { + margin-left : 4px; +} + +.claro .dijitTreeIsRoot > .dijitTreeRow > .dijitTreeExpando { + margin-left : 5px; +} + +.claro .dijitTree .dijitTreeExpando { + margin-top : 0px; + opacity : 0.6; +} + +.claro .dijitTree .dijitTreeNode { + padding : 0px; + border-width : 0px; +} + +.claro .dijitTree .dijitTreeRow { + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; +} + +.claro .dijitTree .dijitTreeRowSelected { + background : white; +} + +.claro .dijitTree .dijitTreeRowHover { + background : #f0f0f0; + border-color : #ddd; +} + +.claro .dijitTree .dijitTreeRowSelected { + background : white; + border-color : #ddd; +} + +.claro .dijitTreeRowSelected .dijitTreeLabel { + text-shadow : 1px 1px 2px #fff; +} + +.claro .dijitTreeRow .dijitTreeExpando { + background-image: url("../images/treeExpandImages.png"); + position : relative; + top : -1px; +} + +.claro .dijitTreeRow .dijitTreeExpandoLeaf { + background : none; +} + +/* Toolbar */ + +.claro .dijitToolbar { + text-shadow : 1px 1px 2px #fff; +} + +/* Dialog */ + +.claro .dijitDialog .dijitToolbar { + border : 1px solid #eee; +} + +.claro .dijitDialog h2 { + margin-top : 0px; + margin-bottom : 4px; + border-width : 0px; +} + +.claro .dijitMenuItemLabel { + font-size : 13px; +} + +/* Checkbox */ + +.claro .dijitCheckBox { + background-image : url("../images/untick.png"); + background-color : transparent; + width : 16px; + height : 16px; + background-position : center center; + opacity : 0.4; + -webkit-transition : opacity 0.25s; + transition : opacity 0.25s; + border : 1px solid #eee; + border-radius : 2px; + padding : 1px; +} + +.claro .dijitCheckBox:hover { + opacity : 1; +} + +.claro .dijitCheckBox.dijitCheckBoxDisabled:hover { + opacity : 0.6; +} + +.claro .dijitCheckBox.dijitCheckBoxChecked { + border-color : #ddffdd; + background-image : url("../images/tick.png"); + opacity : 1; +} + +/* Various buttons */ + +.claro .dijitButton .dijitButtonNode, +.claro .dijitComboButton .dijitButtonNode, +.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode, +.claro .dijitToolbar .dijitComboButton, +.claro .dijitToolbar .dijitComboButton .dijitButtonNode { + background : none; + border-color : transparent; + box-shadow : none; +} + +button { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size : 14px; +} + +button, +.claro .dijitButton, +.claro .dijitComboButton { + display: inline-block; + padding: 4px 12px; + margin-bottom: 0; + font-size: 14px; + line-height: 20px; + color: #333333; + text-align: center; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: middle; + cursor: pointer; + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + border: 1px solid #cccccc; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + border-bottom-color: #b3b3b3; + -webkit-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} + +button:hover, +button:focus, +button:active, +.claro .dijitButton:hover, +.claro .dijitButton:focus, +.claro .dijitButton:active, +.claro .dijitComboButton:hover, +.claro .dijitComboButton:focus, +.claro .dijitComboButton:active, +.claro .dijitButton.dijitButtonDisabled { + color: #333333; + background-color: #e6e6e6; +} + +button:active, +.claro .dijitButton:active, +.claro .dijitComboButton:active { + background-color: #cccccc \9; +} + +.claro .dijitToolbar .dijitButton, +.claro .dijitToolbar .dijitButton.dijitHover, +.claro .dijitToolbar .dijitComboButton, +.claro .dijitToolbar .dijitComboButton.dijitHover { + background : none; + border-color : transparent; + box-shadow : none; + padding : 0px; + margin : 0px; + line-height : auto; +} + +.claro .dijitToolbar .dijitButton.dijitHover, +.claro .dijitToolbar .dijitDropDownButton.dijitHover .dijitButtonNode, +.claro .dijitToolbar .dijitComboButton.dijitHover { + border-color : #ccc; +} + +.claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, +.claro .dijitToolbar .dijitButton.dijitButtonActive .dijitButtonNode { + background : none; +} + +.claro .dijitToolbar .dijitButton .dijitButtonContents, +.claro .dijitToolbar .dijitDropDownButton .dijitButtonContents, +.claro .dijitToolbar .dijitComboButton .dijitButtonContents { + font-size : 13px; +} + +button:hover, +button:focus, +.claro .dijitButton:hover, +.claro .dijitToolbar .dijitButton:hover .dijitButtonNode, +.claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, +.claro .dijitButton:focus, +.claro .dijitComboButton:hover, +.claro .dijitComboButton:focus { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} + +button:focus, +.claro .dijitButton:focus, +.claro .dijitComboButton:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} + +button:active, +.claro .dijitButton:active, +.claro .dijitComboButton:active, +.claro .dijitToolbar .dijitDropDownButton.dijitOpened, +.claro .dijitToolbar .dijitComboButton.dijitOpened, +.claro .dijitToolbar .dijitButton.dijitButtonActive .dijitButtonNode { + background-image: none; + outline: 0; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); +} + +button[disabled], +.claro .dijitButton[disabled], +.claro .dijitButton.dijitButtonDisabled, +.claro .dijitComboButton.dijitButtonDisabled { + cursor: default; + background-image: none; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + box-shadow: none; +} + +.claro .dijitButton .dijitButtonContents, +.claro .dijitComboButton .dijitButtonContents { + font-size : 14px; + font-weight : normal; + line-height : 20px; +} + +.claro .dijitMenu { + border-color : #ccc; +} + +.claro .dijitMenu .dijitMenuItem.dijitHover, +.claro .dijitMenu .dijitMenuItem.dijitFocused, +.claro .dijitMenuTable .dijitMenuItem.dijitHover .dijitMenuItemLabel, +.claro .dijitMenuTable .dijitMenuItem.dijitFocused .dijitMenuItemLabel { + background : #eee; + border-color : transparent; +} + +.claro .dijitButton .dijitButtonNode, +.claro .dijitComboButton .dijitButtonNode { + padding : 0px; +} + +/* Other stuff */ + +.claro .dijitAccordionTitleFocus { + text-shadow : 1px 1px 2px #fff; +} + + diff --git a/css/prefs.css b/css/prefs.css index b5763f4ab..502552599 100644 --- a/css/prefs.css +++ b/css/prefs.css @@ -118,6 +118,11 @@ table.prefErrorLog td.filename, table.prefErrorLog td.login, table.prefErrorLog color : #555; } +body#ttrssPrefs hr { + border-color : #ecf4ff; + max-width : 100%; +} + .claro .dijitTabPaneWrapper, .claro .dijitTabContainerTop-tabs, .claro .dijitTab, diff --git a/css/tt-rss.css b/css/tt-rss.css index 7f7a6b642..2d5787e51 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -824,33 +824,6 @@ div.fatalError textarea { color : red; } -.claro .dijitTreeLabel { - outline : 0; -} - -.feedParam { - color : #555; - float : right; - margin-right : 1em; -} - -.labelParam { - float : right; - margin-right : 1em; -} - -.dijitTreeLabel.Disabled, .labelParam.Disabled { - color : #555; -} - -.dijitTreeRow.Error { - color : red; -} - -.dijitTreeRow.Hidden { - display : none; -} - img.feedIcon, img.tinyFeedIcon { width : 16px; height : 16px; @@ -859,24 +832,6 @@ img.feedIcon, img.tinyFeedIcon { display : inline-block; } -.dijitToolbar { - text-shadow : 1px 1px 2px #fff; -} - -.dijitAccordionTitleFocus { - text-shadow : 1px 1px 2px #fff; -} - -.claro .dijitDialog .dijitToolbar { - border : 1px solid #eee; -} - -.dijitDialog h2 { - margin-top : 0px; - margin-bottom : 4px; - border-width : 0px; -} - .player { display : inline-block; color : #555; @@ -926,10 +881,6 @@ ul#filterDlg_Matches li, ul#filterDlg_Actions li { padding : 0px 0px 0px 5px; } -ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitCheckBox { - margin-right : 5px; -} - ul.helpKbList { max-height : 300px; overflow : auto; @@ -952,11 +903,6 @@ ul.helpKbList h2 { margin-top : 0px; } -.dijitTreeNode .loadingNode { - margin-left : 3px; - height : 9px; -} - span.collapseBtn { cursor : pointer; } @@ -1000,31 +946,8 @@ body#ttrssMain #feedTree .dijitTreeRow { color : #333; } -.claro .dijitTreeRow { - border-color : transparent; -} - -.claro .dijitFolderClosed, -.claro .dijitFolderOpened { - display : none; -} - -.claro .dijitTreeNode .dijitCheckBox { - margin-left : 4px; -} - -.claro .dijitTreeIsRoot > .dijitTreeRow > .dijitTreeExpando { - margin-left : 5px; -} - -.claro .dijitTree .dijitTreeExpando { - margin-top : 0px; - opacity : 0.6; -} - -.claro .dijitTreeNode { - padding : 0px; - border-width : 0px; +ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitCheckBox { + margin-right : 5px; } body#ttrssMain #feedTree { @@ -1058,39 +981,6 @@ body#ttrssMain #feedTree .counterNode { height : 14px; } -.claro .dijitTree .dijitTreeRow { - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; -} - -body#ttrssPrefs hr { - border-color : #ecf4ff; - max-width : 100%; -} - -.claro .dijitMenuItemLabel { - font-size : 13px; -} - -.claro .dijitTree .dijitTreeRowSelected { - background : white; -} - -.claro .dijitTree .dijitTreeRowHover { - background : #ecf4ff; -} - -.claro .dijitTree .dijitTreeRowActive { - background-color : transparent; - background-image : none; - border-color : transparent; -} - -.claro .dijitTreeRowSelected .dijitTreeLabel { - text-shadow : 1px 1px 2px #fff; -} - #feedTree img[src*='indicator_white.gif'] { position : relative; top : -2px; @@ -1101,16 +991,6 @@ span.highlight { color : #cc90cc; } -.claro .dijitTreeRow .dijitTreeExpando { - background-image: url("../images/treeExpandImages.png"); - position : relative; - top : -1px; -} - -.claro .dijitTreeRow .dijitTreeExpandoLeaf { - background : none; -} - /* body#ttrssMain #feedTree .dijitTreeRow .dijitTreeExpandoLeaf { display : none; } */ @@ -1123,195 +1003,6 @@ body#ttrssMain #headlines-frame .dijitCheckBox { border-width : 0px; } -.claro .dijitCheckBox { - background-image : url("../images/untick.png"); - background-color : transparent; - width : 16px; - height : 16px; - background-position : center center; - opacity : 0.4; - -webkit-transition : opacity 0.25s; - transition : opacity 0.25s; - border : 1px solid #eee; - border-radius : 2px; - padding : 1px; -} -.claro .dijitCheckBox:hover { - opacity : 1; -} - -.claro .dijitCheckBox.dijitCheckBoxDisabled:hover { - opacity : 0.6; -} - -.claro .dijitCheckBox.dijitCheckBoxChecked { - border-color : #ddffdd; - background-image : url("../images/tick.png"); - opacity : 1; -} - -.claro .dijitButton .dijitButtonNode, -.claro .dijitComboButton .dijitButtonNode, -.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode, -.claro .dijitToolbar .dijitComboButton, -.claro .dijitToolbar .dijitComboButton .dijitButtonNode { - background : none; - border-color : transparent; - box-shadow : none; -} - -button { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size : 14px; -} - -button, -.claro .dijitButton, -.claro .dijitComboButton { - display: inline-block; - padding: 4px 12px; - margin-bottom: 0; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #cccccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #b3b3b3; - -webkit-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -button:hover, -button:focus, -button:active, -.claro .dijitButton:hover, -.claro .dijitButton:focus, -.claro .dijitButton:active, -.claro .dijitComboButton:hover, -.claro .dijitComboButton:focus, -.claro .dijitComboButton:active, -.claro .dijitButton.dijitButtonDisabled { - color: #333333; - background-color: #e6e6e6; -} - -button:active, -.claro .dijitButton:active, -.claro .dijitComboButton:active { - background-color: #cccccc \9; -} - -.claro .dijitToolbar .dijitButton, -.claro .dijitToolbar .dijitButton.dijitHover, -.claro .dijitToolbar .dijitComboButton, -.claro .dijitToolbar .dijitComboButton.dijitHover { - background : none; - border-color : transparent; - box-shadow : none; - padding : 0px; - margin : 0px; - line-height : auto; -} - -.claro .dijitToolbar .dijitButton.dijitHover, -.claro .dijitToolbar .dijitDropDownButton.dijitHover .dijitButtonNode, -.claro .dijitToolbar .dijitComboButton.dijitHover { - border-color : #ccc; -} - -.claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, -.claro .dijitToolbar .dijitButton.dijitButtonActive .dijitButtonNode { - background : none; -} - -.claro .dijitToolbar .dijitButton .dijitButtonContents, -.claro .dijitToolbar .dijitDropDownButton .dijitButtonContents, -.claro .dijitToolbar .dijitComboButton .dijitButtonContents { - font-size : 13px; -} - -button:hover, -button:focus, -.claro .dijitButton:hover, -.claro .dijitToolbar .dijitButton:hover .dijitButtonNode, -.claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, -.claro .dijitButton:focus, -.claro .dijitComboButton:hover, -.claro .dijitComboButton:focus { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -button:focus, -.claro .dijitButton:focus, -.claro .dijitComboButton:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -button:active, -.claro .dijitButton:active, -.claro .dijitComboButton:active, -.claro .dijitToolbar .dijitDropDownButton.dijitOpened, -.claro .dijitToolbar .dijitComboButton.dijitOpened, -.claro .dijitToolbar .dijitButton.dijitButtonActive .dijitButtonNode { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -button[disabled], -.claro .dijitButton[disabled], -.claro .dijitButton.dijitButtonDisabled, -.claro .dijitComboButton.dijitButtonDisabled { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - box-shadow: none; -} - -.claro .dijitButton .dijitButtonContents, -.claro .dijitComboButton .dijitButtonContents { - font-size : 14px; - font-weight : normal; - line-height : 20px; -} - -.claro .dijitMenu { - border-color : #ccc; -} - -.claro .dijitMenu .dijitMenuItem.dijitHover, -.claro .dijitMenu .dijitMenuItem.dijitFocused, -.claro .dijitMenuTable .dijitMenuItem.dijitHover .dijitMenuItemLabel, -.claro .dijitMenuTable .dijitMenuItem.dijitFocused .dijitMenuItemLabel { - background : #eee; - border-color : transparent; -} - -.claro .dijitButton .dijitButtonNode, -.claro .dijitComboButton .dijitButtonNode { - padding : 0px; -} - :focus { outline: none; } diff --git a/themes/default.css b/themes/default.css index 83e15257b..acdb23c5d 100644 --- a/themes/default.css +++ b/themes/default.css @@ -1,3 +1,4 @@ @import "../css/tt-rss.css"; +@import "../css/dijit.css"; @import "../css/cdm.css"; @import "../css/prefs.css"; -- cgit v1.2.3-54-g00ecf From 2204dca90b86685b7611a83fc4b189686349b6ce Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 15:30:48 +0400 Subject: handle input type submit --- css/dijit.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'css') diff --git a/css/dijit.css b/css/dijit.css index d13958dfb..8bebe8694 100644 --- a/css/dijit.css +++ b/css/dijit.css @@ -154,12 +154,14 @@ box-shadow : none; } -button { +button, +input[type="submit"] { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size : 14px; } button, +input[type="submit"], .claro .dijitButton, .claro .dijitComboButton { display: inline-block; @@ -189,6 +191,9 @@ button, button:hover, button:focus, button:active, +input[type="submit"]:hover, +input[type="submit"]:focus, +input[type="submit"]:active, .claro .dijitButton:hover, .claro .dijitButton:focus, .claro .dijitButton:active, @@ -201,6 +206,7 @@ button:active, } button:active, +input[type="submit"]:active, .claro .dijitButton:active, .claro .dijitComboButton:active { background-color: #cccccc \9; @@ -237,6 +243,8 @@ button:active, button:hover, button:focus, +input[type="submit"]:hover, +input[type="submit"]:focus, .claro .dijitButton:hover, .claro .dijitToolbar .dijitButton:hover .dijitButtonNode, .claro .dijitToolbar .dijitButton.dijitHover .dijitButtonNode, @@ -251,6 +259,7 @@ button:focus, } button:focus, +input[type="submit"]:focus, .claro .dijitButton:focus, .claro .dijitComboButton:focus { outline: thin dotted #333; @@ -259,6 +268,7 @@ button:focus, } button:active, +input[type="submit"]:active, .claro .dijitButton:active, .claro .dijitComboButton:active, .claro .dijitToolbar .dijitDropDownButton.dijitOpened, @@ -270,6 +280,7 @@ button:active, box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } +input[type="submit"][disabled], button[disabled], .claro .dijitButton[disabled], .claro .dijitButton.dijitButtonDisabled, -- cgit v1.2.3-54-g00ecf From 24a1ac78a79e522cbeddd6d55cd389ff2eb642cb Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 15:31:13 +0400 Subject: update utility.css --- css/utility.css | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'css') diff --git a/css/utility.css b/css/utility.css index 587061bcc..b110c08b8 100644 --- a/css/utility.css +++ b/css/utility.css @@ -1,5 +1,5 @@ body { - background : #f9fbff; + background : #f5f5f5; color : black; padding : 0px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -19,8 +19,6 @@ div.content { background : white; border : 1px solid #ccc; padding : 10px; - border-radius : 4px; - box-shadow : inset 0 0 3px rgba(0,0,0,0.1); } p.warning { @@ -41,9 +39,7 @@ div.insensitive-small { } .floatingLogo { - float : right; - position : relative; - top : -10px; + display : none; } a { @@ -62,7 +58,6 @@ div.notice, div.warning, div.error { font-size : 12px; border-style : solid; border-color : #ccc; - border-radius : 4px; border-width : 1px; box-shadow : inset 0px 0px 2px rgba(0,0,0,0.1); } -- cgit v1.2.3-54-g00ecf From 03700cb6398e26c197ccc91ce4d8b85b60f49ba8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 15:40:33 +0400 Subject: increase border contrast a bit --- css/cdm.css | 8 ++++++-- css/dijit.css | 6 +++--- css/tt-rss.css | 30 +++++++++++++----------------- css/utility.css | 2 +- css/zoom.css | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'css') diff --git a/css/cdm.css b/css/cdm.css index 1c2311399..a7b7c74f5 100644 --- a/css/cdm.css +++ b/css/cdm.css @@ -68,6 +68,10 @@ div.cdmFooter { clear : both; } +div.cdm { + margin-right : 4px; +} + div.cdm.expanded { margin-top : 4px; margin-bottom : 4px; @@ -76,7 +80,7 @@ div.cdm.expanded { div.cdm.expanded div.cdmFooter { border-style : solid; border-width : 0px 0px 1px 0px; - border-color : #f0f0f0; + border-color : #ddd; } div.cdm.expandable { @@ -250,7 +254,7 @@ div#floatingTitle { top : 0px; right : 0px; left : 0px; - border-color : #eee; + border-color : #ddd; border-width : 0px 0px 1px 0px; border-style : solid; background : white; diff --git a/css/dijit.css b/css/dijit.css index 8bebe8694..a3d1e19c5 100644 --- a/css/dijit.css +++ b/css/dijit.css @@ -96,12 +96,12 @@ text-shadow : 1px 1px 2px #fff; } -/* Dialog */ - .claro .dijitDialog .dijitToolbar { - border : 1px solid #eee; + border : 1px solid #ddd; } +/* Dialog */ + .claro .dijitDialog h2 { margin-top : 0px; margin-bottom : 4px; diff --git a/css/tt-rss.css b/css/tt-rss.css index 2d5787e51..5b7567db0 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -26,7 +26,7 @@ div.postReply div.postHeader { margin-right : 4px; color : #909090; border-width : 0px 0px 1px 0px; - border-color : #eee; + border-color : #ddd; border-style : solid; } @@ -200,7 +200,7 @@ a:hover { .hl { border-width : 0px 0px 1px 0px; border-style : solid; - border-color : #eee; + border-color : #ddd; } .hl.active { @@ -210,7 +210,7 @@ a:hover { div.filterTestHolder { height : 300px; overflow : auto; - border-color : #eee; + border-color : #ddd; border-style : solid; margin : 0px 0px 5px 0px; background-color : #f5f5f5; @@ -382,7 +382,7 @@ div.postHeader div { #allEntryTags { border-width : 0px 0px 1px 0px; border-style : solid; - border-color : #eee; + border-color : #ddd; padding-bottom : 5px; display : none; } @@ -421,7 +421,7 @@ img[src*='pub_set.png'], img[src*='mark_set.png'] { } div.tagCloudContainer { - border : 1px solid #eee; + border : 1px solid #ddd; background-color : #f5f5f5; margin : 5px 0px 5px 0px; padding : 5px; @@ -429,7 +429,7 @@ div.tagCloudContainer { } div.errorExplained { - border : 1px solid #eee; + border : 1px solid #ddd; background-color : #f5f5f5; margin : 5px 0px 5px 0px; padding : 5px; @@ -439,7 +439,7 @@ ul.feedErrorsList { max-height : 300px; overflow : auto; list-style-type : none; - border : 1px solid #eee; + border : 1px solid #ddd; background-color : #f5f5f5; margin : 0px 0px 5px 0px; padding : 5px; @@ -453,7 +453,7 @@ ul.browseFeedList { height : 300px; overflow : auto; border-width : 0px 1px 1px 1px; - border-color : #eee; + border-color : #ddd; border-style : solid; margin : 0px 0px 5px 0px; background-color : white; @@ -739,8 +739,6 @@ div.fatalError textarea { #content-wrap { padding : 0px; border-width : 0px; - border-style : solid; - border-color : #eee; margin : 0px; } @@ -748,7 +746,7 @@ div.fatalError textarea { padding : 0px; border-width : 0px 1px 0px 0px; border-style : solid; - border-color : #eee; + border-color : #ddd; overflow : hidden; background : #f5f5f5; } @@ -761,8 +759,6 @@ div.fatalError textarea { #headlines-frame { padding : 0px; - border-color : #eee; - border-style : solid; border-width : 0px; margin-top : 0px; } @@ -782,7 +778,7 @@ div.fatalError textarea { #main-toolbar { background : white; border-width : 0px 0px 1px 0px; - border-color : #eee; + border-color : #ddd; border-style : solid; padding-left : 4px; height : 26px; @@ -810,7 +806,7 @@ div.fatalError textarea { #content-insert { padding : 0px; - border-color : #eee; + border-color : #ddd; border-width : 0px; line-height: 20px; overflow : auto; @@ -869,7 +865,7 @@ ul#filterDlg_Matches, ul#filterDlg_Actions { overflow : auto; list-style-type : none; border-style : solid; - border-color : #eee; + border-color : #ddd; border-width : 0px 1px 1px 1px; background-color : white; margin : 0px 0px 5px 0px; @@ -885,7 +881,7 @@ ul.helpKbList { max-height : 300px; overflow : auto; list-style-type : none; - border : 1px solid #eee; + border : 1px solid #ddd; background-color : #f5f5f5; margin : 0px 0px 5px 0px; padding : 5px; diff --git a/css/utility.css b/css/utility.css index b110c08b8..037987540 100644 --- a/css/utility.css +++ b/css/utility.css @@ -17,7 +17,7 @@ form { div.content { overflow : hidden; background : white; - border : 1px solid #ccc; + border : 1px solid #ddd; padding : 10px; } diff --git a/css/zoom.css b/css/zoom.css index d8d865d9c..01c7cc090 100644 --- a/css/zoom.css +++ b/css/zoom.css @@ -52,7 +52,7 @@ body#ttrssZoom div.postHeader { } body#ttrssZoom div.postReply { - border : 1px solid #eee; + border : 1px solid #ddd; background : white; } -- cgit v1.2.3-54-g00ecf From 94847c985be2b21d6bcd301befd337644a10d694 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 16:12:17 +0400 Subject: add blockquote/zoom/pre styles to zoom.css --- css/zoom.css | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 15 deletions(-) (limited to 'css') diff --git a/css/zoom.css b/css/zoom.css index 01c7cc090..b71625fc4 100644 --- a/css/zoom.css +++ b/css/zoom.css @@ -1,4 +1,4 @@ -body#ttrssZoom { +body { margin-left : auto; margin-right : auto; padding : 20px; @@ -6,20 +6,20 @@ body#ttrssZoom { background : #f5f5f5; } -body#ttrssZoom div.postHeader div.postFeedTitle { +div.postHeader div.postFeedTitle { float : left; text-align : right; padding-left : 0px; font-size : 10px; } -body#ttrssZoom div.postHeader a.postComments { +div.postHeader a.postComments { text-align : right; padding-left : 0px; font-size : 10px; } -body#ttrssZoom div.postHeader div.postDate { +div.postHeader div.postDate { float : none; text-align : right; padding-left : 0px; @@ -27,23 +27,23 @@ body#ttrssZoom div.postHeader div.postDate { font-size : 10px; } -body#ttrssZoom div.postHeader div.postTags { +div.postHeader div.postTags { color : #777; font-size : 10px; } -body#ttrssZoom div.postHeader div.postTitle { +div.postHeader div.postTitle { white-space : normal; } -body#ttrssZoom div.postContent p { +div.postContent p { max-width : 650px; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; } -body#ttrssZoom div.postHeader { +div.postHeader { margin : 10px; border-width : 0px 0px 1px 0px; border-style : solid; @@ -51,23 +51,48 @@ body#ttrssZoom div.postHeader { background : white; } -body#ttrssZoom div.postReply { +div.postReply { border : 1px solid #ddd; background : white; } -body#ttrssZoom div.postContent { - -} - -body#ttrssZoom div.footer { +div.footer { margin-top : 1em; text-align : center; } -body#ttrssZoom div.postContent img { +div.postContent img { max-width : 650px; height : auto; } +div.postContent blockquote { + margin : 5px 0px 5px 0px; + color : #555; + padding-left : 10px; + border-width : 0px 0px 0px 4px; + border-color : #ccc; + border-style : solid; +} + +div.postContent code { + color : #009900; + font-family : monospace; + font-size : 12px; +} + +div.postContent pre { + margin : 5px 0px 5px 0px; + padding : 10px; + color : #555; + font-family : monospace; + font-size : 12px; + border-width : 0px; + border-color : #ccc; + border-style : solid; + background : #f5f5f5; + display : block; + max-width : 98%; + overflow : auto; +} -- cgit v1.2.3-54-g00ecf From 8b381f7f26b779c287b5dcdf98dc169ca35beaed Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 18:36:48 +0400 Subject: remove blue accent from tabs, move some other dijit overrides to dijit.css --- css/dijit.css | 36 ++++++++++++++++++++++++++++++++++++ css/prefs.css | 25 ------------------------- 2 files changed, 36 insertions(+), 25 deletions(-) (limited to 'css') diff --git a/css/dijit.css b/css/dijit.css index a3d1e19c5..a529129f3 100644 --- a/css/dijit.css +++ b/css/dijit.css @@ -1,5 +1,10 @@ /* Tree */ +.claro .dijitTreeRow .dijitCheckBox { + position : relative; + top : -2px; +} + .claro .dijitTreeLabel { outline : 0; } @@ -92,6 +97,11 @@ /* Toolbar */ +.claro .dijitToolbar { + background : #f5f5f5; + border-color : #ddd; +} + .claro .dijitToolbar { text-shadow : 1px 1px 2px #fff; } @@ -323,4 +333,30 @@ button[disabled], text-shadow : 1px 1px 2px #fff; } +.claro .dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected { + border-color : #ccc; +} + +.claro .dijitAccordionContainer .dijitAccordionChildWrapper { + border-color : #ddd; +} + +/* Tabs */ + +.claro .dijitTabContent { + background : #eee; +} + +.claro .dijitTabContent.dijitTabChecked, +.claro .dijitTabContent.dijitTabHover, +.claro .dijitTabContent.dijitFocused { + background : white; +} + +.claro .dijitTabPaneWrapper, +.claro .dijitTabContainerTop-tabs, +.claro .dijitTab, +.claro .dijitAccordionInnerContainer { + border-color : #ddd; +} diff --git a/css/prefs.css b/css/prefs.css index 502552599..a60cdca99 100644 --- a/css/prefs.css +++ b/css/prefs.css @@ -123,29 +123,4 @@ body#ttrssPrefs hr { max-width : 100%; } -.claro .dijitTabPaneWrapper, -.claro .dijitTabContainerTop-tabs, -.claro .dijitTab, -.claro .dijitAccordionInnerContainer { - border-color : #ddd; -} - -.claro .dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected { - border-color : #ccc; -} - -.claro .dijitToolbar { - background : #f5f5f5; - border-color : #eee; -} - -.claro .dijitAccordionContainer .dijitAccordionChildWrapper { - border-color : #ddd; -} - -.claro .dijitTreeRow .dijitCheckBox { - position : relative; - top : -2px; -} - -- cgit v1.2.3-54-g00ecf From cc4083ab81d35ab5775dd00bc6a5112083e88292 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 18:38:29 +0400 Subject: add some increased contrast borders to dialogs --- css/prefs.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'css') diff --git a/css/prefs.css b/css/prefs.css index a60cdca99..b505f47f8 100644 --- a/css/prefs.css +++ b/css/prefs.css @@ -52,7 +52,7 @@ div.prefProfileHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder { height : 300px; overflow : auto; border-width : 0px 1px 1px 1px; - border-color : #eee; + border-color : #ddd; border-style : solid; margin : 0px 0px 5px 0px; background-color : white; @@ -65,7 +65,7 @@ ul.selfUpdateList, ul.userFeedList { height : 200px; overflow : auto; list-style-type : none; - border : 1px solid #eee; + border : 1px solid #ddd; background-color : #f5f5f5; margin : 0px 0px 5px 0px; padding : 5px; @@ -87,7 +87,7 @@ div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading { a.bookmarklet { color : #4684ff; - border : 1px solid #eee; + border : 1px solid #ddd; background : #f5f5f5; padding : 2px; } -- cgit v1.2.3-54-g00ecf From 5470cfab6dc09c1e6fda29d145d746d2c46ae42d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 23:37:07 +0400 Subject: add some experimental font family updates for headlines and chrome elements --- css/cdm.css | 24 ++++++++++++++++++++---- css/dijit.css | 15 +++++++++++++-- css/prefs.css | 1 - css/tt-rss.css | 38 +++++++++++++++++++++++++++++++++----- 4 files changed, 66 insertions(+), 12 deletions(-) (limited to 'css') diff --git a/css/cdm.css b/css/cdm.css index a7b7c74f5..eb4a2243c 100644 --- a/css/cdm.css +++ b/css/cdm.css @@ -123,11 +123,15 @@ div.cdm.expandable.active div.cdmHeader span.titleWrap { } div.cdm.expandable div.cdmHeader a.title { - font-weight : bold; + font-weight : 600; color : #555; font-size : 14px; -webkit-transition : color 0.2s; transition : color 0.2s; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } div.cdm.expandable.Unread div.cdmHeader a.title { @@ -137,6 +141,11 @@ div.cdm.expandable.Unread div.cdmHeader a.title { div.cdm.expandable.active div.cdmHeader a.title { color : #4684ff; font-size : 16px; + font-weight : 600; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } div.cdm.expanded div.cdmHeader { @@ -146,9 +155,13 @@ div.cdm.expanded div.cdmHeader { div.cdm.expanded div.cdmHeader a.title { font-size : 16px; color : #999; - font-weight : bold; + font-weight : 600; -webkit-transition : color 0.2s; transition : color 0.2s; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } div.cdm.expanded.active { @@ -283,9 +296,13 @@ div#floatingTitle span.author { div#floatingTitle a.title { font-size : 16px; color : #999; - font-weight : bold; -webkit-transition : color 0.2s; transition : color 0.2s; + font-weight : 600; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } div#floatingTitle.Unread a.title { @@ -293,7 +310,6 @@ div#floatingTitle.Unread a.title { } div#floatingTitle img.anchor { - margin-right : 1px; margin-left : 0px; } diff --git a/css/dijit.css b/css/dijit.css index a529129f3..696648f0f 100644 --- a/css/dijit.css +++ b/css/dijit.css @@ -100,6 +100,10 @@ .claro .dijitToolbar { background : #f5f5f5; border-color : #ddd; + /* text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; */ } .claro .dijitToolbar { @@ -329,9 +333,16 @@ button[disabled], /* Other stuff */ -.claro .dijitAccordionTitleFocus { +/* .claro .dijitAccordionTitleFocus { text-shadow : 1px 1px 2px #fff; -} +} + +.claro .dijitAccordionTitle { + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; +} */ .claro .dijitAccordionInnerContainer.dijitAccordionInnerContainerSelected { border-color : #ccc; diff --git a/css/prefs.css b/css/prefs.css index b505f47f8..d3fe064df 100644 --- a/css/prefs.css +++ b/css/prefs.css @@ -18,7 +18,6 @@ div#pref-tabs { div#pref-tabs .dijitContentPane h3 { font-size : 14px; - font-weight : bold; } #pref-filter-wrap, #pref-filter-header, #pref-filter-content, diff --git a/css/tt-rss.css b/css/tt-rss.css index 5b7567db0..673c51b65 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -34,6 +34,11 @@ div.postReply div.postTitle { overflow : hidden; text-overflow: ellipsis; white-space : nowrap; + font-weight : 600; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } div.postReply div.postDate { @@ -84,22 +89,35 @@ div.postReply span.author { h1 { font-size : 18px; + font-weight : 600; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } h2 { font-size : 16px; - font-weight : bold; + font-weight : 600; border-width : 0px 0px 1px 0px; border-style : solid; border-color : #ecf4ff; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } h3 { font-size : 12px; - font-weight : bold; border-width : 0px 0px 1px 0px; border-style : solid; border-color : #ecf4ff; + font-weight : 600; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } hr { @@ -176,7 +194,11 @@ a:hover { } .hl div.hlTitle a { - font-weight : bold; + font-weight : 600; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; color : #777; } @@ -307,7 +329,10 @@ div.prefHelp { white-space : nowrap; display : table-cell; color : #999; - font-family : "Segoe UI", Tahoma, sans-serif; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; font-size : 12px; } @@ -949,7 +974,10 @@ ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitChec body#ttrssMain #feedTree { height : 100%; overflow-x : hidden; - font-family : "Segoe UI", Tahoma, sans-serif; + text-rendering: optimizelegibility; + font-family : "Segoe WP Semibold", "Segoe UI Semibold", + "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", + Helvetica, Arial, sans-serif; } body#ttrssMain #feedTree .counterNode.aux { -- cgit v1.2.3-54-g00ecf From ad926dfb3be9f4706889b21c916e32e124166272 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 23:51:59 +0400 Subject: toolbar css fixes --- css/tt-rss.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'css') diff --git a/css/tt-rss.css b/css/tt-rss.css index 673c51b65..d791f163f 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -329,11 +329,20 @@ div.prefHelp { white-space : nowrap; display : table-cell; color : #999; +} + +#main-toolbar > *, +#main-toolbar table * { text-rendering: optimizelegibility; font-family : "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size : 12px; + +} + +#main-toolbar .dijitDownArrowButton { + font-size : 11px; } #main-toolbar #headlines-toolbar { @@ -354,6 +363,11 @@ div.prefHelp { text-align : right; } +#main-toolbar #headlines-toolbar .main, +#main-toolbar #headlines-toolbar .r { + line-height : 24px; +} + #headlines-toolbar span.r img { margin-right : 4px; position : relative; -- cgit v1.2.3-54-g00ecf From 96cac8fe05fcc7836af32138959c4b8d85e20a69 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 23:56:10 +0400 Subject: toolbar css fixes (2) --- css/tt-rss.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'css') diff --git a/css/tt-rss.css b/css/tt-rss.css index d791f163f..506780908 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -332,7 +332,8 @@ div.prefHelp { } #main-toolbar > *, -#main-toolbar table * { +#main-toolbar table *, +#main-toolbar .actionChooser * { text-rendering: optimizelegibility; font-family : "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", "Helvetica Neue", @@ -341,7 +342,7 @@ div.prefHelp { } -#main-toolbar .dijitDownArrowButton { +#main-toolbar #headlines-toolbar .dijitDownArrowButton { font-size : 11px; } -- cgit v1.2.3-54-g00ecf From 14f3509f62be3cc4857cad9b676f610d49220c1d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 28 Jan 2014 23:59:42 +0400 Subject: enlarge zoomed post title a bit --- css/zoom.css | 1 + 1 file changed, 1 insertion(+) (limited to 'css') diff --git a/css/zoom.css b/css/zoom.css index b71625fc4..4ec191849 100644 --- a/css/zoom.css +++ b/css/zoom.css @@ -34,6 +34,7 @@ div.postHeader div.postTags { div.postHeader div.postTitle { white-space : normal; + font-size : 16px; } div.postContent p { -- cgit v1.2.3-54-g00ecf From b4eff716b2d515a32d71813de872529d827df71d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 29 Jan 2014 00:04:36 +0400 Subject: reduce size of h1,2,3 elements inside article content --- css/cdm.css | 9 +++++++++ css/tt-rss.css | 9 +++++++++ 2 files changed, 18 insertions(+) (limited to 'css') diff --git a/css/cdm.css b/css/cdm.css index eb4a2243c..560c68fdd 100644 --- a/css/cdm.css +++ b/css/cdm.css @@ -61,6 +61,15 @@ div.cdmContentInner img { height : auto; } +div.cdmContentInner h1 { + font-size : 16px; +} + +div.cdmContentInner h2, +div.cdmContentInner h3 { + font-size : 14px; +} + div.cdmFooter { padding : 5px; font-weight : normal; diff --git a/css/tt-rss.css b/css/tt-rss.css index 506780908..61c1db0d8 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -943,6 +943,15 @@ span.collapseBtn { cursor : pointer; } +div.postContent h1 { + font-size : 16px; +} + +div.postContent h2, +div.postContent h3 { + font-size : 14px; +} + div.postContent p { max-width : 650px; -webkit-hyphens: auto; -- cgit v1.2.3-54-g00ecf From 029005c49b29bc5deaebb45ccfb098a0196a2ff3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 29 Jan 2014 00:21:57 +0400 Subject: minor style updates to make 3panel headlines mode look closer to cdm --- classes/feeds.php | 9 +++++---- css/cdm.css | 2 +- css/tt-rss.css | 56 +++++++++++++++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 27 deletions(-) (limited to 'css') diff --git a/classes/feeds.php b/classes/feeds.php index 86a426208..e9ab53e76 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -480,17 +480,18 @@ class Feeds extends Handler_Protected { $reply['content'] .= "