Permalink
Browse files

feature: Merged latest master into Styleguide

  • Loading branch information...
MikeMitterer committed Jul 27, 2015
1 parent b26c7da commit b28ea03fc5f7363e257ee6a6da0c5a96c512847c
@@ -31,4 +31,8 @@
footer {
margin-bottom: 24px;
}
h1 {
color: white !important;
}
}
@@ -99,7 +99,19 @@ <h2>Event card</h2>
.demo-card-event > .mdl-card__actions {
border-color: rgba(255, 255, 255, 0.2);
}
.demo-card-event > .mdl-card__title {
align-items: flex-start;
}
.demo-card-event > .mdl-card__title > h4 {
margin-top: 0;
}
.demo-card-event > .mdl-card__actions {
display: flex;
box-sizing:border-box;
align-items: center;
}
.demo-card-event > .mdl-card__title,
.demo-card-event > .mdl-card__actions,
.demo-card-event > .mdl-card__actions > .mdl-button {
color: #fff;
}
@@ -116,6 +128,8 @@ <h4 class="mdl-color-text--white">
<a class="mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect">
Add to Calendar
</a>
<div class="mdl-layout-spacer"></div>
<i class="material-icons">event</i>
</div>
</div>
<div class="mdl-card mdl-shadow--2dp">
@@ -3,79 +3,64 @@
Loading...
</div>
<div class="demo-preview-block">
<footer class="mdl-mega-footer">
<div class="mdl-mega-footer--top-section">
<div class="mdl-mega-footer--left-section">
</div>
<div class="mdl-mega-footer--right-section">
<a href="#">App Status Dashboard</a>
<a href="#">Terms of Service</a>
</div>
</div>
<div class="mdl-mega-footer--middle-section">
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading mdl-color-text--white">Learning &amp; Support</h1>
<ul class="mdl-mega-footer--link-list">
<li><a href="#">Resource Center</a></li>
<li><a href="#">Help Center</a></li>
<li><a href="#">Community</a></li>
<li><a href="#">Learn with Google</a></li>
<li><a href="#">Small Business Community</a></li>
<li><a href="#">Think Insights</a></li>
</ul>
</div>
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading mdl-color-text--white">Just for Developers</h1>
<ul class="mdl-mega-footer--link-list">
<li><a href="#">Google Developers</a></li>
<li><a href="#">AdWords API</a></li>
<li><a href="#">AdWords Scipts</a></li>
<li><a href="#">AdWords Remarketing Tag</a></li>
</ul>
</div>
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading mdl-color-text--white">Related Products</h1>
<ul class="mdl-mega-footer--link-list">
<li><a href="#">Analytics Standard</a></li>
<li><a href="#">Shopping Ads</a></li>
<li><a href="#">Trusted Store</a></li>
<li><a href="#">AdSense</a></li>
</ul>
</div>
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading mdl-color-text--white">More solutions from Google</h1>
<ul class="mdl-mega-footer--link-list">
<li><a href="#">Google for Advertising</a></li>
<li><a href="#">Google for Business</a></li>
</ul>
</div>
</div>
<div class="mdl-mega-footer--bottom-section">
<div class="mdl-logo mdl-typography--subhead">
<strong>Title</strong>
</div>
<ul class="mdl-mega-footer--link-list">
<li><a href="#">Help</a></li>
<li><a href="#">Privacy &amp; Terms</a></li>
</ul>
</div>
</footer>
<footer class="mdl-mini-footer">
<div class="mdl-mini-footer--left-section">
<div class="mdl-logo mdl-typography--subhead">
<strong>Title</strong>
</div>
<ul class="mdl-mini-footer--link-list">
<li><a href="#">Help</a></li>
<li><a href="#">Privacy &amp; Terms</a></li>
</ul>
</div>
<div class="mdl-mini-footer--right-section">
</div>
</footer>
<footer class="mdl-mega-footer">
<div class="mdl-mega-footer__middle-section">
<div class="mdl-mega-footer__drop-down-section">
<input class="mdl-mega-footer__heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer__heading">Features</h1>
<ul class="mdl-mega-footer__link-list">
<li><a href="#">About</a></li>
<li><a href="#">Terms</a></li>
<li><a href="#">Partners</a></li>
<li><a href="#">Updates</a></li>
</ul>
</div>
<div class="mdl-mega-footer__drop-down-section">
<input class="mdl-mega-footer__heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer__heading">Details</h1>
<ul class="mdl-mega-footer__link-list">
<li><a href="#">Specs</a></li>
<li><a href="#">Tools</a></li>
<li><a href="#">Resources</a></li>
</ul>
</div>
<div class="mdl-mega-footer__drop-down-section">
<input class="mdl-mega-footer__heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer__heading">Technology</h1>
<ul class="mdl-mega-footer__link-list">
<li><a href="#">How it works</a></li>
<li><a href="#">Patterns</a></li>
<li><a href="#">Usage</a></li>
<li><a href="#">Products</a></li>
<li><a href="#">Contracts</a></li>
</ul>
</div>
<div class="mdl-mega-footer__drop-down-section">
<input class="mdl-mega-footer__heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer__heading">FAQ</h1>
<ul class="mdl-mega-footer__link-list">
<li><a href="#">Questions</a></li>
<li><a href="#">Answers</a></li>
<li><a href="#">Contact us</a></li>
</ul>
</div>
</div>
<div class="mdl-mega-footer__bottom-section">
<div class="mdl-logo">Title</div>
<ul class="mdl-mega-footer__link-list">
<li><a href="#">Help</a></li>
<li><a href="#">Privacy &amp; Terms</a></li>
</ul>
</div>
</footer>
<footer class="mdl-mini-footer">
<div class="mdl-mini-footer__left-section">
<div class="mdl-logo">Title</div>
<ul class="mdl-mini-footer__link-list">
<li><a href="#">Help</a></li>
<li><a href="#">Privacy &amp; Terms</a></li>
</ul>
</div>
</footer>
</div>
</section>
@@ -111,12 +111,12 @@ <h2>Fixed header and drawer</h2>
<div class="demo-layout fixed-header-drawer-container">
<div class="demo-layout">
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-drawer
mdl-layout--fixed-header">
mdl-layout--fixed-header">
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<div class="mdl-layout-spacer"></div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--expandable
mdl-textfield--floating-label mdl-textfield--align-right">
mdl-textfield--floating-label mdl-textfield--align-right">
<label class="mdl-button mdl-js-button mdl-button--icon"
for="fixed-header-drawer-exp">
<i class="material-icons">search</i>
@@ -138,7 +138,6 @@ <h2>Fixed header and drawer</h2>
</nav>
</div>
<main class="mdl-layout__content">
<div class="page-content"></div>
</main>
</div>
</div>
@@ -95,7 +95,19 @@
.demo-card-event &gt; .mdl-card__actions {
border-color: rgba(255, 255, 255, 0.2);
}
.demo-card-event &gt; .mdl-card__title {
align-items: flex-start;
}
.demo-card-event &gt; .mdl-card__title &gt; h4 {
margin-top: 0;
}
.demo-card-event &gt; .mdl-card__actions {
display: flex;
box-sizing:border-box;
align-items: center;
}
.demo-card-event &gt; .mdl-card__title,
.demo-card-event &gt; .mdl-card__actions,
.demo-card-event &gt; .mdl-card__actions &gt; .mdl-button {
color: #fff;
}
@@ -112,6 +124,8 @@
&lt;a class=&quot;mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect&quot;&gt;
Add to Calendar
&lt;&#47;a&gt;
&lt;div class=&quot;mdl-layout-spacer&quot;&gt;&lt;&#47;div&gt;
&lt;i class=&quot;material-icons&quot;&gt;event&lt;&#47;i&gt;
&lt;&#47;div&gt;
&lt;&#47;div&gt;
&lt;div class=&quot;mdl-card mdl-shadow--2dp&quot;&gt;
@@ -108,8 +108,8 @@ <h2 id="configuration-options">Configuration options</h2>
<td align="left">Used on the &quot;inner&quot; divs</td>
</tr>
<tr class="odd">
<td align="left"><code>mdl-shadow--2dp through mdl-shadow--8dp</code></td>
<td align="left">Assigns variable shadow depths (1-5) to card</td>
<td align="left"><code>mdl-shadow--2dp through mdl-shadow--16dp</code></td>
<td align="left">Assigns variable shadow depths (2, 3, 4, 6, 8, or 16) to card</td>
<td align="left">Optional, goes on &quot;outer&quot; div; if omitted, no shadow is present</td>
</tr>
<tr class="even">
Oops, something went wrong.

0 comments on commit b28ea03

Please sign in to comment.