@aquera/nile-elements 0.0.2 → 0.0.3-2

package/src/nile-tag/nile-tag.css.ts

@@ -18,10 +18,12 @@ export const styles = css`
   .tag {
     display: flex;
     align-items: center;
-    border: solid 1px;
+    border: solid 2px;
     line-height: 1;
     white-space: nowrap;
     user-select: none;
+    border-radius: 4px;
+    gap: 6px;
   }
 
   .tag__remove::part(base) {
@@ -34,9 +36,14 @@ export const styles = css`
    */
 
   .tag--primary {
-    background-color: hsl(204 100% 97.1%);
-    border-color: hsl(200.6 94.4% 86.1%);
-    color: hsl(201 90% 27.5%);
+    background: #005EA6;
+    border-color: #005EA6;
+    border: 2px solid  #005EA6;
+    color: #FFF;
+  }
+
+  .tag--primary:hover {
+    border: 2px solid rgba(0, 94, 166, 0.50);
   }
 
   .tag--primary:active > nile-icon-button {
@@ -44,71 +51,82 @@ export const styles = css`
   }
 
   .tag--success {
-    background-color: hsl(138.5 76.5% 96.7%);
-    border-color: hsl(141 78.9% 85.1%);
-    color: hsl(142.8 64.2% 24.1%);
+    background: #A5F3E1;
+    border: 2px solid #A5F3E1;
+    color: #000;
+  }
+
+  .tag--success:hover {
+    border: 2px solid #43E5C0;
   }
 
   .tag--success:active > nile-icon-button {
     color: hsl(142.1 76.2% 36.3%);
   }
 
-  .tag--neutral {
-    background-color: #e5e9eb;
-    border-color: #e5e9eb;
-    color: hsl(240 3.7% 15.9%);
+  .tag--normal {
+    background: #E5E9EB;
+    border: 2px solid #E5E9EB;
+    color: #000;
+  }
+
+  .tag--normal:hover {
+    border: 2px solid #C7CED4;
   }
 
-  .tag--neutral:active > nile-icon-button {
+
+  .tag--normal:active > nile-icon-button {
     color: hsl(240 5.2% 33.9%);
   }
 
   .tag--warning {
-    background-color: hsl(48 100% 96.1%);
-    border-color: hsl(48 96.6% 76.7%);
-    color: hsl(26 90.5% 37.1%);
+    background: #F3E0A5;
+    border: 2px solid #F3E0A5;
+    color: #000;
+  }
+
+  .tag--warning:hover {
+    border: 2px solid #E5BF43;
   }
 
   .tag--warning:active > nile-icon-button {
     color: hsl(32.1 94.6% 43.7%);
   }
 
-  .tag--danger {
-    background-color: hsl(0 85.7% 97.3%);
-    border-color: hsl(0 96.3% 89.4%);
-    color: hsl(0 70% 35.3%);
+
+  .tag--error {
+    background: #F3A5AA;
+    border: 2px solid #F3A5AA;
+    color: #000;
+  }
+
+  .tag--error:hover {
+    border: 2px solid #E5434D;
   }
 
-  .tag--danger:active > nile-icon-button {
+  .tag--error:active > nile-icon-button {
     color: hsl(0 72.2% 50.6%);
   }
 
-  /*
-   * Size modifiers
-   */
+  .tag--info {
+    background: #A5D3F3;
+    border: 2px solid #A5D3F3;
+    color: #000000;
+  }
 
-  .tag--small {
-    font-size: 0.75rem;
-    height: calc(1.875rem * 0.8);
-    line-height: calc(1.875rem - 1px * 2);
-    border-radius: 0.25rem;
-    padding: 0 0.5rem;
+  .tag--info:hover {
+    border: 2px solid #42A3E5;
   }
 
-  .tag--medium {
-    font-size: 0.875rem;
-    height: calc(2.5rem * 0.8);
-    line-height: calc(2.5rem - 1px * 2);
-    border-radius: 0.25rem;
-    padding: 0 0.75rem;
+  .tag--info:active > nile-icon-button {
+    color: hsl(0 72.2% 50.6%);
   }
 
-  .tag--large {
-    font-size: 1rem;
-    height: calc(3.125rem * 0.8);
-    line-height: calc(3.125rem - 1px * 2);
-    border-radius: 0.25rem;
-    padding: 0 1rem;
+
+  .tag--medium {
+    font-size: 14px;
+    height: 26px;
+    padding: 0 0.75rem;
   }
 
   .tag__remove {
@@ -122,6 +140,15 @@ export const styles = css`
   .tag--pill {
     border-radius: 9999px;
   }
+
+  .tag__prefix {
+  padding: 3px 6px;
+}
+
+ .tag__content {
+  font-size: 14px;
+}
+
 `;
 
 export default [styles];

package/src/nile-tag/nile-tag.ts

@@ -49,10 +49,10 @@ export class NileTag extends NileElement {
   @property({ reflect: true }) variant:
     | 'primary'
     | 'success'
-    | 'neutral'
+    | 'normal'
     | 'warning'
-    | 'danger'
-    | 'text' = 'neutral';
+    | 'error'
+    | 'info' = 'normal';
 
   /** The tag's size. */
   @property({ reflect: true }) size: 'small' | 'medium' | 'large' = 'medium';
@@ -77,10 +77,10 @@ export class NileTag extends NileElement {
           // Types
           'tag--primary': this.variant === 'primary',
           'tag--success': this.variant === 'success',
-          'tag--neutral': this.variant === 'neutral',
+          'tag--normal': this.variant === 'normal',
           'tag--warning': this.variant === 'warning',
-          'tag--danger': this.variant === 'danger',
-          'tag--text': this.variant === 'text',
+          'tag--error': this.variant === 'error',
+          'tag--info': this.variant === 'info',
 
           // Sizes
           'tag--small': this.size === 'small',
@@ -92,14 +92,17 @@ export class NileTag extends NileElement {
           'tag--removable': this.removable,
         })}
       >
-        <slot part="content" class="tag__content"></slot>
+
+        <slot name="prefix" part="prefix" class="tag__prefix"></slot>
+
+        <slot  part="content" class="tag__content"></slot>
 
         ${this.removable
           ? html`
               <nile-icon-button
                 part="remove-button"
                 exportparts="base:remove-button__base"
-                name="error"
+                name="close"
                 library="system"
                 label="remove"
                 class="tag__remove"

package/src/nile-textarea/nile-textarea.css.ts

@@ -22,8 +22,14 @@ export const styles = css`
   /* Label */
   .form-control--has-label .form-control__label {
     display: inline-block;
-    color: var(--nile-colors-dark-900);
     margin-bottom: 12px;
+    color: var(--nile-colors-dark-900);
+    font-family: Colfax-regular;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 14px;
+    letter-spacing: 0.2px;
   }
 
   .form-control--has-label.form-control--medium .form-control__label {
@@ -113,7 +119,7 @@ export const styles = css`
 
   .textarea--standard.textarea--focused:not(.textarea--disabled)
     .textarea__control {
-    color: #333;
+      color: #000000;
   }
 
   .textarea--standard.textarea--disabled {

package/src/nile-textarea/nile-textarea.ts

@@ -267,7 +267,9 @@ export class NileTextarea extends NileElement  {
     const hasLabelSlot = this.hasSlotController.test('label');
     const hasHelpTextSlot = this.hasSlotController.test('help-text');
     const hasLabel = this.label ? true : !!hasLabelSlot;
-    const hasHelpText = this.helpText ? true : !!hasHelpTextSlot;
+
+    const hasHelpText = this.helpText ? true : false;
+    const hasErrorMessage = this.errorMessage ? true : false;
 
     return html`
       <div
@@ -335,23 +337,23 @@ export class NileTextarea extends NileElement  {
           </div>
         </div>
 
-        <slot
-          name="help-text"
-          part="form-control-help-text"
-          id="help-text"
-          class="form-control__help-text"
-          aria-hidden=${hasHelpText ? 'false' : 'true'}
-        >
-          ${this.helpText}
-        </slot>
-        <slot
-          name="error-message"
-          part="form-control-error-message"
-          id="error-message"
-          class="form-control__error-message"
-        >
-          ${this.errorMessage}
-        </slot>
+        ${
+          hasHelpText
+            ? html`
+                <nile-form-help-text>${this.helpText}</nile-form-help-text>
+              `
+            : ``
+        }
+
+        ${
+          hasErrorMessage
+            ? html`
+                <nile-form-error-message
+                  >${this.errorMessage}</nile-form-error-message
+                >
+              `
+            : ``
+        }
       </div>
     `;
   }