[Tabs] Add icon and text #3042
Merged
[Tabs] Add icon and text #3042
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| import FontIcon from 'material-ui/lib/font-icon'; | ||
| import ActionFlightTakeoff from 'material-ui/lib/svg-icons/action/flight-takeoff'; | ||
|
|
||
| const styles = { |
|
Shouldn't we put the icon above the label? |
|
Wow how can I miss that ? Fixed ;) |
| import FontIcon from 'material-ui/lib/font-icon'; | ||
| import ActionFlightTakeoff from 'material-ui/lib/svg-icons/action/flight-takeoff'; | ||
|
|
||
| const TabsExampleSimple = () => ( |
| @@ -19,13 +23,15 @@ const descriptions = { | |||
| swipeable: 'This example integrates the [react-swipeable-views]' + | |||
| '(https://github.com/oliviertassinari/react-swipeable-views) component with Tabs, animating the Tab transition, ' + | |||
| 'and allowing tabs to be swiped on touch devices.', | |||
| icon: 'An example of tabs with icon', | |||
| iconText: 'An example of tabs with icon and text', | |||
There was a problem hiding this comment.
Could you put a full-stop at the end of each sentence?
|
@pradel That looks good 👍. Do you want to try a squash down of the commits 😁? Thanks. |
|
Okay squashed this time working :) |
|
@pradel Awesome. It's almost good. Can you add a bit of spacing between the label and the icon to follow more closely the specification? Like 2 or 4 pixels. |
|
@oliviertassinari like that is better ? |
|
@pradel That's much better 👍! Thanks. Can you squash down again the commits 😬? |
- Added tab with icon - Added tab with icon and text - Added one example for each Support `FontIcon`and `SvgIcon`. remove unused styles for eslint inverse label and icon position changed let to const Fix const name example Put Example to lowercase Selected color to const Add react.isValidElement check Add full-stop Added 4px between icon and text
|
Squashed :) |
oliviertassinari
added a commit
that referenced
this pull request
Jan 27, 2016
[Tabs] Add icon and text
|
@pradel Thanks! |
zannager
added
the
component: tabs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support
FontIconandSvgIcon.