Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rohan Nair committed Dec 4, 2015
2 parents 528c3eb + 933c69d commit cb386c3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 224 deletions.
7 changes: 5 additions & 2 deletions infl-styles/_alert.scss
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '_theme';

.alert-msg {
padding: 10px 20px;
border-radius: $theme-border-radius-2;
Expand Down Expand Up @@ -28,13 +30,14 @@
position: absolute;
right: 5px;
top: 5px;
color: $info-color;
cursor: pointer;
font-weight: bold;
color: $info-color;
z-index: 3;

&:hover {
color: darken($info-color, 10%);
@include transition(color 0.5s ease-out)
transition: color 0.5s ease-out;
}
}

Expand Down
4 changes: 0 additions & 4 deletions infl-styles/_recommended-length.scss
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
/* COPIED FROM '../src' DO NOT EDIT */
.pt-recommended-length {
display: inline-block;
}

.pt-remaining-length {
display: block;
text-align: right;
Expand Down
4 changes: 2 additions & 2 deletions src/alert/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ var AlertMixin = require('./alert_mixin.js');
var DetailedAlert = {};

var Alert = React.createClass({
mixins: [AlertMixin],
displayName: 'Alert',
mixins: [AlertMixin],
displayName: 'Alert',
getDefaultProps: function() {
return {
title: '',
Expand Down
2 changes: 1 addition & 1 deletion src/split-button-dropdown/Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ included: true
group: Components
---
```
<SplitButtonDropdown type='primary' onPrimaryClick={()=>{}} buttonText='Testing here'>
<SplitButtonDropdown title="Click me" type='primary' onPrimaryClick={()=>{}} buttonText='Testing here'>
<a className="ic ic-pencil" href="javascript://">Edit</a>
<a className="ic ic-lock" href="javascript://">Lock</a>
<a className="ic ic-arrow-left" href="javascript://">Move</a>
Expand Down
218 changes: 3 additions & 215 deletions webpacktestbed/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,234 +1,22 @@
import React, { Component } from 'react';

// Components
import Button from '../src/button2';
import Alert from '../src/alert';
import ButtonDropdown from '../src/button-dropdown';
import SplitButtonDropdown from '../src/split-button-dropdown';

// Styles
import '../infl-styles/_icon.scss';
import '../infl-styles/_font_families_webpack.scss';
import '../infl-styles/_button.scss';
// import '../infl-styles/_all.scss';
import '../infl-styles/_alert.scss';

class App extends Component {

render() {

const containerStyle = {
textAlign: 'center',
width: '100%',
minHeight: '420px',
margin: '20px',
}

const rowStyle = {
verticalAlign: 'top',
marginPadding: '10px',
// lineHeight: '24px',
fontFamily: 'sans-serif',
}

return (
<table style={containerStyle}>
<tbody>
<tr style={rowStyle}>
<td>
<Button
type="">
Click me
</Button>
</td>
<td>
<ButtonDropdown
title="Click me"
type="">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Click me"
type="">
<a href="#"><i className="ic ic-mail"></i>Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
<tr style={rowStyle}>
<td>
<Button
type="primary">
Click me
</Button>
</td>
<td>
<ButtonDropdown
title="Click me"
type="primary">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Click me"
type="primary">
<a href="#"><i className="ic ic-mail"></i>Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
<tr style={rowStyle}>
<td>
<Button
type="secondary">
Click me
</Button>
</td>
<td>
<ButtonDropdown
title="Click me"
type="secondary">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Click me"
type="secondary">
<a href="#"><i className="ic ic-mail"></i>Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
<tr style={rowStyle}>
<td>
<Button
type="success">
Click me
</Button>
</td>
<td>
<ButtonDropdown
title="Click me"
type="success">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Click me"
type="success">
<a href="#">Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
<tr style={rowStyle}>
<td>
<Button
type="danger">
Click me
</Button>
</td>
<td>
<ButtonDropdown
title="Click me"
type="danger">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Click me"
type="danger">
<a href="#"><i className="ic ic-mail"></i>Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
<tr style={rowStyle}>
<td>
<Button
type="important">
Click me
</Button>
</td>
<td>
<ButtonDropdown
title="Click me"
type="important">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Click me and this label is big"
type="important">
<a href="#"><i className="ic ic-mail"></i>Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
<tr style={rowStyle}>
<td>
<Button
type="text">
Click me
</Button>
</td>
<td>
<ButtonDropdown
title="Click me"
type="text">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Click me"
type="text">
<a href="#"><i className="ic ic-mail"></i>Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
<tr style={rowStyle}>
<td>
<Button
type="primary"
disabled="true">
Disabled
</Button>
</td>
<td>
<ButtonDropdown
title="Disabled"
type="primary"
disabled="true">
<a href="#">Click</a>
<a href="#">Me</a>
</ButtonDropdown>
</td>
<td>
<SplitButtonDropdown
title="Disabled"
type="primary"
disabled="true">
<a href="#"><i className="ic ic-mail"></i>Opt 1</a>
<a href="#">Super long Option name, option #2</a>
</SplitButtonDropdown>
</td>
</tr>
</tbody>
</table>
<Alert title="Success!" key="success" showIcon={true} closeable={true}>Success Alert!</Alert>
);
}
}
Expand Down

0 comments on commit cb386c3

Please sign in to comment.