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

[Adnane Belmadiaf]

Fixed the toolbar to match the sdk

[lp:~daker/ubuntu-html5-theme/fix.1253444]

95. By Adnane Belmadiaf on 2013-11-22

Another CSS adjustement

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file '0.1/ambiance/css/toolbars.css'
--- 0.1/ambiance/css/toolbars.css	2013-07-17 15:27:43 +0000
+++ 0.1/ambiance/css/toolbars.css	2013-11-22 21:52:09 +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/>.
  */
 
@@ -26,26 +26,26 @@
 
 [data-role="footer"] {
     background: transparent url('../img/[e-mail]') repeat-x top left;
-    height: 70px;
+    height: 85px;
     width: 100%;
     position: fixed;
     z-index: 100;
     left: 0;
-    bottom: -50px;
+    bottom: -65px;
     -webkit-transition: -webkit-transform 0.1s ease-in-out;
     transition: transform 0.1s ease-in-out;
 }
 
 [data-role="footer"].revealed {
-    -webkit-transform: translate3d(0, -50px, 0);
-    transform: translate3d(0, -50px, 0);
+    -webkit-transform: translate3d(0, -65px, 0);
+    transform: translate3d(0, -65px, 0);
 }
 
 [data-role="footer"] nav {
     background: #fdfdfd;
     margin-top: 20px;
     display: block;
-    height: 40px;
+    height: 55px;
     padding-top: 10px;
 }
 
@@ -56,13 +56,17 @@
 [data-role="footer"] nav ul li,
 [data-role="footer"] nav ul li a {
     color: #7d767b;
-    font-size: 0.7rem;
+    font-size: 0.6rem;
     text-align: center;
-    width: 55px;
-    float: right;
+    width: 60px;
+    float: left;
     text-decoration: none;
 }
 
+[data-role="footer"] nav ul li {
+    padding-top: 4px;
+}
+
 [data-role="footer"] nav ul li img {
     width: 16px;
     height: 16px;
 
=== modified file '0.1/examples/widgets/Toolbar.html'
--- 0.1/examples/widgets/Toolbar.html	2013-07-17 15:27:43 +0000
+++ 0.1/examples/widgets/Toolbar.html	2013-11-22 21:52:09 +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/>.
 -->