From 2ab4d8f7b89492154112f0dbb19d36d6fedb0e6e Mon Sep 17 00:00:00 2001
From: Josef Citrine <josefcitrine@googlemail.com>
Date: Mon, 11 Jul 2016 01:49:34 +0100
Subject: [PATCH] Dropdown and font updates

---
 resources/assets/styles/app.less              |  1 +
 .../styles/base/bootstrap/variables.less      |  2 +-
 .../assets/styles/components/components.less  | 29 +++++++++++++------
 resources/assets/styles/content.less          |  2 +-
 resources/assets/styles/layout.less           |  5 ++--
 resources/assets/styles/mixins.less           |  6 ++++
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/resources/assets/styles/app.less b/resources/assets/styles/app.less
index c741956b..3002873b 100644
--- a/resources/assets/styles/app.less
+++ b/resources/assets/styles/app.less
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+@import 'https://fonts.googleapis.com/css?family=Roboto:400,400i,700';
 @import 'base/bootstrap/bootstrap';
 @import 'base/font-awesome/font-awesome';
 @import 'variables';
diff --git a/resources/assets/styles/base/bootstrap/variables.less b/resources/assets/styles/base/bootstrap/variables.less
index 6da666a0..f37d52f2 100644
--- a/resources/assets/styles/base/bootstrap/variables.less
+++ b/resources/assets/styles/base/bootstrap/variables.less
@@ -42,7 +42,7 @@
 //
 //## Font, line-height, and color for body text, headings, and more.
 
-@font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-sans-serif:  "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
diff --git a/resources/assets/styles/components/components.less b/resources/assets/styles/components/components.less
index ea16f0c5..6fe8a426 100644
--- a/resources/assets/styles/components/components.less
+++ b/resources/assets/styles/components/components.less
@@ -41,6 +41,7 @@
     > .btn {
       float: left;
       display: block;
+      border-radius: 15px;
     }
 
     > .btn + .btn {
@@ -54,6 +55,11 @@
       > .btn {
         background: @pfm-purple;
         color: #fff;
+        border-radius: 0 15px 15px 0;
+      }
+
+      > .dropdown-toggle {
+        border-radius: 15px 0 0 15px;
       }
 
       > .btn + .btn {
@@ -70,13 +76,18 @@
       > .btn {
         background: @pfm-purple;
         color: #fff;
+        border-radius: 0 15px 15px 0;
+      }
+
+      > .dropdown-toggle {
+        border-radius: 15px 0 0 15px;
       }
 
       .dropdown-menu {
-        .box-shadow(none);
-
+        .material-shadow(2);
         margin: 0px;
-        border: 2px solid @pfm-purple;
+        border: 0;
+        border-radius: 2px;
 
         li.selected {
           a {
@@ -96,7 +107,7 @@
 
     > .btn {
       border: none;
-      background: #eee;
+      background: #e0e0e0;
       font-size: 8pt;
       padding: 5px 7px;
       text-shadow: none;
@@ -247,21 +258,21 @@ html .dropdown-menu {
     margin: 0px;
 
     > a {
-      padding: 6px 10px;
-      font-size: 8pt;
+      padding: 8px 10px;
+      font-size: 10pt;
     }
 
     > .dont-close {
       float: right;
       display: block;
-      width: 24px;
+      width: 30px;
       text-align: center;
-      padding: 3px 3px;
+      padding: 8px 6px;
       font-size: 10pt;
     }
 
     > .dont-close + a {
-      margin-right: 24px;
+      margin-right: 30px;
       clear: none;
     }
 
diff --git a/resources/assets/styles/content.less b/resources/assets/styles/content.less
index d7d2d92e..9c38692c 100644
--- a/resources/assets/styles/content.less
+++ b/resources/assets/styles/content.less
@@ -68,7 +68,7 @@
     .box-sizing(border-box);
     float: left;
     width: 25%;
-    padding: 5px;
+    padding: 0px;
     line-height: normal;
     .material-shadow(1);
     border-radius: 2px;
diff --git a/resources/assets/styles/layout.less b/resources/assets/styles/layout.less
index 9e284d6b..657349ca 100644
--- a/resources/assets/styles/layout.less
+++ b/resources/assets/styles/layout.less
@@ -23,7 +23,7 @@
 html body {
   height: 100%;
   background: #fff;
-  font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
   padding: 0px !important;
   overflow-x: hidden;
 }
@@ -200,8 +200,7 @@ header {
 
     > a {
       display: block;
-      padding: 10px 25px;
-      padding-right: 0px;
+      padding: 12px 0 12px 22px;
       overflow: hidden;
       color: fadeout(#fff, 20%);
 
diff --git a/resources/assets/styles/mixins.less b/resources/assets/styles/mixins.less
index e198a88f..746cbbc0 100644
--- a/resources/assets/styles/mixins.less
+++ b/resources/assets/styles/mixins.less
@@ -142,3 +142,9 @@
 .light-material-shadow(@size) when (@size = 2) {
   box-shadow: 0 3px 6px rgba(0, 0, 0, .08), 0 3px 6px rgba(0, 0, 0, .12);
 }
+
+.img-thumbnail() {
+  border: 0 !important;
+  padding: 0 !important;
+  .material-shadow(2);
+}