Spearhead
/
joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updating more names in small components

This commit is contained in:
Alex Windett 2017-02-02 15:58:36 +00:00
parent 078ec20aaf
commit 7b5eb32d00
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/components/form/label.js
View File

@ -20,5 +20,5 @@ module.exports = styled.label`
font-weight: 600; font-weight: 600;
font-style: normal; font-style: normal;
font-stretch: normal; font-stretch: normal;
color: ${colors.brandSecondaryColor}; color: ${colors.base.secondary};
`; `;

8
ui/src/components/form/outlet.js
View File

@ -16,11 +16,11 @@ const {
} = Styled; } = Styled;
const colorWithDisabled = (props) => props.disabled const colorWithDisabled = (props) => props.disabled
? colors.brandInactiveColor ? colors.inactive.default
: colors.fonts.regular; : colors.fonts.regular;
const colorWithDefaultValue = (props) => props.value === props.defaultValue const colorWithDefaultValue = (props) => props.value === props.defaultValue
? colors.brandInactiveColor ? colors.inactive.default
: colorWithDisabled(props); : colorWithDisabled(props);
const color = (props) => props.defaultValue const color = (props) => props.defaultValue
@ -46,7 +46,7 @@ module.exports = css`
padding: ${paddingTop} ${remcalc(18)}; padding: ${paddingTop} ${remcalc(18)};
border-radius: ${boxes.borderRadius}; border-radius: ${boxes.borderRadius};
background-color: ${colors.brandPrimaryColor}; background-color: ${colors.base.primary};
box-shadow: ${boxes.insetShaddow}; box-shadow: ${boxes.insetShaddow};
border: ${boxes.border.unchecked}; border: ${boxes.border.unchecked};
@ -61,7 +61,7 @@ module.exports = css`
outline: 0; outline: 0;
&:focus { &:focus {
border-color: ${colors.brandPrimary}; border-color: ${colors.base.primary};
outline: 0; outline: 0;
} }
`; `;

8
ui/src/components/icon/index.js
View File

@ -8,19 +8,21 @@ const {
const styles = css` const styles = css`
font-size: inherit; font-size: inherit;
${props => props.style}
`; `;
const Icon = ({ const Icon = ({
name = 'beer', name = 'beer',
className, className,
iconSet = 'fa', iconSet = 'fa',
style style = '',
}) => { }) => {
const Icon = require(`react-icons/lib/${iconSet}/${name}`); const Icon = require(`react-icons/lib/${iconSet}/${name}`);
const Component = styled(Icon)(styles); const Component = styled(Icon)(styles);
return ( return (
<Component className={className} style={style} /> <Component className={className} />
); );
}; };
@ -28,7 +30,7 @@ Icon.propTypes = {
className: React.PropTypes.string, className: React.PropTypes.string,
iconSet: React.PropTypes.string.isRequired, iconSet: React.PropTypes.string.isRequired,
name: React.PropTypes.string.isRequired, name: React.PropTypes.string.isRequired,
style: React.PropTypes.object style: React.PropTypes.string,
}; };
module.exports = Icon; module.exports = Icon;

3
ui/src/components/icon/style.css
View File

@ -1,3 +0,0 @@
.icon {
font-size: inherit;
}