Merge pull request #12 from synapsestudios/design/12-namespace-compon…

…ents Namespace all synfrastructure components
synapsestudios · Apr 22, 2015 · adce9bb · adce9bb
2 parents f8535d0 + ada4f16
commit adce9bb
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 7 deletions.
diff --git a/components/alert/_alerts.scss → components/alert/_ui-alerts.scss b/components/alert/_alerts.scss → components/alert/_ui-alerts.scss
diff --git a/components/alert/alert.jsx → components/alert/ui-alert.jsx b/components/alert/alert.jsx → components/alert/ui-alert.jsx
@@ -6,7 +6,7 @@ var SynfrastructureHelperMixin = require('../../mixins/synfrastructure-helper-mi
 
 module.exports = React.createClass({
 
-    displayName : 'Alert',
+    displayName : 'UI-Alert',
 
     mixins : [SynfrastructureHelperMixin],
 

diff --git a/components/button/_buttons.scss → components/button/_ui-buttons.scss b/components/button/_buttons.scss → components/button/_ui-buttons.scss
diff --git a/components/button/button.jsx → components/button/ui-button.jsx b/components/button/button.jsx → components/button/ui-button.jsx
@@ -6,7 +6,7 @@ var SynfrastructureHelperMixin = require('../../mixins/synfrastructure-helper-mi
 
 module.exports = React.createClass({
 
-    displayName : 'Button',
+    displayName : 'UI-Button',
 
     mixins : [SynfrastructureHelperMixin],
 
@@ -21,6 +21,10 @@ module.exports = React.createClass({
         attributes            : React.PropTypes.object,
         componentCSSClassName : React.PropTypes.string,
         size                  : React.PropTypes.string,
+        modifier              : React.PropTypes.oneOfType([
+            React.PropTypes.string,
+            React.PropTypes.array
+        ]),
         disabled  : React.PropTypes.bool,
         className : React.PropTypes.string,
         onClick   : React.PropTypes.func
@@ -33,6 +37,7 @@ module.exports = React.createClass({
             attributes            : {},
             componentCSSClassName : 'button',
             size                  : null,
+            modifier              : null,
             disabled              : false,
             className             : null,
             onClick               : null
@@ -49,6 +54,7 @@ module.exports = React.createClass({
 
         classes = [
             this.props.componentCSSClassName,
+            this.props.modifier.join(' '),
             this.props.className,
             this.props.disabled ?
                 this.props.componentCSSClassName + '--disabled' : null

diff --git a/components/form/inputs/_inputs.scss → components/form/inputs/_ui-inputs.scss b/components/form/inputs/_inputs.scss → components/form/inputs/_ui-inputs.scss
diff --git a/components/form/inputs/input.jsx → components/form/inputs/ui-input.jsx b/components/form/inputs/input.jsx → components/form/inputs/ui-input.jsx
@@ -6,7 +6,7 @@ var FormInputMixin = require('../../../mixins/form-input-mixin');
 
 module.exports = React.createClass({
 
-    displayName : 'Input',
+    displayName : 'UI-Input',
 
     mixins : [
         FormInputMixin

diff --git a/components/form/inputs/select.jsx → components/form/inputs/ui-select.jsx b/components/form/inputs/select.jsx → components/form/inputs/ui-select.jsx
@@ -7,7 +7,7 @@ var FormInputMixin = require('../../../mixins/form-input-mixin');
 
 module.exports = React.createClass({
 
-    displayName : 'Select',
+    displayName : 'UI-Select',
 
     mixins : [
         FormInputMixin

diff --git a/components/form/inputs/textarea.jsx → components/form/inputs/ui-textarea.jsx b/components/form/inputs/textarea.jsx → components/form/inputs/ui-textarea.jsx
@@ -6,7 +6,7 @@ var FormInputMixin = require('../../../mixins/form-input-mixin');
 
 module.exports = React.createClass({
 
-    displayName : 'TextArea',
+    displayName : 'UI-TextArea',
 
     mixins : [
         FormInputMixin

diff --git a/components/form/labels/_labels.scss → components/form/labels/_ui-labels.scss b/components/form/labels/_labels.scss → components/form/labels/_ui-labels.scss
diff --git a/components/form/labels/label.jsx → components/form/labels/ui-label.jsx b/components/form/labels/label.jsx → components/form/labels/ui-label.jsx
@@ -6,7 +6,7 @@ var SynfrastructureHelperMixin = require('../../../mixins/synfrastructure-helper
 
 module.exports = React.createClass({
 
-    displayName : 'FormLabel',
+    displayName : 'UI-FormLabel',
 
     mixins : [SynfrastructureHelperMixin],
 

diff --git a/components/form/validation/validation.jsx → components/form/validation/ui-validation.jsx b/components/form/validation/validation.jsx → components/form/validation/ui-validation.jsx
@@ -7,7 +7,7 @@ var SynfrastructureHelperMixin = require('../../../mixins/synfrastructure-helper
 
 module.exports = React.createClass({
 
-    displayName : 'Validation',
+    displayName : 'UI-Validation',
 
     mixins : [SynfrastructureHelperMixin],