Ticket #30409: 30409.2.diff
| File 30409.2.diff, 10.0 KB (added by , 11 years ago) |
|---|
-
src/wp-content/themes/twentyfifteen/inc/customizer.php
274 274 * @since Twenty Fifteen 1.0 275 275 */ 276 276 function twentyfifteen_color_scheme_css_template() { 277 $js_defaults = array( 278 'background_color' => '{{ data.background_color }}', 279 'header_background_color' => '{{ data.header_background_color }}', 280 'box_background_color' => '{{ data.box_background_color }}', 281 'textcolor' => '{{ data.textcolor }}', 282 'secondary_textcolor' => '{{ data.secondary_textcolor }}', 283 'border_color' => '{{ data.border_color }}', 284 'border_focus_color' => '{{ data.border_focus_color }}', 285 'sidebar_textcolor' => '{{ data.sidebar_textcolor }}', 286 'sidebar_border_color' => '{{ data.sidebar_border_color }}', 287 'sidebar_border_focus_color' => '{{ data.sidebar_border_focus_color }}', 288 'secondary_sidebar_textcolor' => '{{ data.secondary_sidebar_textcolor }}', 289 'meta_box_background_color' => '{{ data.meta_box_background_color }}', 290 ); 277 291 ?> 278 292 <script type="text/html" id="tmpl-twentyfifteen-color-scheme"> 293 <?php echo twentyfifteen_get_color_scheme_css( $js_defaults ); ?> 294 </script> 295 <?php 296 } 297 add_action( 'customize_controls_print_footer_scripts', 'twentyfifteen_color_scheme_css_template' ); 298 299 function twentyfifteen_get_color_scheme_css( $colors = array() ) { 300 $css_vars = wp_parse_args( $colors, array( 301 'background_color' => '', 302 'header_background_color' => '', 303 'box_background_color' => '', 304 'textcolor' => '', 305 'secondary_textcolor' => '', 306 'border_color' => '', 307 'border_focus_color' => '', 308 'sidebar_textcolor' => '', 309 'sidebar_border_color' => '', 310 'sidebar_border_focus_color' => '', 311 'secondary_sidebar_textcolor' => '', 312 'meta_box_background_color' => '', 313 ) ); 314 315 $css = <<<CSS 279 316 /* Color Scheme */ 280 317 281 318 /* Background Color */ 282 319 body { 283 background-color: { { data.background_color }};320 background-color: {$css_vars['background_color']}; 284 321 } 285 322 286 323 /* Sidebar Background Color */ 287 324 body:before, 288 325 .site-header { 289 background-color: { { data.header_background_color }};326 background-color: {$css_vars['header_background_color']}; 290 327 } 291 328 292 329 /* Box Background Color */ … … 298 335 .page-header, 299 336 .page-content, 300 337 .comments-area { 301 background-color: { { data.box_background_color }};338 background-color: {$css_vars['box_background_color']}; 302 339 } 303 340 304 341 /* Box Background Color */ … … 315 352 .page-links a:hover, 316 353 .page-links a:focus, 317 354 .sticky-post { 318 color: { { data.box_background_color }};355 color: {$css_vars['box_background_color']}; 319 356 } 320 357 321 358 /* Main Text Color */ … … 328 365 .widget_calendar tbody a, 329 366 .page-links a, 330 367 .sticky-post { 331 background-color: { { data.textcolor }};368 background-color: {$css_vars['textcolor']}; 332 369 } 333 370 334 371 /* Main Text Color */ … … 352 389 .comment-list .reply a:focus, 353 390 .site-info a:hover, 354 391 .site-info a:focus { 355 color: { { data.textcolor }};392 color: {$css_vars['textcolor']}; 356 393 } 357 394 358 395 /* Main Text Color */ … … 369 406 .pingback .edit-link a:hover, 370 407 .comment-list .reply a:hover, 371 408 .site-info a:hover { 372 border-color: { { data.textcolor }};409 border-color: {$css_vars['textcolor']}; 373 410 } 374 411 375 412 /* Secondary Text Color */ … … 389 426 .widget_calendar tbody a:focus, 390 427 .page-links a:hover, 391 428 .page-links a:focus { 392 background-color: { { data.textcolor }}; /* Fallback for IE7 and IE8 */393 background-color: { { data.secondary_textcolor }};429 background-color: {$css_vars['textcolor']}; /* Fallback for IE7 and IE8 */ 430 background-color: {$css_vars['secondary_textcolor']}; 394 431 } 395 432 396 433 /* Secondary Text Color */ … … 429 466 .wp-caption-text, 430 467 .gallery-caption, 431 468 .comment-list .reply a { 432 color: { { data.textcolor }}; /* Fallback for IE7 and IE8 */433 color: { { data.secondary_textcolor }};469 color: {$css_vars['textcolor']}; /* Fallback for IE7 and IE8 */ 470 color: {$css_vars['secondary_textcolor']}; 434 471 } 435 472 436 473 /* Secondary Text Color */ … … 437 474 blockquote, 438 475 .logged-in-as a:hover, 439 476 .comment-author a:hover { 440 border-color: { { data.textcolor }}; /* Fallback for IE7 and IE8 */441 border-color: { { data.secondary_textcolor }};477 border-color: {$css_vars['textcolor']}; /* Fallback for IE7 and IE8 */ 478 border-color: {$css_vars['secondary_textcolor']}; 442 479 } 443 480 444 481 /* Border Color */ … … 445 482 hr, 446 483 .dropdown-toggle:hover, 447 484 .dropdown-toggle:focus { 448 background-color: { { data.textcolor }}; /* Fallback for IE7 and IE8 */449 background-color: { { data.border_color }};485 background-color: {$css_vars['textcolor']}; /* Fallback for IE7 and IE8 */ 486 background-color: {$css_vars['border_color']}; 450 487 } 451 488 452 489 /* Border Color */ … … 481 518 .comment-list .trackback, 482 519 .comment-list .reply a, 483 520 .no-comments { 484 border-color: { { data.textcolor }}; /* Fallback for IE7 and IE8 */485 border-color: { { data.border_color }};521 border-color: {$css_vars['textcolor']}; /* Fallback for IE7 and IE8 */ 522 border-color: {$css_vars['border_color']}; 486 523 } 487 524 488 525 /* Border Focus Color */ … … 489 526 a:focus, 490 527 button:focus, 491 528 input:focus { 492 outline-color: { { data.textcolor }}; /* Fallback for IE7 and IE8 */493 outline-color: { { data.border_focus_color }};529 outline-color: {$css_vars['textcolor']}; /* Fallback for IE7 and IE8 */ 530 outline-color: {$css_vars['border_focus_color']}; 494 531 } 495 532 496 533 input:focus, 497 534 textarea:focus { 498 border-color: { { data.textcolor }}; /* Fallback for IE7 and IE8 */499 border-color: { { data.border_focus_color }};535 border-color: {$css_vars['textcolor']}; /* Fallback for IE7 and IE8 */ 536 border-color: {$css_vars['border_focus_color']}; 500 537 } 501 538 502 539 /* Sidebar Link Color */ 503 540 .secondary-toggle:before { 504 color: { { data.sidebar_textcolor }};541 color: {$css_vars['sidebar_textcolor']}; 505 542 } 506 543 507 544 .site-title a, 508 545 .site-description { 509 color: { { data.sidebar_textcolor }};546 color: {$css_vars['sidebar_textcolor']}; 510 547 } 511 548 512 549 /* Sidebar Text Color */ 513 550 .site-title a:hover, 514 551 .site-title a:focus { 515 color: { { data.secondary_sidebar_textcolor }};552 color: {$css_vars['secondary_sidebar_textcolor']}; 516 553 } 517 554 518 555 /* Sidebar Border Color */ 519 556 .secondary-toggle { 520 border-color: { { data.sidebar_textcolor }}; /* Fallback for IE7 and IE8 */521 border-color: { { data.sidebar_border_color }};557 border-color: {$css_vars['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */ 558 border-color: {$css_vars['sidebar_border_color']}; 522 559 } 523 560 524 561 /* Sidebar Border Focus Color */ 525 562 .secondary-toggle:hover, 526 563 .secondary-toggle:focus { 527 border-color: { { data.sidebar_textcolor }}; /* Fallback for IE7 and IE8 */528 border-color: { { data.sidebar_border_focus_color }};564 border-color: {$css_vars['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */ 565 border-color: {$css_vars['sidebar_border_focus_color']}; 529 566 } 530 567 531 568 .site-title a { 532 outline-color: { { data.sidebar_textcolor }}; /* Fallback for IE7 and IE8 */533 outline-color: { { data.sidebar_border_focus_color }};569 outline-color: {$css_vars['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */ 570 outline-color: {$css_vars['sidebar_border_focus_color']}; 534 571 } 535 572 536 573 /* Meta Background Color */ 537 574 .entry-footer { 538 background-color: { { data.meta_box_background_color }};575 background-color: {$css_vars['meta_box_background_color']}; 539 576 } 540 577 541 578 @media screen and (min-width: 38.75em) { 542 579 /* Main Text Color */ 543 580 .page-header { 544 border-color: { { data.textcolor }};581 border-color: {$css_vars['textcolor']}; 545 582 } 546 583 } 547 584 … … 560 597 .widget_calendar tbody a, 561 598 .widget_calendar tbody a:hover, 562 599 .widget_calendar tbody a:focus { 563 color: { { data.header_background_color }};600 color: {$css_vars['header_background_color']}; 564 601 } 565 602 566 603 /* Sidebar Link Color */ … … 569 606 .widget-title, 570 607 .widget blockquote cite, 571 608 .widget blockquote small { 572 color: { { data.sidebar_textcolor }};609 color: {$css_vars['sidebar_textcolor']}; 573 610 } 574 611 575 612 .widget button, … … 577 614 .widget input[type="reset"], 578 615 .widget input[type="submit"], 579 616 .widget_calendar tbody a { 580 background-color: { { data.sidebar_textcolor }};617 background-color: {$css_vars['sidebar_textcolor']}; 581 618 } 582 619 583 620 .textwidget a { 584 border-color: { { data.sidebar_textcolor }};621 border-color: {$css_vars['sidebar_textcolor']}; 585 622 } 586 623 587 624 /* Sidebar Text Color */ … … 592 629 .widget blockquote, 593 630 .widget .wp-caption-text, 594 631 .widget .gallery-caption { 595 color: { { data.secondary_sidebar_textcolor }};632 color: {$css_vars['secondary_sidebar_textcolor']}; 596 633 } 597 634 598 635 .widget button:hover, … … 605 642 .widget input[type="submit"]:focus, 606 643 .widget_calendar tbody a:hover, 607 644 .widget_calendar tbody a:focus { 608 background-color: { { data.secondary_sidebar_textcolor }};645 background-color: {$css_vars['secondary_sidebar_textcolor']}; 609 646 } 610 647 611 648 .widget blockquote { 612 border-color: { { data.secondary_sidebar_textcolor }};649 border-color: {$css_vars['secondary_sidebar_textcolor']}; 613 650 } 614 651 615 652 /* Sidebar Border Color */ … … 626 663 .widget_nav_menu .sub-menu, 627 664 .widget_pages .children, 628 665 .widget abbr[title] { 629 border-color: { { data.sidebar_border_color }};666 border-color: {$css_vars['sidebar_border_color']}; 630 667 } 631 668 632 669 .dropdown-toggle:hover, 633 670 .dropdown-toggle:focus, 634 671 .widget hr { 635 background-color: { { data.sidebar_border_color }};672 background-color: {$css_vars['sidebar_border_color']}; 636 673 } 637 674 638 675 .widget input:focus, 639 676 .widget textarea:focus { 640 border-color: { { data.sidebar_border_focus_color }};677 border-color: {$css_vars['sidebar_border_focus_color']}; 641 678 } 642 679 643 680 .sidebar a:focus, 644 681 .dropdown-toggle:focus { 645 outline-color: { { data.sidebar_border_focus_color }};682 outline-color: {$css_vars['sidebar_border_focus_color']}; 646 683 } 647 684 } 648 </script> 649 <?php 650 } 651 add_action( 'customize_controls_print_footer_scripts', 'twentyfifteen_color_scheme_css_template' ); 685 CSS; 686 687 return $css; 688 } 689 No newline at end of file