From be082e3977e4f42a79613ff6dd88900310a4cd0f Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Thu, 19 Apr 2012 16:28:08 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D1=81=D1=82=D0=BA=D0=B8=20=D0=B2=20IE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.php | 2 + engine/lib/external/html5shiv.js | 220 ++++++++++++++++++ .../external/jquery/jquery.placeholder.min.js | 2 + .../skin/developer-jquery/css/blocks.css | 2 +- .../skin/developer-jquery/css/buttons.css | 3 + .../skin/developer-jquery/css/comments.css | 4 +- .../skin/developer-jquery/css/common.css | 28 +-- templates/skin/developer-jquery/css/forms.css | 16 +- templates/skin/developer-jquery/css/icons.css | 4 +- .../developer-jquery/css/jquery.notifier.css | 2 +- .../skin/developer-jquery/css/modals.css | 10 +- templates/skin/developer-jquery/css/navs.css | 2 +- templates/skin/developer-jquery/css/topic.css | 2 +- templates/skin/developer-jquery/css/wall.css | 8 +- templates/skin/developer-jquery/header.tpl | 2 +- .../developer-jquery/js/developer-jquery.js | 15 ++ 16 files changed, 288 insertions(+), 34 deletions(-) create mode 100644 engine/lib/external/html5shiv.js create mode 100644 engine/lib/external/jquery/jquery.placeholder.min.js diff --git a/config/config.php b/config/config.php index 462e668f..4bee2f83 100644 --- a/config/config.php +++ b/config/config.php @@ -475,6 +475,7 @@ $config['head']['rules']['page'] =array( ); $config['head']['default']['js'] = array( + "___path.root.engine_lib___/external/html5shiv.js" => array('browser'=>'lt IE 9'), "___path.root.engine_lib___/external/jquery/jquery.js", "___path.root.engine_lib___/external/jquery/jquery-ui.js", "___path.root.engine_lib___/external/jquery/jquery.notifier.js", @@ -489,6 +490,7 @@ $config['head']['default']['js'] = array( "___path.root.engine_lib___/external/jquery/jquery.file.js", "___path.root.engine_lib___/external/jquery/jcrop/jquery.Jcrop.js", "___path.root.engine_lib___/external/jquery/poshytip/jquery.poshytip.js", + "___path.root.engine_lib___/external/jquery/jquery.placeholder.min.js", "___path.root.engine_lib___/external/prettify/prettify.js", "___path.root.engine_lib___/internal/template/js/main.js", "___path.root.engine_lib___/internal/template/js/favourite.js", diff --git a/engine/lib/external/html5shiv.js b/engine/lib/external/html5shiv.js new file mode 100644 index 00000000..8dab2e1e --- /dev/null +++ b/engine/lib/external/html5shiv.js @@ -0,0 +1,220 @@ +/*! HTML5 Shiv vpre3.6 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */ +;(function(window, document) { + + /** Preset options */ + var options = window.html5 || {}; + + /** Used to skip problem elements */ + var reSkip = /^<|^(?:button|form|map|select|textarea|object|iframe|option|optgroup)$/i; + + /** Not all elements can be cloned in IE (this list can be shortend) **/ + var saveClones = /^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i; + + /** Detect whether the browser supports default html5 styles */ + var supportsHtml5Styles; + + /** Detect whether the browser supports unknown elements */ + var supportsUnknownElements; + + (function() { + var a = document.createElement('a'); + + a.innerHTML = ''; + + //if the hidden property is implemented we can assume, that the browser supports HTML5 Styles | this fails in Chrome 8 + supportsHtml5Styles = ('hidden' in a); + //if we are part of Modernizr, we do an additional test to solve the Chrome 8 fail + if(supportsHtml5Styles && typeof injectElementWithStyles == 'function'){ + injectElementWithStyles('#modernizr{}', function(node){ + node.hidden = true; + supportsHtml5Styles = (window.getComputedStyle ? + getComputedStyle(node, null) : + node.currentStyle).display == 'none'; + }); + } + + supportsUnknownElements = a.childNodes.length == 1 || (function() { + // assign a false positive if unable to shiv + try { + (document.createElement)('a'); + } catch(e) { + return true; + } + var frag = document.createDocumentFragment(); + return ( + typeof frag.cloneNode == 'undefined' || + typeof frag.createDocumentFragment == 'undefined' || + typeof frag.createElement == 'undefined' + ); + }()); + + }()); + + /*--------------------------------------------------------------------------*/ + + /** + * Creates a style sheet with the given CSS text and adds it to the document. + * @private + * @param {Document} ownerDocument The document. + * @param {String} cssText The CSS text. + * @returns {StyleSheet} The style element. + */ + function addStyleSheet(ownerDocument, cssText) { + var p = ownerDocument.createElement('p'), + parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement; + + p.innerHTML = 'x'; + return parent.insertBefore(p.lastChild, parent.firstChild); + } + + /** + * Returns the value of `html5.elements` as an array. + * @private + * @returns {Array} An array of shived element node names. + */ + function getElements() { + var elements = html5.elements; + return typeof elements == 'string' ? elements.split(' ') : elements; + } + + /** + * Shivs the `createElement` and `createDocumentFragment` methods of the document. + * @private + * @param {Document|DocumentFragment} ownerDocument The document. + */ + function shivMethods(ownerDocument) { + var cache = {}, + docCreateElement = ownerDocument.createElement, + docCreateFragment = ownerDocument.createDocumentFragment, + frag = docCreateFragment(); + + ownerDocument.createElement = function(nodeName) { + //abort shiv + if(!html5.shivMethods){ + return docCreateElement(nodeName); + } + + var node; + + if(cache[nodeName]){ + node = cache[nodeName].cloneNode(); + } else if(saveClones.test(nodeName)){ + node = (cache[nodeName] = docCreateElement(nodeName)).cloneNode(); + } else { + node = docCreateElement(nodeName); + } + + // Avoid adding some elements to fragments in IE < 9 because + // * Attributes like `name` or `type` cannot be set/changed once an element + // is inserted into a document/fragment + // * Link elements with `src` attributes that are inaccessible, as with + // a 403 response, will cause the tab/window to crash + // * Script elements appended to fragments will execute when their `src` + // or `text` property is set + return node.canHaveChildren && !reSkip.test(nodeName) ? frag.appendChild(node) : node; + }; + + ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' + + 'var n=f.cloneNode(),c=n.createElement;' + + 'h.shivMethods&&(' + + // unroll the `createElement` calls + getElements().join().replace(/\w+/g, function(nodeName) { + docCreateElement(nodeName); + frag.createElement(nodeName); + return 'c("' + nodeName + '")'; + }) + + ');return n}' + )(html5, frag); + } + + /*--------------------------------------------------------------------------*/ + + /** + * Shivs the given document. + * @memberOf html5 + * @param {Document} ownerDocument The document to shiv. + * @returns {Document} The shived document. + */ + function shivDocument(ownerDocument) { + var shived; + if (ownerDocument.documentShived) { + return ownerDocument; + } + if (html5.shivCSS && !supportsHtml5Styles) { + shived = !!addStyleSheet(ownerDocument, + // corrects block display not defined in IE6/7/8/9 + 'article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}' + + // corrects audio display not defined in IE6/7/8/9 + 'audio{display:none}' + + // corrects canvas and video display not defined in IE6/7/8/9 + 'canvas,video{display:inline-block;*display:inline;*zoom:1}' + + // corrects 'hidden' attribute and audio[controls] display not present in IE7/8/9 + '[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}' + + // adds styling not present in IE6/7/8/9 + 'mark{background:#FF0;color:#000}' + ); + } + if (!supportsUnknownElements) { + shived = !shivMethods(ownerDocument); + } + if (shived) { + ownerDocument.documentShived = shived; + } + return ownerDocument; + } + + /*--------------------------------------------------------------------------*/ + + /** + * The `html5` object is exposed so that more elements can be shived and + * existing shiving can be detected on iframes. + * @type Object + * @example + * + * // options can be changed before the script is included + * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false }; + */ + var html5 = { + + /** + * An array or space separated string of node names of the elements to shiv. + * @memberOf html5 + * @type Array|String + */ + 'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video', + + /** + * A flag to indicate that the HTML5 style sheet should be inserted. + * @memberOf html5 + * @type Boolean + */ + 'shivCSS': !(options.shivCSS === false), + + /** + * A flag to indicate that the document's `createElement` and `createDocumentFragment` + * methods should be overwritten. + * @memberOf html5 + * @type Boolean + */ + 'shivMethods': !(options.shivMethods === false), + + /** + * A string to describe the type of `html5` object ("default" or "default print"). + * @memberOf html5 + * @type String + */ + 'type': 'default', + + // shivs the document according to the specified `html5` object options + 'shivDocument': shivDocument + }; + + /*--------------------------------------------------------------------------*/ + + // expose html5 + window.html5 = html5; + + // shiv the document + shivDocument(document); + +}(this, document)); \ No newline at end of file diff --git a/engine/lib/external/jquery/jquery.placeholder.min.js b/engine/lib/external/jquery/jquery.placeholder.min.js new file mode 100644 index 00000000..db55023a --- /dev/null +++ b/engine/lib/external/jquery/jquery.placeholder.min.js @@ -0,0 +1,2 @@ +/*! http://mths.be/placeholder v2.0.6 by @mathias */ +;(function(g,i,d){var a='placeholder' in i.createElement('input'),e='placeholder' in i.createElement('textarea'),j=d.fn,c=d.valHooks,l,k;if(a&&e){k=j.placeholder=function(){return this};k.input=k.textarea=true}else{k=j.placeholder=function(){var m=this;m.filter((a?'textarea':':input')+'[placeholder]').not('.placeholder').bind({'focus.placeholder':b,'blur.placeholder':f}).data('placeholder-enabled',true).trigger('blur.placeholder');return m};k.input=a;k.textarea=e;l={get:function(n){var m=d(n);return m.data('placeholder-enabled')&&m.hasClass('placeholder')?'':n.value},set:function(n,o){var m=d(n);if(!m.data('placeholder-enabled')){return n.value=o}if(o==''){n.value=o;if(n!=i.activeElement){f.call(n)}}else{if(m.hasClass('placeholder')){b.call(n,true,o)||(n.value=o)}else{n.value=o}}return m}};a||(c.input=l);e||(c.textarea=l);d(function(){d(i).delegate('form','submit.placeholder',function(){var m=d('.placeholder',this).each(b);setTimeout(function(){m.each(f)},10)})});d(g).bind('beforeunload.placeholder',function(){d('.placeholder').each(function(){this.value=''})})}function h(n){var m={},o=/^jQuery\d+$/;d.each(n.attributes,function(q,p){if(p.specified&&!o.test(p.name)){m[p.name]=p.value}});return m}function b(o,p){var n=this,q=d(n),m;if(n.value==q.attr('placeholder')&&q.hasClass('placeholder')){m=n==i.activeElement;if(q.data('placeholder-password')){q=q.hide().next().show().attr('id',q.removeAttr('id').data('placeholder-id'));if(o===true){return q[0].value=p}q.focus()}else{n.value='';q.removeClass('placeholder')}m&&n.select()}}function f(){var r,m=this,q=d(m),n=q,p=this.id;if(m.value==''){if(m.type=='password'){if(!q.data('placeholder-textinput')){try{r=q.clone().attr({type:'text'})}catch(o){r=d('').attr(d.extend(h(this),{type:'text'}))}r.removeAttr('name').data({'placeholder-password':true,'placeholder-id':p}).bind('focus.placeholder',b);q.data({'placeholder-textinput':r,'placeholder-id':p}).before(r)}q=q.removeAttr('id').hide().prev().attr('id',p).show()}q.addClass('placeholder');q[0].value=q.attr('placeholder')}else{q.removeClass('placeholder')}}}(this,document,jQuery)); \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/blocks.css b/templates/skin/developer-jquery/css/blocks.css index 71e90f7d..8f5e1c49 100644 --- a/templates/skin/developer-jquery/css/blocks.css +++ b/templates/skin/developer-jquery/css/blocks.css @@ -27,7 +27,7 @@ .block.block-type-profile .profile-photo { vertical-align: top; } .block.block-type-profile .status { position: absolute; top: 5px; left: 5px; padding: 0 5px; border-radius: 2px; font-size: 11px; } .block.block-type-profile .status.status-online { background: #B7BC1C; color: #fff; } -.block.block-type-profile .status.status-offline { background: #333; color: #fff; opacity: .5; } +.block.block-type-profile .status.status-offline { background: #333; color: #fff; opacity: .5; filter: alpha(opacity=50); } .block.block-type-profile .upload-photo { padding: 7px 10px 10px; background: #f7f7f7; } .block.block-type-profile-note { background: #F1F7AF; border: 1px solid #E1EA83; padding: 15px; } diff --git a/templates/skin/developer-jquery/css/buttons.css b/templates/skin/developer-jquery/css/buttons.css index 745fe2c2..028f15f6 100644 --- a/templates/skin/developer-jquery/css/buttons.css +++ b/templates/skin/developer-jquery/css/buttons.css @@ -28,6 +28,8 @@ background: #555; cursor: pointer; + + *margin-right: 5px; } .button:hover { text-decoration: none; color: #fff; background: #4a4a4a; } .button:active { @@ -35,6 +37,7 @@ -webkit-box-shadow: 0 0 7px rgba(0, 0, 0, .5) inset; box-shadow: 0 0 7px rgba(0, 0, 0, .5) inset; } +.button.fl-r { *margin-right: 0; } /* Button Primary */ diff --git a/templates/skin/developer-jquery/css/comments.css b/templates/skin/developer-jquery/css/comments.css index f17e431f..ef1752e2 100644 --- a/templates/skin/developer-jquery/css/comments.css +++ b/templates/skin/developer-jquery/css/comments.css @@ -40,8 +40,8 @@ .comment.comment-self { background: #c5f7ea; } .comment.comment-new { background: #fbfba8; } .comment.comment-current { background: #a5e7fa; } -.comment.comment-bad { opacity: 0.3; } -.comment.comment-bad:hover { opacity: 1; } +.comment.comment-bad { opacity: 0.3; filter: alpha(opacity=30); } +.comment.comment-bad:hover { opacity: 1; filter: alpha(opacity=100); } .ls-user-role-not-admin .comment.comment-deleted { padding: 10px 15px; min-height: 0; background: #f7f7f7; color: #888; } diff --git a/templates/skin/developer-jquery/css/common.css b/templates/skin/developer-jquery/css/common.css index b35a1a81..1b9f5e00 100644 --- a/templates/skin/developer-jquery/css/common.css +++ b/templates/skin/developer-jquery/css/common.css @@ -10,24 +10,24 @@ .vote.vote-count-negative .vote-count { color: #f00; } .vote .vote-up, -.vote .vote-down { display: inline-block; cursor: pointer; vertical-align: text-top; width: 14px; height: 14px; background: url(../images/icons.png) no-repeat; opacity: .3; } +.vote .vote-down { display: inline-block; cursor: pointer; vertical-align: text-top; width: 14px; height: 14px; background: url(../images/icons.png) no-repeat; opacity: .3; filter: alpha(opacity=30); } .vote .vote-up { background-position: -408px -96px; } .vote .vote-down { background-position: -433px -96px; } -.vote .vote-up:hover { opacity: .8; } -.vote .vote-down:hover { opacity: .8; } +.vote .vote-up:hover { opacity: .8; filter: alpha(opacity=80); } +.vote .vote-down:hover { opacity: .8; filter: alpha(opacity=80); } -.vote.voted.voted-up .vote-up { opacity: 1; } -.vote.voted.voted-down .vote-down { opacity: 1; } -.vote.voted.voted-up .vote-down:hover { opacity: .3; } -.vote.voted.voted-down .vote-up:hover { opacity: .3; } +.vote.voted.voted-up .vote-up { opacity: 1; filter: alpha(opacity=100); } +.vote.voted.voted-down .vote-down { opacity: 1; filter: alpha(opacity=100); } +.vote.voted.voted-up .vote-down:hover { opacity: .3; filter: alpha(opacity=30); } +.vote.voted.voted-down .vote-up:hover { opacity: .3; filter: alpha(opacity=30); } /* Избранное ---------------------------------------------------------------*/ -.favourite { display: inline-block; width: 14px; height: 14px; vertical-align: text-top; background: url(../images/icons.png) -96px 0 no-repeat; opacity: .3; cursor: pointer; } -.favourite.active { opacity: 1; } -.favourite:hover { opacity: .8; } +.favourite { display: inline-block; width: 14px; height: 14px; vertical-align: text-top; background: url(../images/icons.png) -96px 0 no-repeat; opacity: .3; filter: alpha(opacity=30); cursor: pointer; } +.favourite.active { opacity: 1; filter: alpha(opacity=100); } +.favourite:hover { opacity: .8; filter: alpha(opacity=80); } .favourite-count { margin-left: 0; font-weight: bold; } @@ -41,7 +41,7 @@ .pagination ul li a { background: #f2f2f9; border-color: #dee0ef; } .pagination ul li a:hover { background: #EAEAF7; } .pagination ul li.active { color: #aaa; } -.pagination ul li i { opacity: .5; } +.pagination ul li i { opacity: .5; filter: alpha(opacity=50); } .pagination.pagination-comments { margin-bottom: 15px; } @@ -87,7 +87,7 @@ /* Список пользователей ---------------------------------------------------------------*/ .user-list { border-top: 1px solid #eee; } -.user-list li { min-height: 48px; padding: 7px 0 10px 58px; border-bottom: 1px solid #eee; position: relative; } +.user-list li { min-height: 48px; padding: 7px 0 10px 58px; border-bottom: 1px solid #eee; position: relative; zoom: 1; } .user-list li p { padding-top: 2px; font-size: 11px; } .user-list li a { text-decoration: none; } .user-list li .avatar { position: absolute; top: 10px; left: 0; margin-right: 10px; } @@ -103,8 +103,8 @@ ---------------------------------------------------------------*/ .search { width: 200px; margin-bottom: 20px; position: relative; } .search .input-text { width: 200px; padding-right: 25px; } -.search .input-submit { border: none; width: 16px; height: 16px; position: absolute; top: 6px; right: 5px; opacity: .7; } -.search .input-submit:hover { opacity: 1; } +.search .input-submit { border: none; width: 16px; height: 16px; position: absolute; top: 6px; right: 5px; opacity: .7; filter: alpha(opacity=70); } +.search .input-submit:hover { opacity: 1; filter: alpha(opacity=100); } .search.search-item { margin-bottom: 15px; width: 100%; } .search.search-item .input-text { width: 100%; padding-right: 5px; } diff --git a/templates/skin/developer-jquery/css/forms.css b/templates/skin/developer-jquery/css/forms.css index 7aa4ea47..3e47aaa9 100644 --- a/templates/skin/developer-jquery/css/forms.css +++ b/templates/skin/developer-jquery/css/forms.css @@ -1,4 +1,12 @@ -.input-text { width: 150px; padding: 5px; border: 1px solid #ddd; box-shadow: 0 2px 4px rgba(0,0,0,.07) inset; border-radius: 3px; -moz-box-sizing: border-box; box-sizing: border-box; } +.input-text { + width: 150px; + padding: 5px; + border: 1px solid #ddd; + box-shadow: 0 2px 4px rgba(0,0,0,.07) inset; + border-radius: 3px; + -moz-box-sizing: border-box; + box-sizing: border-box; +} .input-text:focus { border-color: #4D90FE; box-shadow: 0 2px 4px rgba(0,0,0,.07) inset, 0 0 3px #4D90FE; } .input-checkbox { position: relative; top: 1px; margin: 0 2px 0 1px; } @@ -22,7 +30,7 @@ select { padding: 4px; border: 1px solid #ddd; border-radius: 3px; } fieldset { margin-bottom: 30px; padding-top: 20px; border-top: 1px solid #eaeaea; } fieldset legend { color: #000; font-size: 18px; padding-right: 10px; } -input:-moz-placeholder { color: #aaa;} +input:-moz-placeholder { color: #aaa; } form p { margin-bottom: 20px; } form label { display: block; margin-bottom: 3px; } @@ -41,4 +49,6 @@ dl.form-item dt { float: left; width: 135px; padding-top: 4px; padding-right: 15 dl.form-item dd { float: left; width: 300px; } .form-profile { position: relative; } -.form-profile .avatar-change { position: absolute; top: 40px; right: 0; padding: 10px; background: #f7f7f7; font-size: 11px; } \ No newline at end of file +.form-profile .avatar-change { position: absolute; top: 40px; right: 0; padding: 10px; background: #f7f7f7; font-size: 11px; } + +.placeholder { color: #aaa; } \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/icons.css b/templates/skin/developer-jquery/css/icons.css index 31ae7e02..e4d0e0df 100644 --- a/templates/skin/developer-jquery/css/icons.css +++ b/templates/skin/developer-jquery/css/icons.css @@ -18,8 +18,10 @@ vertical-align: text-top; width: 14px; height: 14px; - background: url(../images/icons.png) no-repeat; + line-height: 14px; + background: url(../images/icons.png) no-repeat; } + .icon-white { background-image: url(../images/icons-white.png); } .icon-glass { background-position: 0 0; } diff --git a/templates/skin/developer-jquery/css/jquery.notifier.css b/templates/skin/developer-jquery/css/jquery.notifier.css index 4de184b5..7b014459 100644 --- a/templates/skin/developer-jquery/css/jquery.notifier.css +++ b/templates/skin/developer-jquery/css/jquery.notifier.css @@ -33,4 +33,4 @@ #notifier .n-box.n-notice { background: #FFF1A8; color: #333; } #notifier .n-box.n-notice h3 { color: #333; } -#notifier .n-box.n-error { background: #000; color: #fff; opacity: 0.8; } \ No newline at end of file +#notifier .n-box.n-error { background: #000; color: #fff; opacity: 0.8; filter: alpha(opacity=80); } \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/modals.css b/templates/skin/developer-jquery/css/modals.css index 6b6409e5..5fedad85 100644 --- a/templates/skin/developer-jquery/css/modals.css +++ b/templates/skin/developer-jquery/css/modals.css @@ -27,8 +27,9 @@ height: 14px; background: url(../images/icons.png) -312px 0 no-repeat; opacity: .3; + filter: alpha(opacity=30); } -.modal .close:hover { opacity: 1; } +.modal .close:hover { opacity: 1; filter: alpha(opacity=100); } .modal .modal-header { background: #fafafa; border-bottom: 1px solid #f7f7f7; padding: 5px 20px; } .modal .modal-header h3 { font-size: 20px; font-weight: bold; margin-right: 20px; } .modal .modal-content { padding: 20px; } @@ -46,12 +47,11 @@ /* */ .modal.modal-write { width: 740px; margin-left: -370px; top: 50px; } -.modal.modal-write .modal-content { padding: 20px 10px 0; } -.modal.modal-write .write-list { } -.modal.modal-write .write-list li { width: 100px; margin: 0 10px 20px; text-align: center; overflow: hidden; display: inline-table; } +.modal.modal-write .modal-content { padding: 20px 10px 0; *padding: 20px 10px 15px; } +.modal.modal-write .write-list { *overflow: hidden; *zoom: 1; } +.modal.modal-write .write-list li { width: 100px; margin: 0 10px 20px; text-align: center; overflow: hidden; display: inline-table; *float: left; } .modal.modal-write .write-list li a { color: #39576B; } .modal.modal-write .write-list li .write-item-image { display: block; width: 100px; height: 100px; border-radius: 3px; text-align: center; background: url(../images/write.png) no-repeat; margin-bottom: 10px; } -.modal.modal-write .write-list li .write-item-image:hover { display: block; width: 100px; height: 100px; border-radius: 3px; text-align: center; background: url(../images/write.png) no-repeat; margin-bottom: 10px; } .modal.modal-write .write-list li.write-item-type-topic .write-item-image { background-position: 0 0; } .modal.modal-write .write-list li.write-item-type-poll .write-item-image { background-position: -100px 0; } diff --git a/templates/skin/developer-jquery/css/navs.css b/templates/skin/developer-jquery/css/navs.css index 60994654..f556e024 100644 --- a/templates/skin/developer-jquery/css/navs.css +++ b/templates/skin/developer-jquery/css/navs.css @@ -1 +1 @@ -/* ��������� ------------------------------------------------- */ .nav { overflow: hidden; zoom: 1; } .nav li { float: left; } .nav li:last-child { border-right: none; } .nav li a { display: block; padding: 10px 15px; } .nav li a:hover { background: #f3f3f3; } .nav li.active a { background: #f3f3f3; } /* ���� ������� */ #userbar { border: 1px solid #ddd; border-top: none; background: #ffffff; background: -moz-linear-gradient(top, #ffffff 0%, #f3f3f3 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3)); background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: linear-gradient(top, #ffffff 0%,#f3f3f3 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); border-radius: 0 0 4px 4px; box-shadow: 0 0 5px #ddd; } #userbar .search { float: left; margin: 5px 0 0 7px; margin-bottom: 0; } .nav.nav-userbar { float: right; } .nav.nav-userbar li { border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; } .nav.nav-userbar li:first-child a { border-radius: 0 0 0 4px; } .nav.nav-userbar li:last-child a { border-radius: 0 0 4px 0; } .nav.nav-userbar li:first-child { } .nav.nav-userbar li.nav-userbar-username a { position: relative; padding-left: 47px; font-weight: bold; } .nav.nav-userbar li.nav-userbar-username .avatar { position: absolute; top: 7px; left: 15px; } .nav.nav-userbar li .new-messages { font-weight: bold; } /* ������� ���� */ .nav.nav-main { border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); } .nav.nav-main li a { color: #ddd; } .nav.nav-main li a:hover { background: #333; } .nav.nav-main li:first-child a { border-radius: 4px 0 0 4px; } .nav.nav-main li:last-child a { border-radius: 0 4px 4px 0; } .nav.nav-main li.active a { background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; } /* ��������� ���� */ .nav.nav-nested { height: 65px; margin: 0 0 50px 0; } .nav.nav-nested li { margin-right: 1px; position: relative; } .nav.nav-nested li a { background: #ddd; color: #333; padding: 7px 13px; float: left; } .nav.nav-nested li a:hover { background: #ccc; } .nav.nav-nested li.active > a { background: #333; color: #fff; } .nav.nav-nested ul { position: absolute; top: 100%; left: 0; width: 400px; margin-top: 1px; } .nav.nav-nested li a.new { background: #d1d1d1; font-weight: bold; } .nav.nav-nested li a.new:hover { background: #ccc; } .nav.nav-nested li.active a.new { background: #444; } .nav.nav-nested li.active a.new:hover { background: #555; } /* ������������� */ .nav.nav-pills { margin-bottom: 15px; } .nav.nav-pills li { margin-right: 3px; } .nav.nav-pills li a { border-radius: 4px; padding: 5px 12px; background: #eee; } .nav.nav-pills li a:hover { background: #eaeaea; } .nav.nav-pills li.active a { background: #2375C6; color: #fff; } .nav.nav-pills.nav-pills-profile { margin-bottom: 30px; } /* ��������� �� ������� ������������ */ .nav.nav-profile { margin-bottom: 15px; } .nav.nav-profile li { float: none; margin-bottom: 2px; background: #eee; } .nav.nav-profile li a { padding: 7px 12px; border-radius: 0; } .nav.nav-profile li a:hover { background: #e5e5e5; } .nav.nav-profile li.active a { background: #333; color: #fff; } /* Nav Blog */ .nav-blog-wrapper { margin-bottom: 40px; } .nav.nav-blog { margin-bottom: 5px; } \ No newline at end of file +/* ��������� ------------------------------------------------- */ .nav { overflow: hidden; zoom: 1; } .nav li { float: left; } .nav li:last-child { border-right: none; } .nav li a { display: block; padding: 10px 15px; } .nav li a:hover { background: #f3f3f3; } .nav li.active a { background: #f3f3f3; } /* ���� ������� */ #userbar { border: 1px solid #ddd; border-top: none; background: #ffffff; background: -moz-linear-gradient(top, #ffffff 0%, #f3f3f3 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3)); background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: linear-gradient(top, #ffffff 0%,#f3f3f3 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); border-radius: 0 0 4px 4px; box-shadow: 0 0 5px #ddd; } #userbar .search { float: left; margin: 5px 0 0 7px; *margin: 4px 0 0 4px; } .nav.nav-userbar { float: right; } .nav.nav-userbar li { border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; } .nav.nav-userbar li:first-child a { border-radius: 0 0 0 4px; } .nav.nav-userbar li:last-child a { border-radius: 0 0 4px 0; } .nav.nav-userbar li:first-child { } .nav.nav-userbar li.nav-userbar-username a { position: relative; padding-left: 47px; font-weight: bold; } .nav.nav-userbar li.nav-userbar-username .avatar { position: absolute; top: 7px; left: 15px; } .nav.nav-userbar li .new-messages { font-weight: bold; } /* ������� ���� */ .nav.nav-main { border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); } .nav.nav-main li a { color: #ddd; } .nav.nav-main li a:hover { background: #333; } .nav.nav-main li:first-child a { border-radius: 4px 0 0 4px; } .nav.nav-main li:last-child a { border-radius: 0 4px 4px 0; } .nav.nav-main li.active a { background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; } /* ��������� ���� */ .nav.nav-nested { height: 65px; margin: 0 0 50px 0; } .nav.nav-nested li { margin-right: 1px; position: relative; } .nav.nav-nested li a { background: #ddd; color: #333; padding: 7px 13px; float: left; } .nav.nav-nested li a:hover { background: #ccc; } .nav.nav-nested li.active > a { background: #333; color: #fff; } .nav.nav-nested ul { position: absolute; top: 100%; left: 0; width: 400px; margin-top: 1px; } .nav.nav-nested li a.new { background: #d1d1d1; font-weight: bold; } .nav.nav-nested li a.new:hover { background: #ccc; } .nav.nav-nested li.active a.new { background: #444; } .nav.nav-nested li.active a.new:hover { background: #555; } /* ������������� */ .nav.nav-pills { margin-bottom: 15px; } .nav.nav-pills li { margin-right: 3px; } .nav.nav-pills li a { border-radius: 4px; padding: 5px 12px; background: #eee; } .nav.nav-pills li a:hover { background: #eaeaea; } .nav.nav-pills li.active a { background: #2375C6; color: #fff; } .nav.nav-pills.nav-pills-profile { margin-bottom: 30px; } /* ��������� �� ������� ������������ */ .nav.nav-profile { margin-bottom: 15px; } .nav.nav-profile li { float: none; margin-bottom: 2px; background: #eee; } .nav.nav-profile li a { padding: 7px 12px; border-radius: 0; } .nav.nav-profile li a:hover { background: #e5e5e5; } .nav.nav-profile li.active a { background: #333; color: #fff; } /* Nav Blog */ .nav-blog-wrapper { margin-bottom: 40px; } .nav.nav-blog { margin-bottom: 5px; } \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/topic.css b/templates/skin/developer-jquery/css/topic.css index a325b29f..c0e47d4d 100644 --- a/templates/skin/developer-jquery/css/topic.css +++ b/templates/skin/developer-jquery/css/topic.css @@ -11,7 +11,7 @@ .topic .topic-header .topic-info time { margin-right: 15px; } .topic .topic-header .topic-info .topic-blog { margin-right: 15px; } .topic .topic-header .topic-info .actions, -.topic .topic-header .topic-info .actions li { display: inline; float: none; } +.topic .topic-header .topic-info .actions li { display: inline; float: none; margin-bottom: 0; } .topic .topic-header .topic-info .actions li { margin-right: 10px; } /* Content */ diff --git a/templates/skin/developer-jquery/css/wall.css b/templates/skin/developer-jquery/css/wall.css index c788a048..5dac3f01 100644 --- a/templates/skin/developer-jquery/css/wall.css +++ b/templates/skin/developer-jquery/css/wall.css @@ -2,13 +2,13 @@ Стена -------------------------------------------- */ -.wall-submit { margin-bottom: 30px; } -.wall-submit.wall-submit-reply { margin: 2px 0 2px 25px; padding: 7px; background: #fafafa; } -.wall-submit.wall-submit-reply textarea { height: 28px; margin: 0; } +.wall-submit { margin-bottom: 30px; } +.wall-submit.wall-submit-reply { margin: 2px 0 2px 25px; padding: 7px; background: #fafafa; } +.wall-submit.wall-submit-reply textarea { height: 28px; *height: 16px; *width: 590px; margin: 0; } .wall-submit.wall-submit-reply button { display: none; } .wall-submit.wall-submit-reply.active textarea { height: 80px; margin-bottom: 5px; } .wall-submit.wall-submit-reply.active button { display: block; } -.wall-submit p { margin-bottom: 5px; } +.wall-submit p { margin-bottom: 5px; } .comments.wall, .wall .comment { margin-bottom: 2px; } diff --git a/templates/skin/developer-jquery/header.tpl b/templates/skin/developer-jquery/header.tpl index e13f3312..4660f5ab 100644 --- a/templates/skin/developer-jquery/header.tpl +++ b/templates/skin/developer-jquery/header.tpl @@ -53,7 +53,7 @@ {$aHtmlHeadFiles.js} - +