google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implementing reviews in #650 and #657

master
Sérgio Gomes 2015-07-03 16:01:47 +01:00 committed by Addy Osmani
parent 821066fe33
commit 4507b9bc13
13 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_variables.scss
View File

@ -162,6 +162,7 @@ $layout-nav-color: unquote("rgb(#{$palette-grey-300})") !default;
$layout-drawer-bg-color: unquote("rgb(#{$palette-grey-50})") !default;
$layout-drawer-border-color: unquote("rgb(#{$palette-grey-300})") !default;
$layout-text-color: unquote("rgb(#{$palette-grey-800})") !default;
$layout-drawer-navigation-color: #757575 !default;
$layout-drawer-navigation-link-active-background: unquote("rgb(#{$color-light-contrast})") !default;
$layout-drawer-naviagtion-link-active-color: unquote("rgb(#{$color-primary})") !default;
@ -355,7 +356,7 @@ $layout-desktop-header-height: $layout-header-desktop-row-height;
$layout-header-desktop-baseline: 80px;
$layout-header-mobile-baseline: 72px;
$layout-header-mobile-indent: 16px;
$layout-header-desktop-indent: 24px;
$layout-header-desktop-indent: 40px;
$layout-tab-bar-height: 48px;
$layout-tab-mobile-padding: 12px;
@ -377,7 +378,8 @@ $icon-toggle-ripple-size: 36px !default;
* Sizes
*
*************/
$padding: 16px !default;
$footer-min-padding: 16px !default;
$footer-padding-sides: 40px !default;
$footer-heading-font-size: 14px !default;
$footer-heading-line-height: (1.7 * $footer-heading-font-size) !default;
$footer-btn-size: 36px !default;

32
src/footer/_mega_footer.scss
View File

@ -18,7 +18,7 @@
@import "../mixins";
.mdl-mega-footer {
padding: $padding;
padding: $footer-min-padding $footer-padding-sides;
color: $footer-color;
background-color: $footer-bg-color;
@ -34,17 +34,17 @@
}
.mdl-mega-footer--left-section {
margin-bottom: $padding;
margin-bottom: $footer-min-padding;
}
.mdl-mega-footer--right-section {
margin-bottom: $padding;
margin-bottom: $footer-min-padding;
}
.mdl-mega-footer--right-section a {
display: block;
margin-bottom: $padding;
margin-bottom: $footer-min-padding;
color: inherit;
text-decoration: none;
@ -62,7 +62,7 @@
.mdl-mega-footer--right-section a {
display: inline-block;
margin-left: $padding;
margin-left: $footer-min-padding;
line-height: $footer-btn-size;
vertical-align: middle;
@ -136,11 +136,11 @@
.mdl-mega-footer--heading-checkbox {
position: absolute;
width: 100%;
height: $footer-heading-line-height + ($padding * 2);
height: $footer-heading-line-height + ($footer-min-padding * 2);
padding: ($padding * 2);
padding: ($footer-min-padding * 2);
margin: 0;
margin-top: -$padding;
margin-top: -$footer-min-padding;
cursor: pointer;
@ -168,8 +168,8 @@
position: relative;
width: 100%;
padding-right: $footer-heading-line-height + $padding;
margin-bottom: $padding;
padding-right: $footer-heading-line-height + $footer-min-padding;
margin-bottom: $footer-min-padding;
box-sizing:border-box;
@ -206,7 +206,7 @@
margin: 0;
padding: 0;
margin-bottom: $padding * 2;
margin-bottom: $footer-min-padding * 2;
&:after {
clear: both;
display: block;
@ -245,20 +245,20 @@
}
.mdl-mega-footer--bottom-section {
padding-top: $padding;
margin-bottom: $padding;
padding-top: $footer-min-padding;
margin-bottom: $footer-min-padding;
}
.mdl-logo {
line-height: 20px;
margin-bottom: $padding;
margin-bottom: $footer-min-padding;
}
.mdl-mega-footer--bottom-section .mdl-mega-footer--link-list li {
float: left;
margin-bottom: 0;
margin-right: $padding;
margin-right: $footer-min-padding;
}
@ -268,6 +268,6 @@
float: left;
margin-bottom: 0;
margin-right: $padding;
margin-right: $footer-min-padding;
}
}

1
src/grid/snippets/grid-demo.html
View File

@ -12,7 +12,6 @@
}
.demo-grid-ruler.demo-grid-ruler .mdl-cell {
height: 50px;
overflow: hidden;
}
</style>

15
src/layout/_layout.scss
View File

@ -28,8 +28,8 @@
.mdl-navigation__link {
color: $layout-text-color;
text-decoration: none;
font-weight: 700;
font-size: 14px;
font-weight: 500;
font-size: 13px;
margin: 0;
}
@ -66,6 +66,7 @@
position: relative;
@include typo-title();
font-weight: 400;
box-sizing: border-box;
}
@ -130,12 +131,14 @@
& .mdl-navigation {
flex-direction: column;
align-items: stretch;
padding-top: 16px;
& .mdl-navigation__link {
display: block;
flex-shrink: 0;
padding: 16px $layout-header-desktop-indent;
margin: 0;
color: $layout-drawer-navigation-color;
@media screen and (max-width: $layout-screen-size-threshold) {
padding: 16px $layout-header-mobile-indent;
@ -178,7 +181,7 @@
font-size: 26px;
line-height: $layout-drawer-button-desktop-size + 2;
font-family: Helvetica, Arial, sans-serif;
margin: 8px 12px;
margin: 10px 12px;
top: 0;
left: 0;
color: $layout-header-text-color;
@ -349,7 +352,7 @@
display: block;
color: $layout-header-text-color;
line-height: $layout-header-desktop-row-height;
padding: 0 $layout-header-desktop-indent;
padding: 0 24px;
@media screen and (max-width: $layout-screen-size-threshold) {
line-height: $layout-header-mobile-row-height;
@ -555,6 +558,10 @@
top: 0;
z-index: 1;
overflow: hidden;
& .mdl-ripple {
background-color: $layout-header-text-color;
}
}
}

1
src/layout/snippets/fixed-drawer-demo.html
View File

@ -7,6 +7,7 @@
}
.fixed-drawer-container .page-content {
height: 600px;
background: white;
}
</style>

1
src/layout/snippets/fixed-header-demo.html
View File

@ -7,6 +7,7 @@
}
.fixed-header-container .page-content {
height: 600px;
background: white;
}
</style>

1
src/layout/snippets/fixed-header-drawer-demo.html
View File

@ -7,6 +7,7 @@
}
.fixed-header-drawer-container .page-content {
height: 600px;
background: white;
}
</style>

1
src/layout/snippets/fixed-tabs-demo.html
View File

@ -7,6 +7,7 @@
}
.fixed-tabs-container .page-content {
height: 600px;
background: white;
}
</style>

1
src/layout/snippets/scrollable-tabs-demo.html
View File

@ -7,6 +7,7 @@
}
.scrollable-tabs-container .page-content {
height: 600px;
background: white;
}
</style>

1
src/layout/snippets/scrolling-header-demo.html
View File

@ -7,6 +7,7 @@
}
.scrolling-header-container .page-content {
height: 600px;
background: white;
}
</style>

1
src/layout/snippets/waterfall-header-demo.html
View File

@ -7,6 +7,7 @@
}
.waterfall-header-container .page-content {
height: 600px;
background: white;
}
</style>

7
src/layout/snippets/waterfall-header.html
View File

@ -1,4 +1,9 @@
<!-- Uses a header that contracts as the page scrolls down. -->
<style>
.waterfall-demo-header-nav .mdl-navigation__link:last-of-type {
padding-right: 0;
}
</style>
<div class="mdl-layout mdl-js-layout mdl-layout--overlay-drawer-button">
<header class="mdl-layout__header mdl-layout__header--waterfall">
<!-- Top row, always visible -->
@ -22,7 +27,7 @@
<div class="mdl-layout__header-row">
<div class="mdl-layout-spacer"></div>
<!-- Navigation -->
<nav class="mdl-navigation">
<nav class="waterfall-demo-header-nav mdl-navigation">
<a class="mdl-navigation__link" href="">Link</a>
<a class="mdl-navigation__link" href="">Link</a>
<a class="mdl-navigation__link" href="">Link</a>

7
templates/android-dot-com/styles.css
View File

@ -93,6 +93,8 @@ a img{
.android-header .mdl-navigation__link {
color: #757575;
font-weight: 700;
font-size: 14px;
}
.android-navigation-container {
@ -150,11 +152,12 @@ a img{
margin: 8px 0;
}
.android-drawer .mdl-navigation__link {
.android-drawer .mdl-navigation__link.mdl-navigation__link {
font-size: 14px;
color: #757575;
}
.android-drawer span.mdl-navigation__link {
.android-drawer span.mdl-navigation__link.mdl-navigation__link {
color: #8bc34a;
}