@pareto-engineering/design-system 2.0.0-alpha.20 → 2.0.0-alpha.24

package/src/stories/c/ContentSlides.stories.jsx

@@ -4,6 +4,7 @@ import * as React from 'react'
 import {
   ContentSlides,
   SiteContextProvider,
+  Shapes,
   useContentSlides,
   Title,
   Logo,
@@ -74,7 +75,7 @@ export const Base = () => {
 
     return (
       <div className={`ui-${userTheme}`} style={{ height: '100%' }}>
-        <ContentSlides className="y-background1" steps={steps}>
+        <ContentSlides className="y-background1 b-dark-y" steps={steps}>
           <ContentSlides.Sidebar
             header={(
               <Logo color="paragraph" />
@@ -341,7 +342,158 @@ export const Simple = () => {
     )
   }
   return (
-    <ContentSlides className="y-background1" steps={steps} simple>
+    <ContentSlides className="y-background1 b-dark-y" steps={steps} simple>
+      <Main />
+    </ContentSlides>
+  )
+}
+
+export const WithBackgroundShape = () => {
+  const steps = [
+    {
+      id      :'welcome',
+      title   :'Welcome',
+      progress:40,
+      location:'welcome',
+    },
+    {
+      id      :'plan',
+      title   :'Choose your plan',
+      progress:60,
+      location:'select-plan',
+    },
+    {
+      id      :'details',
+      title   :'Personal details',
+      progress:70,
+      location:'personal-details',
+    },
+    {
+      id      :'payment',
+      title   :'Payment',
+      progress:90,
+      location:'payment',
+    },
+  ]
+
+  const Main = () => {
+    const { isLastStep } = useContentSlides()
+
+    return (
+      <>
+        <ContentSlides.HorizontalMenu hideBackIcon={isLastStep} />
+        {' '}
+        <main>
+          <ContentSlides.Slide
+            index={0}
+          >
+            <Title
+              heading="Welcome"
+              headingAs="h1"
+              headingClassName="small"
+              subtitle="Welcome to this site. We hope you will have an amazing experience here."
+            />
+            <ContentSlides.Navigator />
+          </ContentSlides.Slide
+      >
+          <ContentSlides.Slide
+            index={1}
+          >
+            <Title
+              heading="Part 2"
+              headingAs="h1"
+              headingClassName="small"
+              subtitle="Welcome to this site. We hope you will have an amazing experience here."
+            />
+            <p>
+              In ut sollicitudin elit. Maecenas tempor ex aliquet enim egestas,
+              non sollicitudin mi tempor. Pellentesque fermentum, massa in cursus faucibus,
+              enim tortor fringilla ligula, sit amet tincidunt neque orci et tellus.
+              Nam dignissim tristique justo. Cras nulla sem, dictum pellentesque libero eget,
+              porta placerat leo.
+              Donec scelerisque enim risus, in pharetra purus fringilla eu.
+              Cras placerat ac enim viverra rhoncus.
+              Cras sagittis euismod orci eget aliquam. Nulla et mi non enim aliquam consequat.
+              Cras volutpat porta convallis. Mauris ullamcorper vitae sapien ac rhoncus.
+              Nullam vel porttitor mi, ut vestibulum arcu.
+              {' '}
+            </p>
+            <p>
+              In ut sollicitudin elit. Maecenas tempor ex aliquet enim egestas,
+              non sollicitudin mi tempor. Pellentesque fermentum, massa in cursus faucibus,
+              enim tortor fringilla ligula, sit amet tincidunt neque orci et tellus.
+              Nam dignissim tristique justo. Cras nulla sem, dictum pellentesque libero eget,
+              porta placerat leo.
+              Donec scelerisque enim risus, in pharetra purus fringilla eu.
+              Cras placerat ac enim viverra rhoncus.
+              Cras sagittis euismod orci eget aliquam. Nulla et mi non enim aliquam consequat.
+              Cras volutpat porta convallis. Mauris ullamcorper vitae sapien ac rhoncus.
+              Nullam vel porttitor mi, ut vestibulum arcu.
+              {' '}
+            </p>
+            <p>
+              In ut sollicitudin elit. Maecenas tempor ex aliquet enim egestas,
+              non sollicitudin mi tempor. Pellentesque fermentum, massa in cursus faucibus,
+              enim tortor fringilla ligula, sit amet tincidunt neque orci et tellus.
+              Nam dignissim tristique justo. Cras nulla sem, dictum pellentesque libero eget,
+              porta placerat leo.
+              Donec scelerisque enim risus, in pharetra purus fringilla eu.
+              Cras placerat ac enim viverra rhoncus.
+              Cras sagittis euismod orci eget aliquam. Nulla et mi non enim aliquam consequat.
+              Cras volutpat porta convallis. Mauris ullamcorper vitae sapien ac rhoncus.
+              Nullam vel porttitor mi, ut vestibulum arcu.
+              {' '}
+            </p>
+            <p>
+              In ut sollicitudin elit. Maecenas tempor ex aliquet enim egestas,
+              non sollicitudin mi tempor. Pellentesque fermentum, massa in cursus faucibus,
+              enim tortor fringilla ligula, sit amet tincidunt neque orci et tellus.
+              Nam dignissim tristique justo. Cras nulla sem, dictum pellentesque libero eget,
+              porta placerat leo.
+              Donec scelerisque enim risus, in pharetra purus fringilla eu.
+              Cras placerat ac enim viverra rhoncus.
+              Cras sagittis euismod orci eget aliquam. Nulla et mi non enim aliquam consequat.
+              Cras volutpat porta convallis. Mauris ullamcorper vitae sapien ac rhoncus.
+              Nullam vel porttitor mi, ut vestibulum arcu.
+              {' '}
+            </p>
+
+            <ContentSlides.Navigator />
+          </ContentSlides.Slide>
+          <ContentSlides.Slide
+            index={2}
+          >
+            <Title
+              heading="Part 3"
+              headingAs="h1"
+              headingClassName="small"
+              subtitle="Welcome to this site. We hope you will have an amazing experience here."
+            />
+            <ContentSlides.Navigator />
+          </ContentSlides.Slide>
+          <ContentSlides.Slide
+            index={3}
+          >
+            <Title
+              heading="Part 4"
+              headingAs="h1"
+              headingClassName="small"
+              subtitle="Welcome to this site. We hope you will have an amazing experience here."
+            />
+            <ContentSlides.Navigator />
+          </ContentSlides.Slide>
+        </main>
+      </>
+    )
+  }
+  return (
+    <ContentSlides className="y-background4 b-light-y" steps={steps} simple>
+      <Shapes
+        height="65em"
+        verticalAlign="center"
+        horizontalAlign="flex-start"
+        shape="spiral"
+      />
       <Main />
     </ContentSlides>
   )

package/src/stories/f/SelectInput.stories.jsx

@@ -13,10 +13,9 @@ export default {
   decorators:[
     (storyfn) => (
       <Formik
-        initialValues={{ workType: 'Work' }}
+        initialValues={{ workType: '' }}
       >
         <Form>
-
           { storyfn() }
         </Form>
       </Formik>
@@ -32,7 +31,7 @@ export const Base = () => (
     <SelectInput
       name="workType"
       label="Work Type"
-      options={['Work', 'Managing', 'Training']}
+      options={[{ value: '', label: 'Select an option', disabled: true }, 'Work', 'Managing', 'Training']}
     />
     <FormDebugger />
   </>
@@ -55,9 +54,7 @@ export const RequiredSelect = () => {
         name="activity"
         label="Activity Type"
         options={[
-          {
-            value:'', label:'Select activity type', disabled:true,
-          },
+          { value: '', label: 'Select an option', disabled: true },
           { value: 'review', label: 'Review' },
           { value: 'Approve', label: 'Approve' },
         ]}
@@ -73,6 +70,7 @@ export const Objects = () => (
       name="workType"
       label="Work Type"
       options={[
+        { value: '', label: 'Select an option', disabled: true },
         { value: '20th Aug 2020 to 19th Sept, 2020', label: '20th Aug 2020 to 19th Sept, 2020' },
         { value: '20th Sept 2020 to 19th Oct, 2020', label: '20th Sept 2020 to 19th Oct, 2020' },
       ]}
@@ -86,7 +84,9 @@ export const StringAndObjects = () => (
     <SelectInput
       name="workType"
       label="Work Type"
-      options={['Work', 'Managing', 'Training',
+      options={[
+        { value: '', label: 'Select an option', disabled: true },
+        'Work', 'Managing', 'Training',
         { value: '20th Aug 2020 to 19th Sept, 2020', label: '20th Aug 2020 to 19th Sept, 2020' },
         { value: '20th Sept 2020 to 19th Oct, 2020', label: '20th Sept 2020 to 19th Oct, 2020' },
       ]}
@@ -99,7 +99,9 @@ export const DisabledSelectInput = () => (
     <SelectInput
       name="workType"
       label="Work Type"
-      options={['Work', 'Managing', 'Training',
+      options={[
+        { value: '', label: 'Select an option', disabled: true },
+        'Work', 'Managing', 'Training',
         { value: '20th Aug 2020 to 19th Sept, 2020', label: '20th Aug 2020 to 19th Sept, 2020' },
         { value: '20th Sept 2020 to 19th Oct, 2020', label: '20th Sept 2020 to 19th Oct, 2020' },
       ]}

package/src/stories/f/TextInput.stories.jsx

@@ -41,7 +41,7 @@ export const Base = () => {
     return errorMessage
   }
   return (
-    <div className="y-background1 b-dark-y u2 pb-u">
+    <div className=" u2 pb-u">
       <TextInput
         name="firstName"
         label="What's your first name ?"
@@ -52,18 +52,19 @@ export const Base = () => {
   )
 }
 
-export const TextInputWithPlaceHolder = () => (
-  <div className="y-background1 b-dark-y u2 pb-u">
+export const Placeholder = () => (
+  <div className="u2 pb-u">
     <TextInput
       name="firstName"
       label="What's your first name ?"
       placeholder="First Name"
     />
+    <FormDebugger />
   </div>
 )
 
-export const DisabledTextInput = () => (
-  <div className="y-background1 b-dark-y u2 pb-u">
+export const Disabled = () => (
+  <div className="u2 pb-u">
     <TextInput
       name="firstName"
       label="What's your first name ?"
@@ -73,7 +74,7 @@ export const DisabledTextInput = () => (
 )
 
 export const DateTime = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextInput
       name="date"
       label="Select date"

package/src/stories/f/TextareaInput.stories.jsx

@@ -29,7 +29,7 @@ export default {
 }
 
 export const Base = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextareaInput
       name="feedback"
       label="What can we improve on?"
@@ -39,7 +39,7 @@ export const Base = () => (
 )
 
 export const Placeholder = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextareaInput
       name="feedback"
       label="What can we improve on?"
@@ -61,7 +61,7 @@ export const Validation = () => {
   }
 
   return (
-    <div className="y-background1 b-dark-y">
+    <div>
       <TextareaInput
         name="feedback"
         label="What can we improve on?"
@@ -74,7 +74,7 @@ export const Validation = () => {
 }
 
 export const Disabled = () => (
-  <div className="y-background1 b-dark-y">
+  <div>
     <TextareaInput
       name="feedback"
       label="What can we improve on?"

package/src/ui/a/BackgroundGradient/styles.scss

@@ -7,7 +7,7 @@
     left: 0;
     width: 100%;
     height: var(--gradient-height);
-    background-image: linear-gradient(transparent, var(--y) 25%, var(--light-y) 75%, transparent);
+    background-image: linear-gradient(var(--background1), var(--y) 25%, var(--light-y) 75%, var(--background1));
     opacity: .4;
     z-index: -1;
 }

package/src/ui/a/Shapes/styles.scss

@@ -22,7 +22,7 @@ $default-shapes-opacity:.8;
     width: 100%;
 
     .triangle {
-      background-image: linear-gradient(transparent, var(--dark-y));
+      background-image: linear-gradient(var(--light-y), var(--dark-y));
       clip-path: polygon(0 0, 50% 100%, 100% 0);
       height: calc(var(--shape-height, #{$default-triangle-height}) * 0.86);
       opacity: $default-shapes-opacity;
@@ -30,7 +30,7 @@ $default-shapes-opacity:.8;
     }
 
     .inverted-triangle {
-      background-image: linear-gradient(var(--dark-y), transparent);
+      background-image: linear-gradient(var(--dark-y), var(--light-y));
       clip-path: polygon(50% 0, 0 100%, 100% 100%);
       height: calc(var(--shape-height, #{$default-triangle-height}) * 0.86);
       opacity: $default-shapes-opacity;
@@ -117,7 +117,7 @@ $default-shapes-opacity:.8;
     }
 
     .half-ellipse {
-      background-image: radial-gradient(ellipse at center bottom, var(--y) 10%, transparent 65%);
+      background-image: radial-gradient(ellipse at center bottom, var(--y) 10%, var(--light-y) 65%);
       clip-path: ellipse(60% 100% at 50% 0%);
       height: var(--shape-height, #{$default-ellipse-height});
       opacity: $default-shapes-opacity;
@@ -147,7 +147,7 @@ $default-shapes-opacity:.8;
       width: var(--shape-height, #{$default-ellipse-height});
 
       .first {
-        background-image: linear-gradient(to top, var(--dark-y), var(--y), var(--light-y) 50%, transparent);
+        background-image: linear-gradient(to top, var(--dark-y), var(--y), var(--light-y) 50%, var(--background1));
         clip-path: ellipse(50% 20% at 50% 60%);
         height: 100%;
         position: absolute;
@@ -156,7 +156,7 @@ $default-shapes-opacity:.8;
       }
 
       .second {
-        background-image: linear-gradient(to bottom,var(--dark-y), var(--y), var(--light-y) 45%, transparent);
+        background-image: linear-gradient(to bottom,var(--dark-y), var(--y), var(--light-y) 45%, var(--background1));
         clip-path: ellipse(50% 20% at 50% 40%);
         height: 100%;
         position: absolute;
@@ -175,7 +175,7 @@ $default-shapes-opacity:.8;
 
       > * {
         border-radius: 50%;
-        background: radial-gradient(ellipse at center bottom ,var(--dark-y) 10%, transparent 60%);
+        background: radial-gradient(ellipse at center bottom, var(--dark-y) 10%, var(--light-y) 60%);
         position: absolute;
         opacity: .5;
       }
@@ -244,12 +244,12 @@ $default-shapes-opacity:.8;
       }
 
       .left {
-        background-image: linear-gradient(to right ,var(--dark-y),var(--y), transparent);
+        background-image: linear-gradient(to right ,var(--dark-y),var(--y), var(--light-y));
         grid-column: 1 / 5;
       }
       .right {
-        background-image: linear-gradient(to left, var(--dark-y), var(--y), transparent);
+        background-image: linear-gradient(to left, var(--dark-y), var(--y), var(--light-y));
         grid-column: 4 / 8;
       }
     }
-}
+}

package/src/ui/b/Button/styles.scss

@@ -16,7 +16,7 @@ $default-animation-time: .3s;
   color: var(--on-x, var(--on-#{$default-color}));
   display: inline-flex;
   font-family: var(--theme-default-paragraph);
-  font-weight: 600;
+  font-weight: 400;
   justify-content: space-between;
   padding: $default-padding;
   transition: all .25s;

package/src/ui/c/ContentSlides/common/HorizontalMenu/HorizontalMenu.jsx

@@ -65,13 +65,13 @@ const HorizontalMenu = ({
         <div className="left">
           {(!isFirstStep && !hideBackIcon) && (
           <span
-            className="f-icons pointer"
+            className="prev-button pointer"
             onClick={mobilePreviousStep}
             role="button"
             onKeyDown={mobilePreviousStep}
             tabIndex={0}
           >
-            H
+            {'<--'}
           </span>
           )}
         </div>
@@ -131,7 +131,7 @@ HorizontalMenu.propTypes = {
 }
 
 HorizontalMenu.defaultProps = {
-  logoColor     :'main2',
+  logoColor     :'paragraph',
   stepsBackwards:1,
 }
 

package/src/ui/c/ContentSlides/styles.scss

@@ -14,7 +14,7 @@ $class-navigator:navigator;
 $default-sidebar-width:minmax(250px, 330px);
 $default-border:none;//2px solid var(--grid);
 $default-border-radius:var(--theme-border-radius);
-$default-content-background:var(--y);
+$default-content-background: var(--background1);
 $default-padding:var(--u);
 
 $mobile-content-margin:6em;
@@ -61,7 +61,6 @@ $mobile-content-margin:6em;
 
   //.#{$class-main-container} {
   main {
-    background: var(--dark-y);
     overflow: hidden;
     position: relative;
 
@@ -79,7 +78,7 @@ $mobile-content-margin:6em;
         .#{bem.$element-content} {
           background: $default-content-background;
 
-          border: $default-border;
+          border: var(--theme-border);
           border-radius: $default-border-radius;
           max-width: 600px;
           padding: $default-padding;
@@ -108,8 +107,9 @@ $mobile-content-margin:6em;
 
   .#{$class-horizontal-menu} {
     background: $default-content-background;
-    border-bottom: $default-border;
+    border-bottom: var(--theme-border);
     color: var(--heading);
+    z-index: 1;
 
     .#{bem.$element-content} {
       display: grid;
@@ -124,6 +124,11 @@ $mobile-content-margin:6em;
 
       .left {
         text-align: left;
+
+        .prev-button {
+          font-family: var(--theme-default-paragraph);
+          font-size: calc(var(--s2) * 1em);
+        }
       }
 
       .right {
@@ -210,6 +215,7 @@ $mobile-content-margin:6em;
 
               .next {
                 flex-grow: 1;
+                justify-content: flex-end;
               }
             }
           }

package/src/ui/f/common/Label/styles.scss

@@ -5,7 +5,7 @@
 
 
 .#{bem.$base}.label {
- color: var(--x);
+ color: var(--dark-x);
 }
 
 

package/src/ui/f/fields/ChoicesInput/styles.scss

@@ -29,10 +29,21 @@ $default-transition:all .3s;
         z-index: -1;
       }
 
+      input:disabled + label {
+        background-color: var(--dark-x);
+      }
+
+      input:not(:disabled) + label {
+        &:hover {
+          border-color: var(--light-y);
+        }
+      }
+
       label {
-        background: var(--x);
-        border-radius: var(--theme-border-radius);
+        border: var(--theme-border-style) var(--dark-x);
+        background: var(--light-x);
         color: var(--on-x);
+        border-radius: var(--theme-border-radius);
         display: block;
         height: 100%;
         padding: $default-padding;
@@ -44,6 +55,10 @@ $default-transition:all .3s;
       input:checked + label {
         background: var(--y);
         color: var(--on-y);
+
+        &:hover {
+          border-color: var(--y);
+        }
       }
     }
   }

package/src/ui/f/fields/SelectInput/SelectInput.jsx

@@ -26,6 +26,7 @@ const SelectInput = ({
   style,
   name,
   label,
+  color,
   options,
   validate,
   description,
@@ -47,6 +48,7 @@ const SelectInput = ({
 
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -54,7 +56,7 @@ const SelectInput = ({
       // {...otherProps}
     >
       <FormLabel className="input-label" name={name}>{label}</FormLabel>
-      <select className="input v25 pv-v" {...field} value={field.value || ''} id={name} disabled={disabled}>
+      <select className="input" {...field} value={field.value || ''} id={name} disabled={disabled}>
         {
         options.map((option) => {
           // i.e if option is a string like "blah", return { value: "blah", label: "blah" }
@@ -65,6 +67,7 @@ const SelectInput = ({
               key={newOption.value}
               value={newOption.value}
               disabled={newOption?.disabled || false}
+              selected={newOption?.disabled || true}
             >
               {newOption.label}
             </option>
@@ -135,10 +138,16 @@ SelectInput.propTypes = {
    * Whether the select input should be disabled
    */
   disabled:PropTypes.bool,
+
+  /**
+   * The color of the select input
+   */
+  color:PropTypes.string,
 }
 
 SelectInput.defaultProps = {
   disabled:false,
+  color   :'background2',
 }
 
 export default memo(SelectInput)

package/src/ui/f/fields/SelectInput/styles.scss

@@ -5,7 +5,7 @@
 @use "../../../form.scss";
 
 
-$default-padding: 0.75em 0.75em 0.55em;
+$default-padding: 0.75em;
 
 
 .#{bem.$base}.select-input {
@@ -13,17 +13,22 @@ $default-padding: 0.75em 0.75em 0.55em;
   flex-direction: column;
 
 
-  .input-label {
-    color: var(--main2);
-  }
-
   .input {
-    background: var(--light-background2);
-    color: var(--on-background2);
+    border: var(--theme-border-style) var(--dark-y);
+    background: var(--light-y);
+    color:var(--on-y);
     padding: $default-padding;
 
+     &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
+
+     &:disabled {
+      background-color: var(--dark-y);
+    }
+
     &:focus {
-      background: var(--dark-background2);
+      background: var(--y);
     }
   }
 }

package/src/ui/f/fields/TextInput/TextInput.jsx

@@ -27,6 +27,7 @@ const TextInput = ({
   type,
   name,
   label,
+  color,
   labelColor,
   validate,
   oneInputLabel,
@@ -48,6 +49,7 @@ const TextInput = ({
         baseClassName,
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -65,7 +67,7 @@ const TextInput = ({
       </FormLabel>
       <input
         id={name}
-        className={`input ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
+        className="input"
         type={type}
         disabled={disabled}
         placeholder={placeholder}
@@ -149,10 +151,16 @@ TextInput.propTypes = {
    * The placeholder text for the input
    */
   placeholder:PropTypes.string,
+
+  /**
+   * The text input color
+   */
+  color:PropTypes.string,
 }
 
 TextInput.defaultProps = {
   type    :'text',
+  color   :'background2',
   disabled:false,
 }
 

package/src/ui/f/fields/TextInput/styles.scss

@@ -10,12 +10,25 @@ $default-padding: 0.75em 0.75em 0.55em;
   flex-direction: column;
 
   .input {
-    background: var(--light-background2);
-    color: var(--on-background2);
+    border: var(--theme-border-style) var(--dark-y);
+    background: var(--light-y);
+    color: var(--on-y);
     padding: $default-padding;
 
+    &::placeholder{
+      color: var(--metadata);
+    }
+
+    &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
+
+    &:disabled {
+      background-color: var(--dark-y);
+    }
+
     &:focus {
-      background: var(--dark-background2);
+      background: var(--light-background4);
     }
   }
 }