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

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

Issue 11557024: Merge 136808 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years 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
« no previous file with comments | « LayoutTests/platform/chromium/TestExpectations ('k') | Source/WebCore/dom/Element.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 } 533 }
534 #endif 534 #endif
535 535
536 input::-webkit-datetime-edit { 536 input::-webkit-datetime-edit {
537 -webkit-flex: 1; 537 -webkit-flex: 1;
538 -webkit-user-modify: read-only !important; 538 -webkit-user-modify: read-only !important;
539 display: inline-block; 539 display: inline-block;
540 white-space: pre; 540 white-space: pre;
541 } 541 }
542 542
543 /* If you update padding, border, or margin in the following ruleset, update
544 DateTimeFieldElement::maximumWidth too. */
543 input::-webkit-datetime-edit-ampm-field, 545 input::-webkit-datetime-edit-ampm-field,
544 input::-webkit-datetime-edit-day-field, 546 input::-webkit-datetime-edit-day-field,
545 input::-webkit-datetime-edit-hour-field, 547 input::-webkit-datetime-edit-hour-field,
546 input::-webkit-datetime-edit-millisecond-field, 548 input::-webkit-datetime-edit-millisecond-field,
547 input::-webkit-datetime-edit-minute-field, 549 input::-webkit-datetime-edit-minute-field,
548 input::-webkit-datetime-edit-month-field, 550 input::-webkit-datetime-edit-month-field,
549 input::-webkit-datetime-edit-second-field, 551 input::-webkit-datetime-edit-second-field,
550 input::-webkit-datetime-edit-week-field, 552 input::-webkit-datetime-edit-week-field,
551 input::-webkit-datetime-edit-year-field { 553 input::-webkit-datetime-edit-year-field {
552 -webkit-user-modify: read-only !important; 554 -webkit-user-modify: read-only !important;
553 border: none; 555 border: none;
554 display: inline-block; 556 display: inline;
555 margin: 1px; 557 font: inherit !important;
556 text-align: center; 558 padding: 1px;
557 } 559 }
558 560
559 /* Remove focus ring from fields and use highlight color */ 561 /* Remove focus ring from fields and use highlight color */
560 input::-webkit-datetime-edit-ampm-field:focus, 562 input::-webkit-datetime-edit-ampm-field:focus,
561 input::-webkit-datetime-edit-day-field:focus, 563 input::-webkit-datetime-edit-day-field:focus,
562 input::-webkit-datetime-edit-hour-field:focus, 564 input::-webkit-datetime-edit-hour-field:focus,
563 input::-webkit-datetime-edit-millisecond-field:focus, 565 input::-webkit-datetime-edit-millisecond-field:focus,
564 input::-webkit-datetime-edit-minute-field:focus, 566 input::-webkit-datetime-edit-minute-field:focus,
565 input::-webkit-datetime-edit-month-field:focus, 567 input::-webkit-datetime-edit-month-field:focus,
566 input::-webkit-datetime-edit-second-field:focus, 568 input::-webkit-datetime-edit-second-field:focus,
567 input::-webkit-datetime-edit-week-field:focus, 569 input::-webkit-datetime-edit-week-field:focus,
568 input::-webkit-datetime-edit-year-field:focus { 570 input::-webkit-datetime-edit-year-field:focus {
569 background-color: highlight; 571 background-color: highlight;
570 color: highlighttext; 572 color: highlighttext;
571 outline: none; 573 outline: none;
572 } 574 }
573 575
574 input::-webkit-datetime-edit-ampm-field[readonly], 576 input::-webkit-datetime-edit-ampm-field[readonly],
575 input::-webkit-datetime-edit-hour-field[readonly], 577 input::-webkit-datetime-edit-hour-field[readonly],
576 input::-webkit-datetime-edit-millisecond-field[readonly], 578 input::-webkit-datetime-edit-millisecond-field[readonly],
577 input::-webkit-datetime-edit-minute-field[readonly], 579 input::-webkit-datetime-edit-minute-field[readonly],
578 input::-webkit-datetime-edit-second-field[readonly] { 580 input::-webkit-datetime-edit-second-field[readonly] {
579 color: GrayText; 581 color: GrayText;
580 } 582 }
581 583
584 /* If you update padding, border, or margin in the following ruleset, update
585 DateTimeEditElement::customStyelForRenderer too. */
582 input::-webkit-datetime-edit-text { 586 input::-webkit-datetime-edit-text {
583 -webkit-user-modify: read-only !important; 587 -webkit-user-modify: read-only !important;
584 display: inline-block; 588 display: inline;
589 font: inherit !important;
585 } 590 }
586 591
587 input::-webkit-date-and-time-container { 592 input::-webkit-date-and-time-container {
588 -webkit-align-items: center; 593 -webkit-align-items: center;
589 -webkit-flex: 1; 594 -webkit-flex: 1;
590 display: -webkit-inline-flex; 595 display: -webkit-inline-flex;
591 } 596 }
592 597
593 input[type="date"]::-webkit-inner-spin-button, 598 input[type="date"]::-webkit-inner-spin-button,
594 input[type="datetime"]::-webkit-inner-spin-button, 599 input[type="datetime"]::-webkit-inner-spin-button,
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 @page { 1216 @page {
1212 /* FIXME: Define the right default values for page properties. */ 1217 /* FIXME: Define the right default values for page properties. */
1213 size: auto; 1218 size: auto;
1214 margin: auto; 1219 margin: auto;
1215 padding: 0px; 1220 padding: 0px;
1216 border-width: 0px; 1221 border-width: 0px;
1217 } 1222 }
1218 1223
1219 /* noscript is handled internally, as it depends on settings. */ 1224 /* noscript is handled internally, as it depends on settings. */
1220 1225
OLDNEW
« no previous file with comments | « LayoutTests/platform/chromium/TestExpectations ('k') | Source/WebCore/dom/Element.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698