Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: Source/WebCore/css/html.css

Issue 12159003: Merge 141195 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * The default style sheet used to render HTML. 2 * The default style sheet used to render HTML.
3 * 3 *
4 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 473
474 #if defined(ENABLE_DATALIST_ELEMENT) && ENABLE_DATALIST_ELEMENT 474 #if defined(ENABLE_DATALIST_ELEMENT) && ENABLE_DATALIST_ELEMENT
475 datalist { 475 datalist {
476 display: none; 476 display: none;
477 } 477 }
478 #endif 478 #endif
479 479
480 #if defined(ENABLE_INPUT_MULTIPLE_FIELDS_UI) && ENABLE_INPUT_MULTIPLE_FIELDS_UI 480 #if defined(ENABLE_INPUT_MULTIPLE_FIELDS_UI) && ENABLE_INPUT_MULTIPLE_FIELDS_UI
481 #if defined(ENABLE_INPUT_TYPE_DATE) && ENABLE_INPUT_TYPE_DATE 481 #if defined(ENABLE_INPUT_TYPE_DATE) && ENABLE_INPUT_TYPE_DATE
482 input[type="date"] { 482 input[type="date"] {
483 -webkit-align-items: stretch; 483 -webkit-align-items: center;
484 display: -webkit-inline-flex; 484 display: -webkit-inline-flex;
485 font-family: monospace; 485 font-family: monospace;
486 overflow: hidden;
486 padding: 0; 487 padding: 0;
487 -webkit-padding-start: 1px; 488 -webkit-padding-start: 1px;
488 } 489 }
489 #endif 490 #endif
490 #if defined(ENABLE_INPUT_TYPE_DATETIME) && ENABLE_INPUT_TYPE_DATETIME 491 #if defined(ENABLE_INPUT_TYPE_DATETIME) && ENABLE_INPUT_TYPE_DATETIME
491 input[type="datetime"] { 492 input[type="datetime"] {
492 -webkit-align-items: stretch; 493 -webkit-align-items: center;
493 display: -webkit-inline-flex; 494 display: -webkit-inline-flex;
494 font-family: monospace; 495 font-family: monospace;
496 overflow: hidden;
495 padding: 0; 497 padding: 0;
496 -webkit-padding-start: 1px; 498 -webkit-padding-start: 1px;
497 } 499 }
498 #endif 500 #endif
499 #if defined(ENABLE_INPUT_TYPE_DATETIMELOCAL) && ENABLE_INPUT_TYPE_DATETIMELOCAL 501 #if defined(ENABLE_INPUT_TYPE_DATETIMELOCAL) && ENABLE_INPUT_TYPE_DATETIMELOCAL
500 input[type="datetime-local"] { 502 input[type="datetime-local"] {
501 -webkit-align-items: stretch; 503 -webkit-align-items: center;
502 display: -webkit-inline-flex; 504 display: -webkit-inline-flex;
503 font-family: monospace; 505 font-family: monospace;
506 overflow: hidden;
504 padding: 0; 507 padding: 0;
505 -webkit-padding-start: 1px; 508 -webkit-padding-start: 1px;
506 } 509 }
507 #endif 510 #endif
508 #if defined(ENABLE_INPUT_TYPE_MONTH) && ENABLE_INPUT_TYPE_MONTH 511 #if defined(ENABLE_INPUT_TYPE_MONTH) && ENABLE_INPUT_TYPE_MONTH
509 input[type="month"] { 512 input[type="month"] {
510 -webkit-align-items: stretch; 513 -webkit-align-items: center;
511 display: -webkit-inline-flex; 514 display: -webkit-inline-flex;
512 font-family: monospace; 515 font-family: monospace;
516 overflow: hidden;
513 padding: 0; 517 padding: 0;
514 -webkit-padding-start: 1px; 518 -webkit-padding-start: 1px;
515 } 519 }
516 #endif 520 #endif
517 #if defined(ENABLE_INPUT_TYPE_TIME) && ENABLE_INPUT_TYPE_TIME 521 #if defined(ENABLE_INPUT_TYPE_TIME) && ENABLE_INPUT_TYPE_TIME
518 input[type="time"] { 522 input[type="time"] {
519 -webkit-align-items: stretch; 523 -webkit-align-items: center;
520 display: -webkit-inline-flex; 524 display: -webkit-inline-flex;
521 font-family: monospace; 525 font-family: monospace;
526 overflow: hidden;
522 padding: 0; 527 padding: 0;
523 -webkit-padding-start: 1px; 528 -webkit-padding-start: 1px;
524 } 529 }
525 #endif 530 #endif
526 #if defined(ENABLE_INPUT_TYPE_WEEK) && ENABLE_INPUT_TYPE_WEEK 531 #if defined(ENABLE_INPUT_TYPE_WEEK) && ENABLE_INPUT_TYPE_WEEK
527 input[type="week"] { 532 input[type="week"] {
528 -webkit-align-items: stretch; 533 -webkit-align-items: center;
529 display: -webkit-inline-flex; 534 display: -webkit-inline-flex;
530 font-family: monospace; 535 font-family: monospace;
536 overflow: hidden;
531 padding: 0; 537 padding: 0;
532 -webkit-padding-start: 1px; 538 -webkit-padding-start: 1px;
533 } 539 }
534 #endif 540 #endif
535 541
536 input::-webkit-datetime-edit { 542 input::-webkit-datetime-edit {
537 -webkit-flex: 1; 543 -webkit-flex: 1;
538 -webkit-user-modify: read-only !important; 544 -webkit-user-modify: read-only !important;
539 display: inline-block; 545 display: inline-block;
540 white-space: pre; 546 min-width: 0;
547 overflow: hidden;
548 }
549
550 input::-webkit-datetime-edit-fields-wrapper {
551 -webkit-user-modify: read-only !important;
552 display: inline-block;
553 padding: 1px 0;
554 white-space: nowrap;
541 } 555 }
542 556
543 /* If you update padding, border, or margin in the following ruleset, update 557 /* If you update padding, border, or margin in the following ruleset, update
544 DateTimeFieldElement::maximumWidth too. */ 558 DateTimeFieldElement::maximumWidth too. */
545 input::-webkit-datetime-edit-ampm-field, 559 input::-webkit-datetime-edit-ampm-field,
546 input::-webkit-datetime-edit-day-field, 560 input::-webkit-datetime-edit-day-field,
547 input::-webkit-datetime-edit-hour-field, 561 input::-webkit-datetime-edit-hour-field,
548 input::-webkit-datetime-edit-millisecond-field, 562 input::-webkit-datetime-edit-millisecond-field,
549 input::-webkit-datetime-edit-minute-field, 563 input::-webkit-datetime-edit-minute-field,
550 input::-webkit-datetime-edit-month-field, 564 input::-webkit-datetime-edit-month-field,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 } 596 }
583 597
584 /* If you update padding, border, or margin in the following ruleset, update 598 /* If you update padding, border, or margin in the following ruleset, update
585 DateTimeEditElement::customStyelForRenderer too. */ 599 DateTimeEditElement::customStyelForRenderer too. */
586 input::-webkit-datetime-edit-text { 600 input::-webkit-datetime-edit-text {
587 -webkit-user-modify: read-only !important; 601 -webkit-user-modify: read-only !important;
588 display: inline; 602 display: inline;
589 font: inherit !important; 603 font: inherit !important;
590 } 604 }
591 605
592 input::-webkit-date-and-time-container {
593 -webkit-align-items: center;
594 -webkit-flex: 1;
595 display: -webkit-inline-flex;
596 }
597
598 input[type="date"]::-webkit-inner-spin-button, 606 input[type="date"]::-webkit-inner-spin-button,
599 input[type="datetime"]::-webkit-inner-spin-button, 607 input[type="datetime"]::-webkit-inner-spin-button,
600 input[type="datetime-local"]::-webkit-inner-spin-button, 608 input[type="datetime-local"]::-webkit-inner-spin-button,
601 input[type="month"]::-webkit-inner-spin-button, 609 input[type="month"]::-webkit-inner-spin-button,
602 input[type="time"]::-webkit-inner-spin-button, 610 input[type="time"]::-webkit-inner-spin-button,
603 input[type="week"]::-webkit-inner-spin-button { 611 input[type="week"]::-webkit-inner-spin-button {
604 display: inline-block; 612 display: inline-block;
605 position: static; 613 position: static;
606 -webkit-margin-start: 2px; 614 -webkit-margin-start: 2px;
607 } 615 }
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
1284 @page { 1292 @page {
1285 /* FIXME: Define the right default values for page properties. */ 1293 /* FIXME: Define the right default values for page properties. */
1286 size: auto; 1294 size: auto;
1287 margin: auto; 1295 margin: auto;
1288 padding: 0px; 1296 padding: 0px;
1289 border-width: 0px; 1297 border-width: 0px;
1290 } 1298 }
1291 1299
1292 /* noscript is handled internally, as it depends on settings. */ 1300 /* noscript is handled internally, as it depends on settings. */
1293 1301
OLDNEW
« no previous file with comments | « LayoutTests/platform/chromium/TestExpectations ('k') | Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698