Code

CSS-in-JS merge with master#326

Code

Merged

hai-cea merged 30 commits intomui:css-in-jsmui/material-ui:css-in-jsfrom mmrtnz:css-in-jsmmrtnz/material-ui:css-in-jsCopy head branch name to clipboardFeb 11, 2015

+1,794-4,912

Commits

Commits on Feb 4, 2015

• Merge branch 'switches-className' into font-icon-components

  mmrtnz

  committed
  040f6c4

  Copy full SHA for 040f6c4

Commits on Feb 6, 2015

• fix valueLink with multiline textarea

  nchaulet

  committed
  813d441

  Copy full SHA for 813d441

• Switched dependency for IconButtons from Icon to FontIcon.

  mmrtnz

  committed
  d607c6f

  Copy full SHA for d607c6f

• Merge pull request mui#311 from nchaulet/nc-fix-valuelinkwithmultilinetextfield

  Show description for 0eb0c4d
  

  Hai Nguyen

  committed
  0eb0c4d

  Copy full SHA for 0eb0c4d

Commits on Feb 7, 2015

• Added font-icon style sheet for docs. MenuItem now uses FontIcon instead of Icon. Components that use MenuItem have been updated.

  mmrtnz

  committed
  c22d65b

  Copy full SHA for c22d65b

Commits on Feb 8, 2015

• Fixes mui#296 - Multi-line TextField doesn't respect \n in defaultValue

  

  Hai Nguyen

  committed
  b4dc09a

  Copy full SHA for b4dc09a

Commits on Feb 9, 2015

• DropDownIcon uses FontIcon instead of Icon. Updated svg stylesheet, docs, and components using DropDownIcon

  mmrtnz

  committed
  27fbe76

  Copy full SHA for 27fbe76

• FloatingActionButtons now also use FontIcons.

  mmrtnz

  committed
  997582c

  Copy full SHA for 997582c

• Removed mui icons svgs and moved the material-ui-icons folder from src to docs.

  mmrtnz

  committed
  fb24efd

  Copy full SHA for fb24efd

• Added FontIcons page to docs.

  mmrtnz

  committed
  bed662f

  Copy full SHA for bed662f

• Updated FontIcon page to Icon page.

  mmrtnz

  committed
  bbfe616

  Copy full SHA for bbfe616

• Merge branch 'master' of https://github.com/callemall/material-ui into font-icon-components

  mmrtnz

  committed
  b10bbc5

  Copy full SHA for b10bbc5

• Fixed tooltip size

  mmrtnz

  committed
  c2a72d9

  Copy full SHA for c2a72d9

• Changed tooltip size again

  mmrtnz

  committed
  2a76071

  Copy full SHA for 2a76071

• Fixed tooltip size to 10px

  mmrtnz

  committed
  6f83c33

  Copy full SHA for 6f83c33

• Merge pull request mui#318 from mmrtnz/font-icon-components

  Show description for e6e43c1
  

  Hai Nguyen

  committed
  e6e43c1

  Copy full SHA for e6e43c1

Commits on Feb 10, 2015

• Fixes mui#307 - onClick of buttons doesn't fire in Safari

  

  Hai Nguyen

  committed
  5e1bc35

  Copy full SHA for 5e1bc35

• Update docs to reflect changes to buttons

  

  Geoffrey

  committed
  068dd17

  Copy full SHA for 068dd17

• Allow nesting in buttons (for things like input file)

  

  Geoffrey

  committed
  f0f2560

  Copy full SHA for f0f2560

• Changed div nesting of touch ripple

  

  Geoffrey

  committed
  4649622

  Copy full SHA for 4649622

• Added License info to readme - fixes mui#314

  

  Hai Nguyen

  committed
  7b7b9a4

  Copy full SHA for 7b7b9a4

• Add example of using new nested children for icon + text

  

  Geoffrey

  committed
  a504499

  Copy full SHA for a504499

• Moved react to peer dependency

  

  Hai Nguyen

  committed
  cad58a2

  Copy full SHA for cad58a2

Commits on Feb 11, 2015

• Merge branch 'css-in-js' of https://github.com/callemall/material-ui into css-in-js

  mmrtnz

  committed
  099382c

  Copy full SHA for 099382c

• Menus can receive an onItemClick or onItemTap prop.

  mmrtnz

  committed
  99ba908

  Copy full SHA for 99ba908

• Compile jsx before nom publish - Fixes mui#179, Fixes mui#215

  

  Hai Nguyen

  committed
  6020d61

  Copy full SHA for 6020d61

• Merge pull request mui#325 from mmrtnz/menu-item-touch-tap

  Show description for 906605b
  

  Hai Nguyen

  committed
  906605b

  Copy full SHA for 906605b

• Merge pull request mui#323 from gabdallah222/master

  Show description for 0770cad
  

  Hai Nguyen

  committed
  0770cad

  Copy full SHA for 0770cad

• Merge with master

  mmrtnz

  committed
  ba32513

  Copy full SHA for ba32513

• Modified switches and icon-buttons to css-in-js ripples

  mmrtnz

  committed
  4cd4307

  Copy full SHA for 4cd4307