Merge lp:~daker/ubuntu-html5-theme/fix.1224188 into lp:~ubuntu-html5-theme-devs/ubuntu-html5-theme/ambiance

[Adnane Belmadiaf]

Fixed the Switchs CSS to match the QML theme

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file '0.1/ambiance/css/toggles.css'
--- 0.1/ambiance/css/toggles.css	2013-07-17 15:27:43 +0000
+++ 0.1/ambiance/css/toggles.css	2013-09-11 23:03:05 +0000
@@ -5,18 +5,18 @@
  * This file is part of ubuntu-html5-theme.
  *
  * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 3 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 3 of the
  * License, or
  * (at your option) any later version.
- 
+
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- 
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this program. If not, see 
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
 
@@ -50,25 +50,28 @@
     border-radius: 6px;
     -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3);
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3);
-    background: rgba(187, 187, 187, 0.4);
-    border-bottom: 1px solid #f5f5f5;
-    -webkit-transition: background-color 0.1s ease;
-    transition: background-color 0.1s ease;
+    background: rgba(0, 0, 0, 0.4);
+    background-position-y: 30px;
+    -webkit-transition: background-image 0.3s ease-in-out, background-color 0.3s ease-in-out, background-position 0.3s ease-in-out;
+    transition: background-image 0.3s ease-in-out, background-color 0.3s ease-in-out, background-position 0.3s ease-in-out;
 }
 
 label:not([for]) input[type="checkbox"]:checked + span {
-    background: #dd4814 url(../img/[e-mail]) no-repeat 0.5rem 0.5rem;
-    background-size: 53% 53%;
+    background: #dd4814 url(../img/[e-mail]) no-repeat 0.3rem 0.3rem;
+    background-size: 75% 75%;
+    background-position-y: 5px;
+    -webkit-transition: background-image 0.3s ease-in-out, background-color 0.3s ease-in-out, background-position 0.3s ease-in-out;
+    transition: background-image 0.3s ease-in-out, background-color 0.3s ease-in-out, background-position 0.3s ease-in-out;
 }
 
 
 input[type="checkbox"]:disabled + span {
-    background: rgba(192, 192, 192, 0.5)!important;
+    background: rgba(0, 0, 0, 0.25)!important;
 }
 
 input[type="checkbox"]:disabled:checked + span {
-    background: rgba(221, 72, 20, 0.5) url(../img/[e-mail]) no-repeat 0.5rem 0.5rem!important;
-    background-size: 53% 53%!important;
+    background: rgba(221, 72, 20, 0.5) url(../img/[e-mail]) no-repeat 0.3rem 0.3rem!important;
+    background-size: 75% 75%!important;
 }
 
 label input[type="checkbox"][data-type="switch"] + span.toggle {
@@ -80,19 +83,20 @@
     height: 2.2rem;
     pointer-events: none;
     overflow: hidden;
-    background: transparent;
+    background: rgba(136, 136, 136, 0.3);
 }
 
 label input[type="checkbox"][data-type="switch"] + span.toggle > span.toggle-bg {
-    background: transparent url(../img/Checkbox.png) no-repeat 0.5rem 0.6rem;
-    background-size: 80% 50%;
+    background: transparent url(../img/unCheckbox.png) no-repeat 0.4rem 0.35rem;
+    background-size: 90% 75%;
     position: absolute;
     top: 0;
     left: 0;
     z-index: 10;
     width: 4.5rem;
     height: 2.1rem;
-
+    -webkit-transition: background-image 0.3s ease-in-out;
+    transition: background-image 0.3s ease-in-out;
 }
 
 label input[type="checkbox"][data-type="switch"] + span.toggle > span.toggle-handle {
@@ -100,21 +104,25 @@
     top: 2px;
     left: 2px;
     z-index: 2;
-    width: 1.9rem;
+    width: 2rem;
     height: 2rem;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     border-radius: 6px;
     -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3);
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3);
-    background: rgba(187, 187, 187, 0.7);
-    -webkit-transition: background 0.1s ease, -webkit-transform 0.1s ease-in-out;
-    transition: background 0.1s ease, transform 0.1s ease-in-out;
-    border-bottom: 1px solid #f5f5f5;
+    background: rgba(0, 0, 0, 0.4);
+    -webkit-transition: background 0.3s ease-in-out, -webkit-transform 0.3s ease-in-out;
+    transition: background 0.3s ease-in-out, transform 0.3s ease-in-out;
 }
 
 label input[type="checkbox"][data-type="switch"]:checked + span.toggle {
-    background: transparent;
+    background: rgba(136, 136, 136, 0.3);
+}
+
+label input[type="checkbox"][data-type="switch"]:checked + span.toggle > span.toggle-bg {
+    background: transparent url(../img/Checkbox.png) no-repeat 0.4rem 0.35rem;
+    background-size: 90% 75%;
 }
 
 label input[type="checkbox"][data-type="switch"]:checked + span.toggle > span.toggle-handle {
@@ -124,7 +132,7 @@
 }
 
 label input[data-type="switch"]:disabled + span.toggle {
-    background: transparent!important;
+    background: rgba(136, 136, 136, 0.3)!important;
 }
 
 label input[data-type="switch"]:disabled + span.toggle > span.toggle-handle {

=== removed file '0.1/ambiance/img/[e-mail]'
Binary files 0.1/ambiance/img/[e-mail]	2013-06-08 14:24:51 +0000 and 0.1/ambiance/img/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file '0.1/ambiance/img/Checkbox.png'
Binary files 0.1/ambiance/img/Checkbox.png	2013-06-11 22:44:50 +0000 and 0.1/ambiance/img/Checkbox.png	2013-09-11 23:03:05 +0000 differ
=== removed file '0.1/ambiance/img/[e-mail]'
Binary files 0.1/ambiance/img/[e-mail]	2013-06-08 14:24:51 +0000 and 0.1/ambiance/img/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== added file '0.1/ambiance/img/[e-mail]'
Binary files 0.1/ambiance/img/[e-mail]	1970-01-01 00:00:00 +0000 and 0.1/ambiance/img/[e-mail]	2013-09-11 23:03:05 +0000 differ
=== added file '0.1/ambiance/img/[e-mail]'
Binary files 0.1/ambiance/img/[e-mail]	1970-01-01 00:00:00 +0000 and 0.1/ambiance/img/[e-mail]	2013-09-11 23:03:05 +0000 differ
=== added file '0.1/ambiance/img/unCheckbox.png'
Binary files 0.1/ambiance/img/unCheckbox.png	1970-01-01 00:00:00 +0000 and 0.1/ambiance/img/unCheckbox.png	2013-09-11 23:03:05 +0000 differ