Merge pull request #3 from FezVrasta/master

Update
This commit is contained in:
jcvb 2015-04-13 12:41:33 -05:00
commit c5cff34fc6
5 changed files with 24 additions and 13 deletions

6
dist/test.html vendored
View File

@ -4,9 +4,9 @@
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet"> <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
<!-- Include roboto.css to use the Roboto web font, material.css to include the theme and ripples.css to style the ripple effect --> <!-- Include roboto.css to use the Roboto web font, material.css to include the theme and ripples.css to style the ripple effect -->
<link href="dist/css/roboto.min.css" rel="stylesheet"> <link href="css/roboto.min.css" rel="stylesheet">
<link href="dist/css/material.min.css" rel="stylesheet"> <link href="css/material.min.css" rel="stylesheet">
<link href="dist/css/ripples.min.css" rel="stylesheet"> <link href="css/ripples.min.css" rel="stylesheet">
</head> </head>

View File

@ -18,7 +18,7 @@
// Modal body // Modal body
// Where all modal content resides (sibling of .modal-header and .modal-footer) // Where all modal content resides (sibling of .modal-header and .modal-footer)
.modal-body { .modal-body {
padding-top: 0px; padding-top: 24px;
padding-right: 24px; padding-right: 24px;
padding-bottom: 16px; padding-bottom: 16px;
padding-left: 24px; padding-left: 24px;

View File

@ -1,7 +1,7 @@
.navbar { .navbar {
background-color: @primary; background-color: @primary;
border: 0; border: @zero;
border-radius: 0; border-radius: @zero;
.navbar-brand { .navbar-brand {
position: relative; position: relative;
@ -54,7 +54,7 @@
// Darken the responsive nav toggle // Darken the responsive nav toggle
.navbar-toggle { .navbar-toggle {
border: 0; border: @zero;
&:hover, &:hover,
&:focus { &:focus {
background-color: transparent; background-color: transparent;
@ -96,7 +96,7 @@
// Dropdowns get custom display // Dropdowns get custom display
.open .dropdown-menu { .open .dropdown-menu {
> .dropdown-header { > .dropdown-header {
border: 0; border: @zero;
color: inherit; color: inherit;
} }
.divider { .divider {
@ -174,10 +174,14 @@
color: @text-color; color: @text-color;
} }
.dropdown-menu { .dropdown-menu {
border-radius: @dropdown-radius;
li > a { li > a {
font-size: @dropdown-font-size;
padding: 13px 16px;
&:hover, &:hover,
&:focus { &:focus {
color: @material-color; color: @material-color;
background-color: @lightgrey;
} }
} }
.active > a { .active > a {

View File

@ -1,3 +1,6 @@
// Material Global vars
@zero: 0;
// material icons path // material icons path
@material-font-path: "../fonts"; @material-font-path: "../fonts";
@ -95,3 +98,7 @@
// Inputs // Inputs
@input-placeholder-color: #BDBDBD; @input-placeholder-color: #BDBDBD;
@floating-label-size-ratio: 70 / 100; @floating-label-size-ratio: 70 / 100;
// Dropdown Menu
@dropdown-radius: 2px;
@dropdown-font-size: 16px;

View File

@ -1,10 +1,10 @@
@font-face { @font-face {
font-family: 'Material-Design-Icons'; font-family: 'Material-Design-Icons';
src:url('#{material-font-path}/Material-Design-Icons.eot?3ocs8m'); src:url('#{$material-font-path}/Material-Design-Icons.eot?3ocs8m');
src:url('#{material-font-path}/Material-Design-Icons.eot?#iefix3ocs8m') format('embedded-opentype'), 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.woff?3ocs8m') format('woff'),
url('#{material-font-path}/Material-Design-Icons.ttf?3ocs8m') format('truetype'), 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'); url('#{$material-font-path}/Material-Design-Icons.svg?3ocs8m#Material-Design-Icons') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }