[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
diegohcg at webkit.org
diegohcg at webkit.org
Wed Dec 22 13:47:50 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 40a9d7b411d0fc2d7a1dcebba0d9c12a81de6621
Author: diegohcg at webkit.org <diegohcg at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 27 15:56:51 2010 +0000
2010-09-27 Ragner Magalhaes <ragner.magalhaes at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] New input style for Qt Mobile theme
https://bugs.webkit.org/show_bug.cgi?id=46461
Rename themeQtMaemo5.css to themeQtMobile.css since it is the theme for all Qt mobile platform.
Adjust new input style.
* WebCore.pri:
* css/themeQtMobile.css: Renamed from css/themeQtMaemo5.css
(select):
(select:disabled):
(select:active):
(select:active:disabled):
(textarea):
(textarea:disabled):
(textarea:active):
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::extraDefaultStyleSheet): Renamed themeQtMaemo5UserAgentStyleSheet to themeQtMobileUserAgentStyleSheet to match renamed file.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68393 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8bcda0a..8d14d92 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-27 Ragner Magalhaes <ragner.magalhaes at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] New input style for Qt Mobile theme
+ https://bugs.webkit.org/show_bug.cgi?id=46461
+
+ Rename themeQtMaemo5.css to themeQtMobile.css since it is the theme for all Qt mobile platform.
+ Adjust new input style.
+
+ * WebCore.pri:
+ * css/themeQtMobile.css: Renamed from css/themeQtMaemo5.css
+ (select):
+ (select:disabled):
+ (select:active):
+ (select:active:disabled):
+ (textarea):
+ (textarea:disabled):
+ (textarea:active):
+ * platform/qt/RenderThemeQt.cpp:
+ (WebCore::RenderThemeQt::extraDefaultStyleSheet): Renamed themeQtMaemo5UserAgentStyleSheet to themeQtMobileUserAgentStyleSheet to match renamed file.
+
2010-09-27 Girish Ramakrishnan <girish at forwardbias.in>
Reviewed by Antonio Gomes.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 37bb205..67b5fdb 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -61,7 +61,7 @@ STYLESHEETS_EMBED = \
$$PWD/css/mediaControls.css \
$$PWD/css/mediaControlsQt.css \
$$PWD/css/themeQtNoListboxes.css \
- $$PWD/css/themeQtMaemo5.css
+ $$PWD/css/themeQtMobile.css
v8 {
IDL_BINDINGS += \
diff --git a/WebCore/css/themeQtMaemo5.css b/WebCore/css/themeQtMaemo5.css
deleted file mode 100644
index b99cd7a..0000000
--- a/WebCore/css/themeQtMaemo5.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-input[type="button"],
-input[type="submit"],
-input[type="reset"],
-input[type="file"]::-webkit-file-upload-button, button,
-select {
- padding: 2px 18px 3px 18px;
- border: 1px solid black;
- -webkit-border-radius:5px;
- background-color: ButtonFace;
-}
-
-input[type="button"]:disabled,
-input[type="submit"]:disabled,
-input[type="reset"]:disabled,
-input[type="file"]:disabled::-webkit-file-upload-button,
-button:disabled,
-select:disabled {
- border: 1px solid gray;
-}
-
-input[type="button"]:active,
-input[type="submit"]:active,
-input[type="reset"]:active,
-input[type="file"]:active::-webkit-file-upload-button,
-button:active,
-select:active{
- background-color: ButtonShadow;
-}
-
-input[type="button"]:active:disabled,
-input[type="submit"]:active:disabled,
-input[type="reset"]:active:disabled,
-input[type="file"]:active:disabled::-webkit-file-upload-button,
-button:active:disabled,
-select:active:disabled {
- border: 1px solid gray;
-}
-
-input:not([type]),
-input[type="text"],
-input[type="password"],
-input[type="email"],
-input[type="color"],
-input[type="search"],
-input[type="date"],
-input[type="number"],
-input[type="url"],
-textarea {
- border: 1px solid black;
-}
-
-input:not([type]):disabled,
-input[type="text"]:disabled,
-input[type="password"]:disabled,
-input[type="email"]:disabled,
-input[type="color"]:disabled,
-input[type="search"]:disabled,
-input[type="date"]:disabled,
-input[type="number"]:disabled,
-input[type="url"]:disabled,
-textarea:disabled {
- border: 1px solid grey;
- background-color:ButtonHighlight;
-}
-
-input:not([type]):active,
-input[type="text"]:active,
-input[type="password"]:active,
-input[type="email"]:active,
-input[type="color"]:active,
-input[type="search"]:active,
-input[type="date"]:active,
-input[type="number"]:active,
-input[type="url"]:active,
-textarea:active {
- background-color:ButtonShadow;
-}
diff --git a/WebCore/css/themeQtMobile.css b/WebCore/css/themeQtMobile.css
new file mode 100644
index 0000000..ef2d182
--- /dev/null
+++ b/WebCore/css/themeQtMobile.css
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
+input[type="file"]::-webkit-file-upload-button, button,
+select {
+ padding: 2px 18px 3px 18px;
+ border: 1px solid black;
+ -webkit-border-radius:5px;
+ background-color: ButtonFace;
+}
+
+input[type="button"]:disabled,
+input[type="submit"]:disabled,
+input[type="reset"]:disabled,
+input[type="file"]:disabled::-webkit-file-upload-button,
+button:disabled,
+select:disabled {
+ border: 1px solid gray;
+}
+
+input[type="button"]:active,
+input[type="submit"]:active,
+input[type="reset"]:active,
+input[type="file"]:active::-webkit-file-upload-button,
+button:active,
+select:active{
+ background-color: ButtonShadow;
+}
+
+input[type="button"]:active:disabled,
+input[type="submit"]:active:disabled,
+input[type="reset"]:active:disabled,
+input[type="file"]:active:disabled::-webkit-file-upload-button,
+button:active:disabled,
+select:active:disabled {
+ border: 1px solid gray;
+}
+
+input:not([type]),
+input[type="text"],
+input[type="password"],
+input[type="email"],
+input[type="tel"],
+input[type="color"],
+input[type="search"],
+input[type="date"],
+input[type="number"],
+input[type="url"],
+textarea {
+ border: 1px solid gray;
+ background: -webkit-gradient(linear, left top, left 30, color-stop(0.0, #bfbfbf), color-stop(0.2, #ffffff));
+ color: #3e3e3e;
+ -webkit-border-radius:5px;
+}
+
+input:not([type]):disabled,
+input[type="text"]:disabled,
+input[type="password"]:disabled,
+input[type="email"]:disabled,
+input[type="tel"]:disabled,
+input[type="color"]:disabled,
+input[type="search"]:disabled,
+input[type="date"]:disabled,
+input[type="number"]:disabled,
+input[type="url"]:disabled,
+textarea:disabled {
+ border: 1px solid gray;
+ background: -webkit-gradient(linear, left top, left 30, color-stop(0.0, #e5e5e5), color-stop(0.2, #ffffff));
+ color: #e5e5e5;
+}
+
+input:not([type]):active,
+input[type="text"]:active,
+input[type="password"]:active,
+input[type="email"]:active,
+input[type="tel"]:active,
+input[type="color"]:active,
+input[type="search"]:active,
+input[type="date"]:active,
+input[type="number"]:active,
+input[type="url"]:active,
+textarea:active {
+ background: ButtonShadow;
+}
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 4a461ac..7388b76 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -219,7 +219,7 @@ String RenderThemeQt::extraDefaultStyleSheet()
result += String(themeQtNoListboxesUserAgentStyleSheet, sizeof(themeQtNoListboxesUserAgentStyleSheet));
#endif
#if USE(QT_MOBILE_THEME)
- result += String(themeQtMaemo5UserAgentStyleSheet, sizeof(themeQtMaemo5UserAgentStyleSheet));
+ result += String(themeQtMobileUserAgentStyleSheet, sizeof(themeQtMobileUserAgentStyleSheet));
#endif
return result;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list