From 4e0795e936aa47843370bc9fdab6e07fa744cffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C6=B0=C6=A1ng=20C=C6=B0=E1=BB=9Dng?= Date: Wed, 18 Mar 2015 08:47:02 +0700 Subject: [PATCH 1/5] Update test.html --- dist/test.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/test.html b/dist/test.html index 2af68a7c..d4b86ddc 100644 --- a/dist/test.html +++ b/dist/test.html @@ -4,9 +4,9 @@ - - - + + + From 537f88fa2fb6649865ed38fee942846fd828c865 Mon Sep 17 00:00:00 2001 From: GradyD Date: Mon, 23 Mar 2015 23:25:48 -0400 Subject: [PATCH 2/5] Dropdown material styles --- less/_navbar.less | 12 ++++++++---- less/_variables.less | 7 +++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/less/_navbar.less b/less/_navbar.less index 8f76b2f7..3b3e5016 100644 --- a/less/_navbar.less +++ b/less/_navbar.less @@ -1,7 +1,7 @@ .navbar { background-color: @primary; - border: 0; - border-radius: 0; + border: @zero; + border-radius: @zero; .navbar-brand { position: relative; @@ -54,7 +54,7 @@ // Darken the responsive nav toggle .navbar-toggle { - border: 0; + border: @zero; &:hover, &:focus { background-color: transparent; @@ -96,7 +96,7 @@ // Dropdowns get custom display .open .dropdown-menu { > .dropdown-header { - border: 0; + border: @zero; color: inherit; } .divider { @@ -174,10 +174,14 @@ color: @text-color; } .dropdown-menu { + border-radius: @dropdown-radius; li > a { + font-size: @dropdown-font-size; + padding: 13px 16px; &:hover, &:focus { color: @material-color; + background-color: @lightgrey; } } .active > a { diff --git a/less/_variables.less b/less/_variables.less index 49c95074..cd113cdb 100644 --- a/less/_variables.less +++ b/less/_variables.less @@ -1,3 +1,6 @@ +// Material Global vars +@zero: 0; + // material icons path @material-font-path: "../fonts"; @@ -91,3 +94,7 @@ @checkbox-size: 20px; @checkbox-animation-ripple: 500ms; @checkbox-animation-check: 0.3s; + +// Dropdown Menu +@dropdown-radius: 2px; +@dropdown-font-size: 16px; From 5134d7d4843e4397b117f3cb31b118f91474ee5c Mon Sep 17 00:00:00 2001 From: GradyD Date: Mon, 23 Mar 2015 23:31:30 -0400 Subject: [PATCH 3/5] Adde vars for dropdown --- less/_variables.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/less/_variables.less b/less/_variables.less index 6487c972..9abf43ec 100644 --- a/less/_variables.less +++ b/less/_variables.less @@ -98,3 +98,7 @@ // Inputs @input-placeholder-color: #BDBDBD; @floating-label-size-ratio: 70 / 100; + +// Dropdown Menu +@dropdown-radius: 2px; +@dropdown-font-size: 16px; From 613f9e2c81386abdddb46f27fb330aca50928731 Mon Sep 17 00:00:00 2001 From: Romain Cherix Date: Wed, 8 Apr 2015 10:24:22 +0200 Subject: [PATCH 4/5] Fix padding issue for dialogs according Material design guide lines --- less/_dialogs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/_dialogs.less b/less/_dialogs.less index ac6b835e..2d2071b5 100644 --- a/less/_dialogs.less +++ b/less/_dialogs.less @@ -18,7 +18,7 @@ // Modal body // Where all modal content resides (sibling of .modal-header and .modal-footer) .modal-body { - padding-top: 0px; + padding-top: 24px; padding-right: 24px; padding-bottom: 16px; padding-left: 24px; From eaa45e58fcc858ac5c85a24756ab4f1f0ce460b2 Mon Sep 17 00:00:00 2001 From: Jonathan Ginn Date: Wed, 8 Apr 2015 20:07:07 +0100 Subject: [PATCH 5/5] Fix Sass material font path variable Signed-off-by: Jonathan Ginn --- sass/_icons-material-design.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sass/_icons-material-design.scss b/sass/_icons-material-design.scss index 68946046..f23a8bd9 100644 --- a/sass/_icons-material-design.scss +++ b/sass/_icons-material-design.scss @@ -1,10 +1,10 @@ @font-face { font-family: 'Material-Design-Icons'; - src:url('#{material-font-path}/Material-Design-Icons.eot?3ocs8m'); - src:url('#{material-font-path}/Material-Design-Icons.eot?#iefix3ocs8m') format('embedded-opentype'), - url('#{material-font-path}/Material-Design-Icons.woff?3ocs8m') format('woff'), - url('#{material-font-path}/Material-Design-Icons.ttf?3ocs8m') format('truetype'), - url('#{material-font-path}/Material-Design-Icons.svg?3ocs8m#Material-Design-Icons') format('svg'); + src:url('#{$material-font-path}/Material-Design-Icons.eot?3ocs8m'); + src:url('#{$material-font-path}/Material-Design-Icons.eot?#iefix3ocs8m') format('embedded-opentype'), + url('#{$material-font-path}/Material-Design-Icons.woff?3ocs8m') format('woff'), + url('#{$material-font-path}/Material-Design-Icons.ttf?3ocs8m') format('truetype'), + url('#{$material-font-path}/Material-Design-Icons.svg?3ocs8m#Material-Design-Icons') format('svg'); font-weight: normal; font-style: normal; }