Merge pull request #12610 from snowmantw/issue921392

Bug 921392 - [LockScreen] Need to dark the icons of locksceen
mozilla-b2g · Oct 3, 2013 · 529a4d7 · 529a4d7
2 parents fbf6ef7 + 16abf51
commit 529a4d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/apps/system/js/lockscreen.js b/apps/system/js/lockscreen.js
@@ -304,7 +304,7 @@ var LockScreen = {
     this.leftIcon.classList.remove('dark');
   },
 
-  darkIcon: function() {
+  darkIcons: function() {
     this.rightIcon.classList.add('dark');
     this.leftIcon.classList.add('dark');
   },
@@ -585,11 +585,10 @@ var LockScreen = {
       this.slideCenter.classList.add('touched');
       this.slideRight.classList.add('touched');
     }
-    this.darkIcon();
     this._slideCount = 0;
   },
 
-  // Restore all slide elements.
+  // Restore all elements in the slide.
   //
   // easing {Boolean} true|undefined to bounce back slowly.
   restoreSlide: function(easing) {
@@ -642,7 +641,7 @@ var LockScreen = {
       this.handleIconClick('left' === this._slidingToward ?
         this.leftIcon : this.rightIcon);
     }
-    this.darkIcon();
+    this.darkIcons();
     this._slideCount = 0;
     this._sliding = false;
   },

diff --git a/apps/system/style/lockscreen/lockscreen.css b/apps/system/style/lockscreen/lockscreen.css
@@ -237,7 +237,7 @@
 }
 
 .lockscreen-icon-area.dark .lockscreen-icon{
-  opacity: 0.75;
+  opacity: 0.65;
 }
 
 /* Some icons in new design still need border */