summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authordharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 04:40:37 +0000
committerdharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 04:40:37 +0000
commit68aefbc3323af8a96a4332f1f02fff63871cee03 (patch)
treeb4449738ca7ccb7d305ad47b101e2320d9604195 /chrome/common
parent8284dcb2e031b86f43834c89a7ec09a266b52f4e (diff)
downloadchromium_src-68aefbc3323af8a96a4332f1f02fff63871cee03.zip
chromium_src-68aefbc3323af8a96a4332f1f02fff63871cee03.tar.gz
chromium_src-68aefbc3323af8a96a4332f1f02fff63871cee03.tar.bz2
Removed hack that hid Calculator's one-column-of-white-pixels-on-OS-X
Issue 151985 caused a one pixel wide column of white on the right side of the Calculator app on OS X. To make this less visible, elements were added to the Calculator in http://crrev.com/11091078 that would mask that column on OS X only. Since then the area next to the Calculator keyboard has been made gray on all platforms to mitigate any bug that would allow the Calculator window to be resized. This effectively hides the one-column-of-white-pixels on OS X so the pixel-hiding hack can be removed. BUG=155383 Review URL: https://chromiumcodereview.appspot.com/11368033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/docs/examples/apps/calculator/app/calculator.html4
-rw-r--r--chrome/common/extensions/docs/examples/apps/calculator/app/style.css69
2 files changed, 0 insertions, 73 deletions
diff --git a/chrome/common/extensions/docs/examples/apps/calculator/app/calculator.html b/chrome/common/extensions/docs/examples/apps/calculator/app/calculator.html
index 19dda60..c242f4b 100644
--- a/chrome/common/extensions/docs/examples/apps/calculator/app/calculator.html
+++ b/chrome/common/extensions/docs/examples/apps/calculator/app/calculator.html
@@ -28,7 +28,6 @@
<button class="divide" title="divide" data-button="divide"></button>
<button class="multiply" title="multiply" data-button="multiply">
</button>
- <span class="a-workaround-for-151985"></span>
</div>
<div>
<button class="seven" title="seven" data-button="seven"></button>
@@ -36,21 +35,18 @@
<button class="nine" title="nine" data-button="nine"></button>
<button class="subtract" title="subtract" data-button="subtract">
</button>
- <span class="a-workaround-for-151985"></span>
</div>
<div>
<button class="four" title="four" data-button="four"></button>
<button class="five" title="five" data-button="five"></button>
<button class="six" title="six" data-button="six"></button>
<button class="add" title="add" data-button="add"></button>
- <span class="a-workaround-for-151985"></span>
</div>
<div>
<button class="one" title="one" data-button="one"></button>
<button class="two" title="two" data-button="two"></button>
<button class="three" title="three" data-button="three"></button>
<button class="equals" title="equals" data-button="equals"></button>
- <span class="a-workaround-for-151985"></span>
</div>
<div>
<button class="zero" title="zero" data-button="zero"></button>
diff --git a/chrome/common/extensions/docs/examples/apps/calculator/app/style.css b/chrome/common/extensions/docs/examples/apps/calculator/app/style.css
index 4711790..e499166 100644
--- a/chrome/common/extensions/docs/examples/apps/calculator/app/style.css
+++ b/chrome/common/extensions/docs/examples/apps/calculator/app/style.css
@@ -32,14 +32,6 @@ body {
width: 243px;
}
-#calculator-buttons div .a-workaround-for-151985 {
- bottom: 0; /* .a-workaround-for-151985 styles and elements hide */
- left: 243px; /* the column of dead pixels at the right edge of the */
- position: absolute; /* screen on OS X where http://crbug.com/151985 makes */
- top: 0; /* the calculator window one pixels too wide. They can */
- width: 1px; /* all be removed when that issue is fixed. */
-}
-
#calculator-buttons button {
border: none;
height: 45px;
@@ -70,20 +62,6 @@ body {
background-position: -426px -90px;
}
-#calculator-buttons button.add + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(71, 71, 71), rgb(51, 51, 51));
- box-shadow: inset 0 1px 0 0 rgb(30, 30, 30),
- inset 0 2px 0 0 rgb(87, 87, 87);
-}
-
-#calculator-buttons button.add[data-active="touch"] + .a-workaround-for-151985,
-#calculator-buttons button.add[data-active="mouse"]:active
- + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(51, 51, 51), rgb(45, 45, 45));
- box-shadow: inset 0 1px 0 0 rgb(30, 30, 30),
- inset 0 2px 0 0 rgb(43, 43, 43);
-}
-
#calculator-buttons button.clear {
/* The default background-position: 0 0; is fine */
}
@@ -123,23 +101,6 @@ body {
background-position: -426px -135px;
}
-#calculator-buttons button.equals + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(94, 162, 252), rgb(70, 118, 252));
- box-shadow: inset 0 1px 0 0 rgb(29, 29, 29),
- inset 0 2px 0 0 rgb(115, 175, 253);
- height: 90px;
-}
-
-#calculator-buttons button.equals[data-active="touch"]
- + .a-workaround-for-151985,
-#calculator-buttons button.equals[data-active="mouse"]:active
- + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(66, 114, 185), rgb(49, 86, 185));
- box-shadow: inset 0 1px 0 0 rgb(29, 29, 29),
- inset 0 2px 0 0 rgb(48, 82, 136);
- height: 90px;
-}
-
#calculator-buttons button.five {
background-position: -61px -90px;
}
@@ -168,21 +129,6 @@ body {
background-position: -426px 0;
}
-#calculator-buttons button.multiply + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(76, 76, 76), rgb(67, 67, 67));
- box-shadow: inset 0 1px 0 0 rgb(30, 30, 30),
- inset 0 2px 0 0 rgb(105, 105, 105);
-}
-
-#calculator-buttons button.multiply[data-active="touch"]
- + .a-workaround-for-151985,
-#calculator-buttons button.multiply[data-active="mouse"]:active
- + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(53, 53, 53), rgb(53, 53, 53));
- box-shadow: inset 0 1px 0 0 rgb(30, 30, 30),
- inset 0 2px 0 0 rgb(45, 45, 45);
-}
-
#calculator-buttons button.negate {
background-position: -61px 0;
}
@@ -247,21 +193,6 @@ body {
background-position: -426px -45px;
}
-#calculator-buttons button.subtract + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(75, 75, 75), rgb(60, 60, 60));
- box-shadow: inset 0 1px 0 0 rgb(30, 30, 30),
- inset 0 2px 0 0 rgb(96, 96, 96);
-}
-
-#calculator-buttons button.subtract[data-active="touch"]
- + .a-workaround-for-151985,
-#calculator-buttons button.subtract[data-active="mouse"]:active
- + .a-workaround-for-151985 {
- background: -webkit-linear-gradient(rgb(53, 53, 53), rgb(50, 50, 50));
- box-shadow: inset 0 1px 0 0 rgb(30, 30, 30),
- inset 0 2px 0 0 rgb(48, 48, 48);
-}
-
#calculator-buttons button.three {
background-position: -122px -135px;
}