From dccf7a09b61da23ab5a75d51312bd9004d9d705b Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Mon, 29 Aug 2011 21:28:30 +0000 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B2=20=D0=B8=D0=B5,=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=D1=80=D1=83=D1=82=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B4?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/skin/developer-jquery/css/blocks.css | 4 ++++ templates/skin/developer/css/style.css | 4 ++++ templates/skin/new-jquery/css/blocks.css | 4 ++++ templates/skin/new-jquery/css/comments.css | 4 ++-- templates/skin/new-jquery/css/common.css | 12 +++++++----- templates/skin/new-jquery/css/grid.css | 8 ++++---- templates/skin/new-jquery/css/jquery.notifier.css | 2 +- templates/skin/new-jquery/css/topic.css | 2 +- templates/skin/new-jquery/js/main.js | 7 +++++++ templates/skin/new-jquery/nav.tpl | 2 +- templates/skin/new/css/style.css | 3 +++ 11 files changed, 38 insertions(+), 14 deletions(-) diff --git a/templates/skin/developer-jquery/css/blocks.css b/templates/skin/developer-jquery/css/blocks.css index fd744c53..c2833657 100644 --- a/templates/skin/developer-jquery/css/blocks.css +++ b/templates/skin/developer-jquery/css/blocks.css @@ -3,6 +3,10 @@ .block .bottom { padding-top: 5px; font-size: 11px; } .block .bottom a { color: #333; } +.block .stream-settings-userlist ul, +.block .stream-settings-friends, +.block .stream-settings-blogs { overflow: auto; max-height: 200px; _height: expression( this.scrollHeight > 200 ? "200px" : "auto" ); position: relative; } + /* Stream */ .block.stream ul.list { border-top: 1px dashed #ddd; } .block.stream ul.list li { padding: 7px 0 10px; border-bottom: 1px dashed #ddd; } diff --git a/templates/skin/developer/css/style.css b/templates/skin/developer/css/style.css index 55671249..5848fa83 100644 --- a/templates/skin/developer/css/style.css +++ b/templates/skin/developer/css/style.css @@ -421,6 +421,10 @@ p { margin-bottom: 18px; } .block.stream-settings .stream-settings-userlist p a:hover { color: #555; border-color: #555; } .block.stream-settings .stream-settings-userlist li { padding-bottom: 5px; } +.block .stream-settings-userlist ul, +.block .stream-settings-friends, +.block .stream-settings-blogs { overflow: auto; max-height: 200px; _height: expression( this.scrollHeight > 200 ? "200px" : "auto" ); position: relative; } + /* Userfields -------------------------------------------------------------------*/ .userfield-list { width: 450px; border-top: 1px solid #eee; } diff --git a/templates/skin/new-jquery/css/blocks.css b/templates/skin/new-jquery/css/blocks.css index 6bf11dc4..0dfa3f33 100644 --- a/templates/skin/new-jquery/css/blocks.css +++ b/templates/skin/new-jquery/css/blocks.css @@ -5,6 +5,10 @@ .block .bottom { padding-top: 5px; font-size: 11px; text-align: right; } .block .bottom a { } +.block .stream-settings-userlist ul, +.block .stream-settings-friends, +.block .stream-settings-blogs { overflow: auto; max-height: 200px; _height: expression( this.scrollHeight > 200 ? "200px" : "auto" ); position: relative; } + /* Contacts */ .block.contacts img { padding: 7px; border: 1px solid #ccc; } .block.contacts ul { margin-top: 5px; } diff --git a/templates/skin/new-jquery/css/comments.css b/templates/skin/new-jquery/css/comments.css index e8c4e60b..9154273a 100644 --- a/templates/skin/new-jquery/css/comments.css +++ b/templates/skin/new-jquery/css/comments.css @@ -31,7 +31,7 @@ .comments-header a.rss { background: url(../images/icons.gif) no-repeat scroll -70px -247px transparent; margin-right: 20px; padding-left: 14px; } /* Comment */ -.comment { margin-bottom: 20px; position: relative; padding-left: 20px; } +.comment { margin-bottom: 20px; position: relative; padding-left: 20px; zoom: 1; } .comment .deleted { padding: 5px 10px; color: #777; background: #f4f4f4; } .comment .folding { width: 10px; height: 10px; position: absolute; top: 14px; left: 4px; background: url(../images/icons.gif) -20px -210px no-repeat; cursor: pointer; } .comment .folding.folded { background-position: 0 -210px; } @@ -65,7 +65,7 @@ .comment .info li a { } /* Content */ -.comment .content { color: #000; margin: 0 30px 10px 0; border: 1px solid #DDDEDE; background: #f7f7f7; border-radius: 7px; padding: 8px 30px 9px 10px; position: relative; } +.comment .content { color: #000; margin: 0 30px 10px 0; border: 1px solid #DDDEDE; background: #f7f7f7; border-radius: 7px; padding: 8px 30px 9px 10px; position: relative; zoom: 1; } .comment .content:before { content: ""; position: absolute; bottom: -9px; left: 10px; width: 7px; height: 9px; background: #F7F7F7 url(../images/comment_arrow.png) 0 0 no-repeat; } .comment pre { overflow: auto; width: 95%; padding: 5px 2%; margin-bottom: 10px; background: #f8f8f8 url(../images/code.gif); border: 1px solid #dce6f0; clear: both; } .comment blockquote {font-style: italic; padding: 5px 10px; background: #ffffff; border: 1px solid #ddd;} diff --git a/templates/skin/new-jquery/css/common.css b/templates/skin/new-jquery/css/common.css index b7605d34..bc072cb1 100644 --- a/templates/skin/new-jquery/css/common.css +++ b/templates/skin/new-jquery/css/common.css @@ -43,7 +43,9 @@ .switcher li { float: left; padding: 1px 7px 1px; color: #A2A2A2; background: #fff; position: relative; line-height: 15px; cursor: pointer; border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; } .switcher li a { color: #A2A2A2; text-decoration: none; } .switcher li:first-child { -moz-border-radius-topleft: 5px; -moz-border-radius-bottomleft: 5px; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-left: 1px solid #ddd; } +.switcher li.first-child { border-left: 1px solid #ddd; } .switcher li:last-child { -moz-border-radius-topright: 5px; -moz-border-radius-bottomright: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-right: 1px solid #ddd; } +.switcher li.last-child { border-right: 1px solid #ddd; } .switcher li.active { color: #fff; background: #83DC5F; border-color: #83DC5F; box-shadow: 0 1px 0 #75C656 inset; } .switcher li.active a { color: #fff; } .switcher li.active:before { content: ""; position: absolute; bottom: -4px; left: 8px; width: 5px; height: 3px; background: url(../images/arrows.png) -9px 0 no-repeat; } @@ -55,13 +57,13 @@ /* Actions */ -.actions { overflow: hidden; zoom: 1; margin-bottom: 10px; font-size: 11px; } -.actions a { overflow: hidden; zoom: 1; margin-bottom: 10px; margin-right: 10px; text-decoration: none; } -.actions li { float: left; } +.actions { overflow: hidden; zoom: 1; font-size: 11px; } +.actions a { overflow: hidden; zoom: 1; margin-right: 10px; text-decoration: none; } +.actions li { float: left;} .actions .edit { padding-left: 16px; background: url(../images/edit.gif) no-repeat 0 1px; } .actions .delete { padding-left: 15px; background: url(../images/delete.gif) no-repeat 0 1px; color: #f00; } -.actions .rss { display: block; width: 10px; height: 10px; background: url(../images/icons.gif) no-repeat -70px -250px; margin-right: 4px; position: relative; top: 3px; } -.actions .join { position: relative; top: 3px; } +.actions .rss { display: block; width: 10px; height: 10px; background: url(../images/icons.gif) no-repeat -70px -250px; margin-right: 4px; margin-top: 4px; } +.actions .join { margin-top: 4px; } .actions a:hover { text-decoration: underline; } diff --git a/templates/skin/new-jquery/css/grid.css b/templates/skin/new-jquery/css/grid.css index e3617177..08a1f979 100644 --- a/templates/skin/new-jquery/css/grid.css +++ b/templates/skin/new-jquery/css/grid.css @@ -65,7 +65,7 @@ /* Sub-menu */ #nav .sub-menu { position: absolute; top: 35px; left: 0; width: 500px; font-size: 11px; } -#nav .sub-menu li { margin-right: 5px; line-height: 12px; padding: 3px 10px 5px 10px !important; border-radius: 12px; } +#nav .sub-menu li { margin-right: 5px; line-height: 13px; padding: 3px 10px 5px 10px !important; border-radius: 12px; } #nav .sub-menu li a { color: #777 !important; text-decoration: underline; } #nav .sub-menu li a:hover { text-decoration: none !important; } #nav .sub-menu li.active { background: #555; color: #fff; font-weight: bold; background: #83DC5F; box-shadow: 0 2px 0 #75C656 inset; } @@ -75,7 +75,7 @@ /* Search */ #nav .search { position: absolute; bottom: 25px; right: 20px; } #nav .search .text { width: 165px; border: 1px solid #ccc; border-radius: 13px; padding: 4px 35px 4px 13px; color: #777; box-shadow: 0 2px 2px #eee inset; } -#nav .search .button { width: 18px; height: 18px; position: absolute; top: 4px; right: 3px; border: none; background: url(../images/search.png) no-repeat; cursor: pointer; } +#nav .search .search-submit { width: 18px; height: 18px; position: absolute; top: 4px; right: 7px; *top: 5px; border: none; background: url(../images/search.png) no-repeat; cursor: pointer; } /* Search */ #nav .button-publish { float: left; text-decoration: none; background: url(../images/button_publish.gif) no-repeat; color: #333; margin-top: 45px; margin-right: 35px; } @@ -98,7 +98,7 @@ .blog .blog-header { overflow: hidden; zoom: 1; position: relative; padding: 0 100px 0 30px; } .blog .blog-header img { position: absolute; top: 0; left: 0; } -.blog .blog-header h2 { font-size: 24px; float: left; line-height: 1.2em; margin-top: -4px; } +.blog .blog-header h2 { font-size: 24px; line-height: 1.3em; margin-top: -4px; } .blog .blog-header h2 a { text-decoration: none; border-bottom: 1px dashed #70AAE0; } .blog .blog-header h2.inactive a { color: #ccc; border-color: #ccc; } @@ -118,7 +118,7 @@ .blog-list-table { } .blog-list-table tbody { color: #999; } .blog-list-table td .avatar { float: left; position: relative; top: 2px; } -.blog-list-table td .title { font-size: 18px; } +.blog-list-table td .title { font-size: 18px; line-height: 22px; } .blog-list-table td .user { font-weight: bold; color: #999; background: url(../images/icons.gif) 0 -108px no-repeat; } .blog-list-table td .private { position: relative; top: 2px; } .blog-list-table td p { margin-bottom: 0; color: #999; } diff --git a/templates/skin/new-jquery/css/jquery.notifier.css b/templates/skin/new-jquery/css/jquery.notifier.css index deb46bf7..d29ae8e8 100644 --- a/templates/skin/new-jquery/css/jquery.notifier.css +++ b/templates/skin/new-jquery/css/jquery.notifier.css @@ -31,6 +31,6 @@ #notifier .n-box h3 { color: #fff; font-size: 14px; font-weight: bold; margin-bottom: 3px; } #notifier .n-box p { margin: 0; } -#notifier .n-box.n-notice { background: #FFF1A8; color: #000; opacity: 0.9; } +#notifier .n-box.n-notice { background: #64DD49; color: #000; opacity: 0.95; } #notifier .n-box.n-notice h3 { color: #333; } #notifier .n-box.n-error { background: #BC0000; color: #fff; opacity: 0.8; } \ No newline at end of file diff --git a/templates/skin/new-jquery/css/topic.css b/templates/skin/new-jquery/css/topic.css index bbf62af6..1e3f64bc 100644 --- a/templates/skin/new-jquery/css/topic.css +++ b/templates/skin/new-jquery/css/topic.css @@ -19,7 +19,7 @@ .topic .content img.image-center { display: block; margin: 0 auto; } /* Tags */ -.topic .tags { margin: 0 0 6px; padding-left: 13px; background: url(../images/tag.png) no-repeat 0 5px; } +.topic .tags { margin: 0 0 6px; padding-left: 13px; background: url(../images/tag.png) no-repeat 0 5px; zoom: 1; } .topic .tags li { display: inline; color: #777; } .topic .tags li a { color: #777; text-decoration: none; } .topic .tags li a:hover { color: #fff; background: #777; } diff --git a/templates/skin/new-jquery/js/main.js b/templates/skin/new-jquery/js/main.js index 8c13a508..44e2a1e0 100644 --- a/templates/skin/new-jquery/js/main.js +++ b/templates/skin/new-jquery/js/main.js @@ -459,4 +459,11 @@ jQuery(document).ready(function($){ $("#show_blog_info").toggleClass("inactive"); return false; }); + + + // Detecting IE6-IE8 + if ($.browser.msie && $.browser.version.substr(0,1) <= 8) { + $(".switcher li:first-child").addClass("first-child"); + $(".switcher li:last-child").addClass("last-child"); + } }); \ No newline at end of file diff --git a/templates/skin/new-jquery/nav.tpl b/templates/skin/new-jquery/nav.tpl index 1aac9d74..4392f6bb 100644 --- a/templates/skin/new-jquery/nav.tpl +++ b/templates/skin/new-jquery/nav.tpl @@ -12,7 +12,7 @@
- +
diff --git a/templates/skin/new/css/style.css b/templates/skin/new/css/style.css index 64170243..b5ffd412 100644 --- a/templates/skin/new/css/style.css +++ b/templates/skin/new/css/style.css @@ -868,6 +868,9 @@ table.admin_page td { /* IE: */ border-left: expression(previousSibling == nul .block.stream-settings .stream-settings-userlist p a:hover { color: #555; border-color: #555; } .block.stream-settings .stream-settings-userlist li { padding-bottom: 5px; } +.block .stream-settings-userlist ul, +.block .stream-settings-friends, +.block .stream-settings-blogs { overflow: auto; max-height: 200px; _height: expression( this.scrollHeight > 200 ? "200px" : "auto" ); position: relative; } /* Userfields -------------------------------------------------------------------*/