| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css |
| — | — | @@ -414,6 +414,7 @@ |
| 415 | 415 | width: 100%; |
| 416 | 416 | } |
| 417 | 417 | /* tooltip styling. by default the element to be styled is .tooltip */ |
| | 418 | +<<<<<<< .mine |
| 418 | 419 | .articleFeedbackv5-panel .title-wrap { |
| 419 | 420 | position: relative; |
| 420 | 421 | } |
| — | — | @@ -421,18 +422,44 @@ |
| 422 | 423 | display:none; |
| 423 | 424 | position: absolute; |
| 424 | 425 | z-index: 15; |
| | 426 | + top: -185px; |
| | 427 | + right: -105px; |
| | 428 | +======= |
| | 429 | +.articleFeedbackv5-panel .title-wrap { |
| | 430 | + position: relative; |
| | 431 | +} |
| | 432 | +.articleFeedbackv5-panel .articleFeedbackv5-tooltip { |
| | 433 | + display:none; |
| | 434 | + position: absolute; |
| | 435 | + z-index: 15; |
| 425 | 436 | top: -175px; |
| 426 | 437 | right: -105px; |
| | 438 | +>>>>>>> .r103389 |
| 427 | 439 | font-size:12px; |
| 428 | 440 | width:234px; |
| 429 | 441 | color:#000; |
| 430 | 442 | } |
| | 443 | +<<<<<<< .mine |
| 431 | 444 | .articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top { |
| 432 | 445 | background: url(images/bg-tooltip-top.png); |
| 433 | 446 | height: 11px; |
| 434 | 447 | } |
| 435 | 448 | .articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat { |
| 436 | 449 | background: url(images/bg-tooltip.png) repeat-y; |
| | 450 | + padding: 0 20px 1px; |
| | 451 | + margin: 0; |
| | 452 | +} |
| | 453 | +.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-bottom { |
| | 454 | + background: url(images/bg-tooltip-bottom.png); |
| | 455 | + height: 26px; |
| | 456 | +} |
| | 457 | +======= |
| | 458 | +.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top { |
| | 459 | + background: url(images/bg-tooltip-top.png); |
| | 460 | + height: 11px; |
| | 461 | +} |
| | 462 | +.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat { |
| | 463 | + background: url(images/bg-tooltip.png) repeat-y; |
| 437 | 464 | padding: 0 20px 10px; |
| 438 | 465 | margin: 0; |
| 439 | 466 | } |
| — | — | @@ -443,6 +470,7 @@ |
| 444 | 471 | background: url(images/bg-tooltip-bottom.png); |
| 445 | 472 | height: 26px; |
| 446 | 473 | } |
| | 474 | +>>>>>>> .r103389 |
| 447 | 475 | .articleFeedbackv5-panel { |
| 448 | 476 | width: 598px; |
| 449 | 477 | background: #f5faff; |
| — | — | @@ -521,7 +549,7 @@ |
| 522 | 550 | } |
| 523 | 551 | .articleFeedbackv5-panel .articleFeedbackv5-disclosure { |
| 524 | 552 | float: left; |
| 525 | | - width: 235px; |
| | 553 | + width: 280px; |
| 526 | 554 | margin: 0 0 0 10px; |
| 527 | 555 | } |
| 528 | 556 | .articleFeedbackv5-panel .articleFeedbackv5-submit { |