Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Transition from css to js for tabs/inkbar #346

Merged
merged 19 commits into from Feb 25, 2015
Merged

Transition from css to js for tabs/inkbar #346

merged 19 commits into from Feb 25, 2015

Commits on Feb 12, 2015

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

    …into css-in-js
    Geoffrey committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    2f29429 View commit details
    Browse the repository at this point in the history

  2. Changed ink-bar to fit css-in-js mold

    Geoffrey committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    bc3cb7c View commit details
    Browse the repository at this point in the history

  3. Made change to ccs-in-js styles for tabTemplate

    Geoffrey committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    3bdc74d View commit details
    Browse the repository at this point in the history

  4. Completed tabs to css-in-jx

    Geoffrey committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    f3b54d6 View commit details
    Browse the repository at this point in the history

  5. Allow a user to specify color/background colors in props

    Geoffrey committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    19b4374 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2015

  1. Changed mergePropStyles for certain components

    Geoffrey committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    cfe3a76 View commit details
    Browse the repository at this point in the history

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

    …into css-in-js

Conflicts:
	src/less/components/components.less
    Geoffrey committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    070ed72 View commit details
    Browse the repository at this point in the history

  3. Removed extraneous input

    Geoffrey committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    11b9b9f View commit details
    Browse the repository at this point in the history

  4. Changed to mergeStyles

    Geoffrey committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    a7176dc View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. Change tabs for fixes/adds percent width/removes tabwidth correction

    Geoffrey committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    c3d5d62 View commit details
    Browse the repository at this point in the history

  2. Change color to use variable

    Geoffrey committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    0ef6de1 View commit details
    Browse the repository at this point in the history

  3. Removed extraneous sytlepropable

    Geoffrey committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    865aa23 View commit details
    Browse the repository at this point in the history

  4. Changed mergePropStyles to mergeStyle

    Geoffrey committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    35d6d8e View commit details
    Browse the repository at this point in the history

  5. Fixed relative path name to colors.js

    Geoffrey committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    06b7f92 View commit details
    Browse the repository at this point in the history

  6. Adds return value to getLeft

    Geoffrey committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    1bde8eb View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. mergeandprefix added to ink-bar

    Geoffrey Abdallah committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    4e7fcc7 View commit details
    Browse the repository at this point in the history

  2. Merge and prefix added to tabs

    Geoffrey Abdallah committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    f8dde6f View commit details
    Browse the repository at this point in the history

  3. Added merge and prefix to tab

    Geoffrey Abdallah committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    1d57a89 View commit details
    Browse the repository at this point in the history

  4. Reverted mergeandprefix when unnecessary

    Geoffrey Abdallah committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    9a7c622 View commit details
    Browse the repository at this point in the history