Permalink
Browse files

feature: Merged MDL/JS-Master CW 29

  • Loading branch information...
MikeMitterer committed Jul 20, 2015
1 parent 8b5a1d7 commit 38ee76186de3bcff6c0dd9f7f6963e398a2f5e57
Showing with 4,033 additions and 3,905 deletions.
  1. +10 −10 example/template_blog/web/entry.html
  2. +4 −3 example/template_blog/web/index.html
  3. +10 −10 lib/_templates/blog/web/entry.html
  4. +4 −3 lib/_templates/blog/web/index.html
  5. +3 −2 lib/assets/styles/button/README.md
  6. +1 −1 lib/assets/styles/checkbox/README.md
  7. +100 −100 lib/assets/styles/footer/README.md
  8. +67 −31 lib/assets/styles/footer/_mega_footer.orig.scss
  9. +8 −4 lib/assets/styles/footer/_mini_footer.orig.scss
  10. +1 −1 lib/assets/styles/grid/README.md
  11. +1 −1 lib/assets/styles/layout/_layout.orig.scss
  12. +42 −42 lib/assets/styles/material.css
  13. +1 −1 lib/assets/styles/material.min.css
  14. +1,680 −1,689 lib/assets/styles/palette/_palette.orig.scss
  15. +1,674 −1,671 lib/assets/styles/palette/_palette.scss
  16. +1 −1 lib/assets/styles/radio/README.md
  17. +1 −1 lib/assets/styles/switch/README.md
  18. +93 −83 lib/assets/styles/typography/_typography.orig.scss
  19. +3 −0 lib/assets/styles/variables/_functions.orig.scss
  20. +1 −0 lib/assets/styles/variables/_functions.scss
  21. +20 −4 lib/assets/styles/variables/_variables.orig.scss
  22. +19 −3 lib/assets/styles/variables/_variables.scss
  23. +21 −8 lib/src/core/MdlComponentHandler.dart
  24. +1 −1 tool/demobase/badge/snippets/badge-on-icon-icon.html
  25. +1 −1 tool/demobase/badge/snippets/badge-on-icon-text.html
  26. +229 −229 tool/demobase/material.css
  27. +1 −1 tool/demobase/material.min.css
  28. +5 −0 tool/grinder/MergeMaster.dart
  29. +2 −1 tool/jsbase/checkbox.js
  30. +2 −1 tool/portbase/checkbox.js.dart
  31. +27 −2 tool/portbase/mdlComponentHandler.js.dart
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License
-->
<html lang="">
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -42,13 +42,11 @@
<link rel="canonical" href="http://www.example.com/">
-->
<link href='//fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet">
<link rel="stylesheet" href="material.min.css">
<link rel="stylesheet" href="../spacing.css">
<link rel="stylesheet" href="styles.css">
<style>
<link href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="material.css">
<link rel="stylesheet" href="styles.css">
<style>
#view-source {
position: fixed;
display: block;
@@ -185,7 +183,9 @@ <h3>On the road again</h3>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
<a href="https://github.com/google/material-design-lite/blob/master/templates/blog/" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<script src="../../material.min.js"></script>
<a href="https://github.com/MikeMitterer/dart-material-design-lite/tree/master/example/template_blog" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<script type="application/dart" src="main.dart"></script>
<script data-pub-inline src="packages/browser/dart.js"></script>
</body>
</html>
@@ -163,9 +163,10 @@ <h3><a href="entry.html">Shopping</a></h3>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
<a href="https://github.com/MikeMitterer/dart-material-design-lite/tree/master/example/template_blog" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<a href="https://github.com/MikeMitterer/dart-material-design-lite/tree/master/example/template_blog" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<script type="application/dart" src="main.dart"></script>
<script data-pub-inline src="packages/browser/dart.js"></script>
<script type="application/dart" src="main.dart"></script>
<script data-pub-inline src="packages/browser/dart.js"></script>
</body>
</html>
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License
-->
<html lang="">
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -42,13 +42,11 @@
<link rel="canonical" href="http://www.example.com/">
-->
<link href='//fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet">
<link rel="stylesheet" href="material.min.css">
<link rel="stylesheet" href="../spacing.css">
<link rel="stylesheet" href="styles.css">
<style>
<link href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="material.css">
<link rel="stylesheet" href="styles.css">
<style>
#view-source {
position: fixed;
display: block;
@@ -185,7 +183,9 @@ <h3>On the road again</h3>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
<a href="https://github.com/google/material-design-lite/blob/master/templates/blog/" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<script src="../../material.min.js"></script>
<a href="https://github.com/MikeMitterer/dart-material-design-lite/tree/master/example/template_blog" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<script type="application/dart" src="main.dart"></script>
<script data-pub-inline src="packages/browser/dart.js"></script>
</body>
</html>
@@ -163,9 +163,10 @@ <h3><a href="entry.html">Shopping</a></h3>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
<a href="https://github.com/MikeMitterer/dart-material-design-lite/tree/master/example/template_blog" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<a href="https://github.com/MikeMitterer/dart-material-design-lite/tree/master/example/template_blog" target="_blank" id="view-source" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-color--accent mdl-color-text--accent-contrast">View Source</a>
<script type="application/dart" src="main.dart"></script>
<script data-pub-inline src="packages/browser/dart.js"></script>
<script type="application/dart" src="main.dart"></script>
<script data-pub-inline src="packages/browser/dart.js"></script>
</body>
</html>
@@ -32,9 +32,9 @@ A button with the "fab" effect.
<button class="mdl-button mdl-js-button mdl-button--fab">OK</button>
```
A button with the "icon", "raised" and "colored" effects.
A button with the "icon" and "colored" effects.
```html
<button class="mdl-button mdl-js-button mdl-button--icon mdl-button--colored mdl-button--raised">?</button>
<button class="mdl-button mdl-js-button mdl-button--icon mdl-button--colored">?</button>
```
@@ -51,6 +51,7 @@ The MDL CSS classes apply various predefined visual and behavioral enhancements
| `mdl-button--mini-fab` | Applies *mini-fab* (small fab circular) display effect | Mutually exclusive with *raised*, *fab*, and *icon* |
| `mdl-button--icon` | Applies *icon* (small plain circular) display effect | Mutually exclusive with *raised*, *fab*, and *mini-fab* |
| `mdl-button--colored` | Applies *colored* display effect | Colors are defined in `material.min.css` |
| `mdl-button--primary` | Applies *primary* color display effect | Colors are defined in `material.min.css` |
| `mdl-button--accent` | Applies *accent* color display effect | Colors are defined in `material.min.css` |
| `mdl-js-ripple-effect` | Applies *ripple* click effect | May be used in combination with any other classes |
@@ -1,7 +1,7 @@
##Introduction
The Material Design Lite (MDL) **checkbox** component is an enhanced version of the standard HTML `<input type="checkbox">` element. A checkbox consists of a small square and, typically, text that clearly communicates a binary condition that will be set or unset when the user clicks or touches it. Checkboxes typically, but not necessarily, appear in groups, and can be selected and deselected individually. The MDL checkbox component allows you to add display and click effects.
Checkboxes are a common feature of most user interfaces, regardless of a site's content or function. Their design and use is therefore an important factor in the overall user experience. See the checkbox component's [Material Design specifications page](http://www.google.com/design/spec/components/switches.html) for details.
Checkboxes are a common feature of most user interfaces, regardless of a site's content or function. Their design and use is therefore an important factor in the overall user experience. See the checkbox component's [Material Design specifications page](https://www.google.com/design/spec/components/selection-controls.html#selection-controls-checkbox) for details.
The enhanced checkbox component has a more vivid visual look than a standard checkbox, and may be initially or programmatically *disabled*.
Oops, something went wrong.

0 comments on commit 38ee761

Please sign in to comment.