Merge pull request #116 from blackberry/listFix

Jason Scott · Jason Scott · commit 676d27e670d9 · 2013-04-01T11:27:32.000-07:00
Listview: Fixes the list item text moving when selected
diff --git a/src/assets/list-item-selected-img-mask.png b/src/assets/list-item-selected-img-mask.png
diff --git a/src/less/list.less b/src/less/list.less
@@ -74,14 +74,13 @@ li.ui-btn.ui-btn-icon-right .ui-btn-inner {
 	}
 
 	&.ui-btn-down-c, &.ui-btn-down-a {
+		border-width: 0;
 		.ui-btn-inner {
-			border-color: @BBLightBlue;
 			box-shadow: inset 0px 0px 0px 4px @BBLightBlue;
-			border-width: 4px;
+			border-color: @BBLightBlue;
 		}
-		.ui-li-thumb, .ui-listview .ui-li-icon {
-			max-height: 113px;
-			max-width: 113px;
+		img {
+			-webkit-mask-box-image: url(images_bb/list-item-selected-img-mask.png);
 		}
 	}
 
@@ -182,6 +181,7 @@ li.ui-btn.ui-btn-icon-right .ui-btn-inner {
 }
 
 .ui-li-heading, .ui-li .ui-btn-text {
+	text-overflow: -blackberry-fade;
 	font-size: @global-listview-title-font-size;
 	font-weight: normal;
 	& , .ui-li-desc {
diff --git a/src/less/mixins.less b/src/less/mixins.less
@@ -69,9 +69,6 @@
     background:  @bg;
     background-image: -webkit-gradient(linear, left top, left bottom, from(  @start  ), to(  @end  ));
     background-image: -webkit-linear-gradient(  @start , @end  );
-    background-image:    -moz-linear-gradient(  @start, @end  );
-    background-image:     -ms-linear-gradient(  @start, @end  );
-    background-image:      -o-linear-gradient(  @start, @end  );
     background-image:         linear-gradient(  @start , @end  );
 }
 
diff --git a/src/less/variables.less b/src/less/variables.less
@@ -24,7 +24,7 @@
 //Backgrounds
 @obsidian:  #121212;
 @titan:     #272727;
-@snow:      #f8f8f8;
+@snow:      #fefefe;
 @snow10:    #f9f7dd;
 
 //Text colors
@@ -340,7 +340,7 @@
 @c-body-shadow-x: 0;
 @c-body-shadow-y: 1px;
 @c-body-shadow:   @c-body-shadow-x  @c-body-shadow-y  @c-body-shadow-radius @c-body-shadow-color;
-@c-bup-border: 2px solid  #b1b1b1;
+@c-bup-border: 2px solid  #efefef;
 @c-bup-background-color: @primaryWhite;
 @c-bup-background-end: #dddddd;
 @c-bup-background-start: @primaryWhite;

Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,13 @@ li.ui-btn.ui-btn-icon-right .ui-btn-inner {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`&.ui-btn-down-c, &.ui-btn-down-a {`
	`77`	`+ border-width: 0;`
`77`	`78`	`.ui-btn-inner {`
`78`		`- border-color: @BBLightBlue;`
`79`	`79`	`box-shadow: inset 0px 0px 0px 4px @BBLightBlue;`
`80`		`- border-width: 4px;`
	`80`	`+ border-color: @BBLightBlue;`
`81`	`81`	`}`
`82`		`- .ui-li-thumb, .ui-listview .ui-li-icon {`
`83`		`- max-height: 113px;`
`84`		`- max-width: 113px;`
	`82`	`+ img {`
	`83`	`+ -webkit-mask-box-image: url(images_bb/list-item-selected-img-mask.png);`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`
`@@ -182,6 +181,7 @@ li.ui-btn.ui-btn-icon-right .ui-btn-inner {`
`182`	`181`	`}`
`183`	`182`
`184`	`183`	`.ui-li-heading, .ui-li .ui-btn-text {`
	`184`	`+ text-overflow: -blackberry-fade;`
`185`	`185`	`font-size: @global-listview-title-font-size;`
`186`	`186`	`font-weight: normal;`
`187`	`187`	`& , .ui-li-desc {`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,6 @@`
`69`	`69`	`background: @bg;`
`70`	`70`	`background-image: -webkit-gradient(linear, left top, left bottom, from( @start ), to( @end ));`
`71`	`71`	`background-image: -webkit-linear-gradient( @start , @end );`
`72`		`- background-image: -moz-linear-gradient( @start, @end );`
`73`		`- background-image: -ms-linear-gradient( @start, @end );`
`74`		`- background-image: -o-linear-gradient( @start, @end );`
`75`	`72`	`background-image: linear-gradient( @start , @end );`
`76`	`73`	`}`
`77`	`74`