Bug 1054889 - Update images for touch caret and selection carets. r=r…

…oc, f=mtseng, ui-r=chuang Update images provided in bug 1024930, and make touch caret uses the same images as selection carets.
dothq · Aug 19, 2014 · aecd542 · aecd542
1 parent 5a46ceb
commit aecd542
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 45 deletions.
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
@@ -695,9 +695,6 @@
 @BINPATH@/res/[email protected]
 @BINPATH@/res/[email protected]
 @BINPATH@/res/[email protected]
-@BINPATH@/res/text_selection_handle.png
-@BINPATH@/res/[email protected]
-@BINPATH@/res/[email protected]
 @BINPATH@/res/grabber.gif
 #ifdef XP_MACOSX
 @BINPATH@/res/cursors/*

diff --git a/editor/composer/moz.build b/editor/composer/moz.build
@@ -59,7 +59,4 @@ RESOURCE_FILES += [
     'res/[email protected]',
     'res/[email protected]',
     'res/[email protected]',
-    'res/text_selection_handle.png',
-    'res/[email protected]',
-    'res/[email protected]',
 ]
diff --git a/editor/composer/res/text_caret.png b/editor/composer/res/text_caret.png
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/text_caret_tilt_left.png b/editor/composer/res/text_caret_tilt_left.png
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/text_caret_tilt_right.png b/editor/composer/res/text_caret_tilt_right.png
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/text_selection_handle.png b/editor/composer/res/text_selection_handle.png
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/editor/composer/res/[email protected] b/editor/composer/res/[email protected]
diff --git a/layout/style/ua.css b/layout/style/ua.css
@@ -53,7 +53,7 @@
   display: table-row !important;
 }
 
-/* The ::-moz-table-column pseudo-element is for extra columns at the end 
+/* The ::-moz-table-column pseudo-element is for extra columns at the end
    of a table. */
 *|*::-moz-table-column {
   display: table-column !important;
@@ -62,7 +62,7 @@
 *|*::-moz-table-column-group {
   display: table-column-group !important;
 }
- 
+
 *|*::-moz-table-row-group {
   display: table-row-group !important;
 }
@@ -183,7 +183,7 @@
 %endif
 }
 
-*|*::-moz-column-content { 
+*|*::-moz-column-content {
   /* the column boxes inside a column-flowed block */
   /* make unicode-bidi inherit, otherwise it has no effect on column boxes */
   unicode-bidi: inherit;
@@ -304,51 +304,33 @@ parsererror|sourcetext {
   font-size: 12pt;
 }
 
-div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret {
-  background-image: url("resource://gre/res/text_selection_handle.png");
-  position: absolute;
-  width: 19px;
-  height: 24px;
-  margin-left: -10px;
-  background-position: center center;
-  z-index: 2147483647;
-}
-
+div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
 div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
 div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
   background-image: url("resource://gre/res/text_caret.png");
   position: absolute;
-  width: 21px;
-  height: 26px;
-  margin-left: -11px;
+  width: 29px;
+  height: 31px;
+  margin-left: -15px;
   background-position: center center;
   background-size: 100% 100%;
   z-index: 2147483647;
 }
 
 div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left.tilt {
   background-image: url("resource://gre/res/text_caret_tilt_left.png");
-  margin-left: -22px;
-  width: 22px;
+  margin-left: -29px;
+  width: 29px;
 }
 
 div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
   background-image: url("resource://gre/res/text_caret_tilt_right.png");
   margin-left: 0px;
-  width: 22px;
+  width: 29px;
 }
 
 @media (min-resolution: 1.5dppx) {
-  div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret {
-    background-image: url("resource://gre/res/[email protected]");
-    position: absolute;
-    width: 29px;
-    height: 36px;
-    margin-left: -15px;
-    background-position: center center;
-    z-index: 2147483647;
-  }
-
+  div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
   div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
   div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
     background-image: url("resource://gre/res/[email protected]");
@@ -364,16 +346,7 @@ div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
 }
 
 @media (min-resolution: 2dppx) {
-  div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret {
-    background-image: url("resource://gre/res/[email protected]");
-    position: absolute;
-    width: 38px;
-    height: 48px;
-    margin-left: -19px;
-    background-position: center center;
-    z-index: 2147483647;
-  }
-
+  div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
   div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left,
   div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
     background-image: url("resource://gre/res/[email protected]");
@@ -389,6 +362,7 @@ div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right.tilt {
 }
 
 @media (min-resolution: 2.25dppx) {
+  div[\_moz_anonclass="mozTouchCaret"].moz-touchcaret,
   div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-left
   div[\_moz_anonclass="mozTouchCaret"].moz-selectioncaret-right {
     background-image: url("resource://gre/res/[email protected]");