Permalink
Browse files

feature: Merged latest Dart/JS master

  • Loading branch information...
MikeMitterer committed Aug 24, 2015
1 parent f5cce5d commit 7cf8ea4b9a0d8757cea336e8afe096ffb3bab42b
Showing with 866 additions and 820 deletions.
  1. +1 −1 example/mdl_textfield/.sitegen/html/_content/index.html
  2. +1 −1 example/mdl_textfield/web/index.html
  3. +1 −1 example/styleguide/.sitegen/html/_content/views/textfield.html
  4. +1 −1 example/styleguide/.sitegen/html/_partials/usage/textfield/html.html
  5. +2 −0 example/styleguide/web/assets/styles/_demo/_dialog.scss
  6. +1 −1 example/styleguide/web/views/textfield.html
  7. +1 −1 example/styleguide/web/views/usage/textfield.html
  8. BIN example/template_android-dot-com/web/images/android-logo-white.png
  9. BIN example/template_android-dot-com/web/images/android-logo.png
  10. BIN example/template_android-dot-com/web/images/andy.png
  11. BIN example/template_android-dot-com/web/images/auto-on.jpg
  12. BIN example/template_android-dot-com/web/images/devices.jpg
  13. BIN example/template_android-dot-com/web/images/more-from-1.png
  14. BIN example/template_android-dot-com/web/images/more-from-2.png
  15. BIN example/template_android-dot-com/web/images/more-from-3.png
  16. BIN example/template_android-dot-com/web/images/more-from-4.png
  17. BIN example/template_android-dot-com/web/images/nexus6-on.jpg
  18. BIN example/template_android-dot-com/web/images/nexus9-on.jpg
  19. BIN example/template_android-dot-com/web/images/slide01.jpg
  20. BIN example/template_android-dot-com/web/images/tv-on.jpg
  21. BIN example/template_android-dot-com/web/images/wear-black-on.png
  22. BIN example/template_android-dot-com/web/images/wear-silver-on.png
  23. BIN example/template_android-dot-com/web/images/wear.png
  24. +1 −1 example/template_android-dot-com/web/index.html
  25. +143 −143 example/template_blog/web/entry.html
  26. BIN example/template_blog/web/images/avatar.png
  27. BIN example/template_blog/web/images/bg.jpg
  28. BIN example/template_blog/web/images/co1.jpg
  29. BIN example/template_blog/web/images/co2.jpg
  30. BIN example/template_blog/web/images/coffee.jpg
  31. BIN example/template_blog/web/images/logo.png
  32. BIN example/template_blog/web/images/road.jpg
  33. BIN example/template_blog/web/images/road_big.jpg
  34. BIN example/template_blog/web/images/shopping.jpg
  35. +134 −134 example/template_blog/web/index.html
  36. BIN example/template_dashboard/web/images/dog.png
  37. BIN example/template_dashboard/web/images/user.jpg
  38. +171 −171 example/template_dashboard/web/index.html
  39. +215 −215 example/template_text-only/web/index.html
  40. BIN lib/_templates/android/web/images/android-logo-white.png
  41. BIN lib/_templates/android/web/images/android-logo.png
  42. BIN lib/_templates/android/web/images/andy.png
  43. BIN lib/_templates/android/web/images/auto-on.jpg
  44. BIN lib/_templates/android/web/images/devices.jpg
  45. BIN lib/_templates/android/web/images/more-from-1.png
  46. BIN lib/_templates/android/web/images/more-from-2.png
  47. BIN lib/_templates/android/web/images/more-from-3.png
  48. BIN lib/_templates/android/web/images/more-from-4.png
  49. BIN lib/_templates/android/web/images/nexus6-on.jpg
  50. BIN lib/_templates/android/web/images/nexus9-on.jpg
  51. BIN lib/_templates/android/web/images/slide01.jpg
  52. BIN lib/_templates/android/web/images/tv-on.jpg
  53. BIN lib/_templates/android/web/images/wear-black-on.png
  54. BIN lib/_templates/android/web/images/wear-silver-on.png
  55. BIN lib/_templates/android/web/images/wear.png
  56. BIN lib/_templates/blog/web/images/avatar.png
  57. BIN lib/_templates/blog/web/images/bg.jpg
  58. BIN lib/_templates/blog/web/images/co1.jpg
  59. BIN lib/_templates/blog/web/images/co2.jpg
  60. BIN lib/_templates/blog/web/images/coffee.jpg
  61. BIN lib/_templates/blog/web/images/logo.png
  62. BIN lib/_templates/blog/web/images/road.jpg
  63. BIN lib/_templates/blog/web/images/road_big.jpg
  64. BIN lib/_templates/blog/web/images/shopping.jpg
  65. BIN lib/_templates/dashboard/web/images/dog.png
  66. BIN lib/_templates/dashboard/web/images/user.jpg
  67. +5 −5 lib/assets/styles/badge/README.md
  68. +5 −5 lib/assets/styles/button/README.md
  69. +5 −5 lib/assets/styles/card/README.md
  70. +5 −5 lib/assets/styles/checkbox/README.md
  71. +5 −5 lib/assets/styles/data-table/README.md
  72. +3 −1 lib/assets/styles/data-table/_data-table.orig.scss
  73. +7 −7 lib/assets/styles/footer/README.md
  74. +5 −5 lib/assets/styles/grid/README.md
  75. +6 −0 lib/assets/styles/grid/_grid.orig.scss
  76. +5 −5 lib/assets/styles/icon-toggle/README.md
  77. +5 −5 lib/assets/styles/layout/README.md
  78. +13 −4 lib/assets/styles/material.css
  79. +1 −1 lib/assets/styles/material.min.css
  80. +5 −5 lib/assets/styles/menu/README.md
  81. +4 −1 lib/assets/styles/menu/_menu.orig.scss
  82. +5 −5 lib/assets/styles/progress/README.md
  83. +5 −5 lib/assets/styles/radio/README.md
  84. +5 −5 lib/assets/styles/shadow/README.md
  85. +7 −7 lib/assets/styles/slider/README.md
  86. +5 −5 lib/assets/styles/spinner/README.md
  87. +5 −5 lib/assets/styles/switch/README.md
  88. +5 −5 lib/assets/styles/tabs/README.md
  89. +0 −1 lib/assets/styles/tabs/_tabs.orig.scss
  90. +9 −9 lib/assets/styles/textfield/README.md
  91. +1 −0 lib/assets/styles/textfield/_textfield.orig.scss
  92. +5 −5 lib/assets/styles/tooltip/README.md
  93. +5 −5 lib/assets/styles/typography/README.md
  94. +18 −11 lib/src/components/MaterialLayout.dart
  95. +13 −4 tool/demobase/material.css
  96. +1 −1 tool/demobase/material.min.css
  97. +12 −8 tool/jsbase/layout.js
  98. +14 −10 tool/portbase/layout.js.dart
@@ -16,7 +16,7 @@
</div>
<div class="mdl-textfield mdl-js-textfield">
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hallo (value in disabled field)"/>
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hello (value in disabled field)"/>
<label class="mdl-textfield__label" for="sample3">I'm Disabled</label>
</div>
@@ -60,7 +60,7 @@
<span class="mdl-textfield__error">Input is not a number!</span>
</div>
<div class="mdl-textfield mdl-js-textfield">
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hallo (value in disabled field)"/>
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hello (value in disabled field)"/>
<label class="mdl-textfield__label" for="sample3">I'm Disabled</label>
</div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
@@ -14,7 +14,7 @@
<span class="mdl-textfield__error">Input is not a number!</span>
</div>
<div class="mdl-textfield mdl-js-textfield">
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hallo (value in disabled field)"/>
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hello (value in disabled field)"/>
<label class="mdl-textfield__label" for="sample3">I'm Disabled</label>
</div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
@@ -10,7 +10,7 @@
&lt;span class=&quot;mdl-textfield__error&quot;&gt;Input is not a number!&lt;&#47;span&gt;
&lt;&#47;div&gt;
&lt;div class=&quot;mdl-textfield mdl-js-textfield&quot;&gt;
&lt;input class=&quot;mdl-textfield__input&quot; type=&quot;text&quot; disabled id=&quot;sample3&quot; value=&quot;Hallo (value in disabled field)&quot;&#47;&gt;
&lt;input class=&quot;mdl-textfield__input&quot; type=&quot;text&quot; disabled id=&quot;sample3&quot; value=&quot;Hello (value in disabled field)&quot;&#47;&gt;
&lt;label class=&quot;mdl-textfield__label&quot; for=&quot;sample3&quot;&gt;I&#39;m Disabled&lt;&#47;label&gt;
&lt;&#47;div&gt;
&lt;div class=&quot;mdl-textfield mdl-js-textfield mdl-textfield--floating-label&quot;&gt;
@@ -40,6 +40,8 @@
}
}
// Defined outside of .demo-page--dialog, .demo-section--dialog because
// dialogs (dialog-container) will be added at the bottom of your HTML-page (just before </body>
.custom-dialog1 {
h5 {
background-color: #B3D38D;
@@ -14,7 +14,7 @@
<span class="mdl-textfield__error">Input is not a number!</span>
</div>
<div class="mdl-textfield mdl-js-textfield">
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hallo (value in disabled field)"/>
<input class="mdl-textfield__input" type="text" disabled id="sample3" value="Hello (value in disabled field)"/>
<label class="mdl-textfield__label" for="sample3">I'm Disabled</label>
</div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
@@ -47,7 +47,7 @@
&lt;span class=&quot;mdl-textfield__error&quot;&gt;Input is not a number!&lt;&#47;span&gt;
&lt;&#47;div&gt;
&lt;div class=&quot;mdl-textfield mdl-js-textfield&quot;&gt;
&lt;input class=&quot;mdl-textfield__input&quot; type=&quot;text&quot; disabled id=&quot;sample3&quot; value=&quot;Hallo (value in disabled field)&quot;&#47;&gt;
&lt;input class=&quot;mdl-textfield__input&quot; type=&quot;text&quot; disabled id=&quot;sample3&quot; value=&quot;Hello (value in disabled field)&quot;&#47;&gt;
&lt;label class=&quot;mdl-textfield__label&quot; for=&quot;sample3&quot;&gt;I&#39;m Disabled&lt;&#47;label&gt;
&lt;&#47;div&gt;
&lt;div class=&quot;mdl-textfield mdl-js-textfield mdl-textfield--floating-label&quot;&gt;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -28,7 +28,7 @@
<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 id="theme" rel="stylesheet" href="packages/mdl/assets/styles/material.min.css">
<link rel="stylesheet" href="styles.css">
<link rel="stylesheet" href="styles.css">
<style>
#view-source {
position: fixed;
Oops, something went wrong.

0 comments on commit 7cf8ea4

Please sign in to comment.