Код:
Index: _css/_lang/ru_ru/language.css
===================================================================
--- _css/_lang/ru_ru/language.css (revision 172)
+++ _css/_lang/ru_ru/language.css (working copy)
@@ -164,7 +164,7 @@
a.login-button { float: left; display: block; height: 23px; width: 112px; background-position:0 0; background: url('../../../images/ru_ru/button-login.gif') top left no-repeat;}
a.cancel-button { float: right; display: block; height: 23px; width: 112px; background-position:0 0; background: url('../../../images/ru_ru/button-cancel.gif') top left no-repeat;}
-//* guild motd */
+/* guild motd */
.guild-motd { margin: 0 142px 0 200px; width:526px;padding: 6px; font-style: italic;overflow:hidden }
/* Specific LG changes */
Index: _css/browser/safari.css
===================================================================
--- _css/browser/safari.css (revision 172)
+++ _css/browser/safari.css (working copy)
@@ -36,7 +36,7 @@
.realms a:hover{border:3px solid #dcfb08;background-position:0 -57px}
.related-links a,.specify-search-container a {line-height:20px}
a.loginLink{line-height:25px; color: #FFCC00;}
-.user-line-item {padding:0 !importants}
+.user-line-item {padding:0 !important}
.navigation a {line-height:35px;padding-top:2px}
a.user-alerts {top:2px;background-position:25px -40px !important;}
.teamRank{top:0}
Index: _css/character-select.css
===================================================================
--- _css/character-select.css (revision 172)
+++ _css/character-select.css (working copy)
@@ -53,7 +53,7 @@
.topcharlist h5{font:bold 14px/26px Arial, Helvetica, sans-serif; margin:0 auto; text-align:center; display: block; letter-spacing:-1px; width:260px; height:26px; color:#724503; position:relative; top:23px;}
.sel-char { }
.sel-char h1 {color:#c3830a;padding:5px 0 10px 20px !important; background:url('../images/expand-tile.jpg') repeat-x 0 0; margin:0;}
-.sel-intro {min-height:1px; _height:1px;}
+.sel-intro {min-height:1px; height:1px;}
.sel-intro p {margin:1.6em 320px 0 25px;}
.select-charwrap {position:absolute; top:57px; left:70px; color:#fff;}
.select-char1 {background:url(../images/select-char1.jpg) 0 0 no-repeat; width:749px; height:97px; position:relative;}
@@ -71,7 +71,7 @@
-moz-border-radius-bottomright:2px; -webkit-border-top-right-radius:2px; -webkit-border-top-left-radius:2px; -webkit-border-bottom-left-radius:2px;
-webkit-border-bottom-right-radius:2px;}
.select-char1 p label {color:#fff; line-height:23px; margin:0; padding:0;}
-.select-char1 input {position:relative; top:2px; margin:0 7px 0 0; background:none; _top:0;}
+.select-char1 input {position:relative; top:2px; margin:0 7px 0 0; background:none; top:0;}
.select-char2 {width:749px; height:31px; margin:4px 0 0;}
.select-char2 h6 {display:inline; font:12px/31px Arial, Helvetica, sans-serif; color:#fff; margin:0 0 0 15px;}
Index: _css/character/achievements.css
===================================================================
--- _css/character/achievements.css (revision 172)
+++ _css/character/achievements.css (working copy)
@@ -11,7 +11,7 @@
.achievements .category-root .selected ul, .achievements .selected .criteria { display:block }
.achievements .category-root ul { display:none }
-.achievements a, .achievements a:link, , .achievements a:active, .achievements a:visited { color:inherit }
+.achievements a, .achievements a:link, .achievements a:active, .achievements a:visited { color:inherit }
.achv_bdr { line-height:8px;}
.achv_lnav { background:url(../../images/achievements/achv_lnav_bg.jpg) repeat-y; width:174px; float:left; margin-top:10px; }
Index: _css/int.css
===================================================================
--- _css/int.css (revision 172)
+++ _css/int.css (working copy)
@@ -279,8 +279,6 @@
.parch-search input:hover,.scroll input:hover,.paging input:hover,.detail-search select:hover{border:1px solid #caf500}
.paging input{width:25px !important}
-<<<<<<< .working
-=======
.generic-title{margin:9px 0 0 10px;width:100%;height:59px}
.generic-title h1{margin:0;padding:8px 0 0 0;color:#774e00;font-size:20px;line-height:22px;float:left}
.bg-title{margin:4px 0 0 2px;height:59px}
@@ -288,7 +286,6 @@
.realm-button{float:right !important}
.generic-title a{text-decoration:none;border-color:#66FF66}
.generic-title span{color:#774e00;font:14px/16px Georgia,"Times New Roman",Times,serif;letter-spacing:-1px}
->>>>>>> .merge-right.r95680
.bgspecial{clear:both;width:97%;padding:4px 0;background:url('../images/bg-special.jpg') no-repeat 50% 0}
/* select team type */
Index: _css/tools/talent-calc.css
===================================================================
--- _css/tools/talent-calc.css (revision 172)
+++ _css/tools/talent-calc.css (working copy)
@@ -127,7 +127,7 @@
.petFamilies { width:300px; padding:10px; float:right; clear:both; /*margin-right:120px*/; z-index:500; position:absolute; top:50px; left:450px}
.petGroup { cursor:pointer; background:left top repeat; background-image:url('../../images/talents/petlist-bg.jpg'); border:1px solid #c6984f; margin:0 0 5px; position:relative }
-.petGroup_b { height: height:100px; background:left top repeat-y; background-image:url('../../images/talents/petlist-bg-left.jpg'); border:1px solid #fde9b0; padding:2px 0 3px 5px}
+.petGroup_b { height:100px; background:left top repeat-y; background-image:url('../../images/talents/petlist-bg-left.jpg'); border:1px solid #fde9b0; padding:2px 0 3px 5px}
.petGroup.selectedPetGroup { background-image:url('../../images/talents/petlist-bg-sel.jpg'); border:1px solid #c4995b }
.selectedPetGroup .petGroup_b { background-image:url('../../images/talents/petlist-bg-left-sel.jpg'); border:1px solid #ffffef }
.petGroup.hoverPetGroup { border:1px solid #fff !important}
правка css