From 884f17a916e8d0081c3a1863464ef6e4bf18ce34 Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Fri, 13 Apr 2018 16:39:05 -0700 Subject: [PATCH 1/6] New: (Fixes #798) Label added option to set `$label-line-height`, Label with Icons should be same size, and better support for long text that break to new lines Update: (#798) Badge with Icons should be the same size and better support for long text that break to new lines --- .../clay/src/scss/atlas/variables/_badges.scss | 4 ++-- .../clay/src/scss/atlas/variables/_forms.scss | 9 +++++---- .../clay/src/scss/atlas/variables/_labels.scss | 7 ++++--- packages/clay/src/scss/components/_badges.scss | 16 ++++++++++------ packages/clay/src/scss/components/_labels.scss | 12 ++++++++++-- packages/clay/src/scss/mixins/_labels.scss | 9 ++++----- packages/clay/src/scss/variables/_badges.scss | 5 +++-- packages/clay/src/scss/variables/_forms.scss | 5 +++-- packages/clay/src/scss/variables/_labels.scss | 7 ++++--- 9 files changed, 45 insertions(+), 29 deletions(-) diff --git a/packages/clay/src/scss/atlas/variables/_badges.scss b/packages/clay/src/scss/atlas/variables/_badges.scss index e17a20fd0c..75116ffa33 100644 --- a/packages/clay/src/scss/atlas/variables/_badges.scss +++ b/packages/clay/src/scss/atlas/variables/_badges.scss @@ -1,9 +1,9 @@ $badge-border-radius: 10rem !default; $badge-font-size: 0.625rem !default; // 10px $badge-font-weight: $font-weight-semi-bold !default; -$badge-line-height: 0.875rem !default // 14px +$badge-line-height: 1.1 !default; $badge-padding-x: 0.25rem !default; // 4px -$badge-padding-y: 0 !default; +$badge-padding-y: 0.0625rem !default; // 1px $badge-item-spacer-x: 0.85714em !default; diff --git a/packages/clay/src/scss/atlas/variables/_forms.scss b/packages/clay/src/scss/atlas/variables/_forms.scss index 5d0af12249..b609f3e864 100644 --- a/packages/clay/src/scss/atlas/variables/_forms.scss +++ b/packages/clay/src/scss/atlas/variables/_forms.scss @@ -104,14 +104,15 @@ $input-select-icon-focus: clay-icon(caret-double-l, $input-select-icon-focus-col $input-select-icon-disabled-color: $text-muted !default; $input-select-icon-disabled: clay-icon(caret-double-l, $input-select-icon-disabled-color) !default; -// Form Control Label (Labels inside Form Control) +// Form Control Label (Labels inside Form Control Tag Group) $form-control-label-size: () !default; $form-control-label-size: map-merge(( - border-width: 0.0625rem, - font-size: $input-label-font-size, // 14px + border-width: 0.0625rem, // 1px + font-size: map-get($label-lg, font-size), height: 1.5rem, // 24px - padding-x: 0.625rem, // 10px + padding-x: map-get($label-lg, padding-x), + padding-y: map-get($label-lg, padding-y), text-transform: none ), $form-control-label-size); diff --git a/packages/clay/src/scss/atlas/variables/_labels.scss b/packages/clay/src/scss/atlas/variables/_labels.scss index 04b6c37fee..a7937245c7 100644 --- a/packages/clay/src/scss/atlas/variables/_labels.scss +++ b/packages/clay/src/scss/atlas/variables/_labels.scss @@ -1,8 +1,8 @@ $label-border-radius: 0.125rem !default; // 2px $label-font-size: 0.625rem !default; // 10px $label-font-weight: $font-weight-semi-bold !default; -$label-height: 1rem !default; // 16px $label-padding-x: 0.5rem !default; // 8px +$label-padding-y: 0.125rem !default; // 2px $label-text-transform: uppercase !default; $label-item-spacer-x: 0.85714em !default; @@ -13,9 +13,10 @@ $label-link-text-decoration: none !default; $label-link-hover-text-decoration: underline !default; $label-lg: ( - font-size: 0.75rem, // 13px + font-size: 0.75rem, // 12px height: 1.5rem, // 24px - padding-x: 0.625rem // 10px + padding-x: 0.625rem, // 10px + padding-y: 0.3125rem // 5px ) !default; // Label Variants diff --git a/packages/clay/src/scss/components/_badges.scss b/packages/clay/src/scss/components/_badges.scss index 3499361d27..d7da1eb8cd 100644 --- a/packages/clay/src/scss/components/_badges.scss +++ b/packages/clay/src/scss/components/_badges.scss @@ -72,11 +72,15 @@ justify-content: center; min-height: 0; position: relative; + text-align: left; + + a { + display: inline-flex; + } .btn-unstyled { color: inherit; display: inline-flex; - font-size: $badge-lexicon-icon-height; } .close { @@ -88,17 +92,17 @@ margin-top: $badge-lexicon-icon-margin-top; width: $badge-lexicon-icon-width; } - - .text-truncate-inline { - display: inline-flex; - } } .badge-item-expand { flex-grow: 1; flex-shrink: 1; - min-width: 1rem; + min-width: $badge-item-expand-min-width; word-wrap: break-word; + + a { + flex-direction: column; + } } .badge-item-before { diff --git a/packages/clay/src/scss/components/_labels.scss b/packages/clay/src/scss/components/_labels.scss index e0f02b21f9..6bf4093453 100644 --- a/packages/clay/src/scss/components/_labels.scss +++ b/packages/clay/src/scss/components/_labels.scss @@ -9,7 +9,8 @@ display: inline-flex; font-size: $label-font-size; font-weight: $label-font-weight; - line-height: $label-height - ($label-border-width * 2); + height: $label-height; + line-height: $label-line-height; margin-bottom: $label-spacer-y; margin-right: $label-spacer-x; margin-top: $label-spacer-y; @@ -94,10 +95,13 @@ a.label { min-height: 0; position: relative; + a { + display: inline-flex; + } + .btn-unstyled { color: inherit; display: inline-flex; - font-size: $label-lexicon-icon-height; } .close { @@ -120,6 +124,10 @@ a.label { flex-shrink: 1; min-width: 1rem; word-wrap: break-word; + + a { + flex-direction: column; + } } .label-item-before { diff --git a/packages/clay/src/scss/mixins/_labels.scss b/packages/clay/src/scss/mixins/_labels.scss index c79125284e..a052901115 100644 --- a/packages/clay/src/scss/mixins/_labels.scss +++ b/packages/clay/src/scss/mixins/_labels.scss @@ -2,6 +2,7 @@ $border-width: setter(map-get($map, border-width), $label-border-width); $font-size: map-get($map, font-size); $height: map-get($map, height); + $line-height: map-get($map, line-height); $padding-x: map-get($map, padding-x); $padding-y: map-get($map, padding-y); $text-transform: map-get($map, text-transform); @@ -12,11 +13,9 @@ border-width: $border-width; font-size: $font-size; - - @if ($height) { - line-height: $height - ($border-width * 2); - } - + height: auto; + line-height: $line-height; + min-height: $height; padding-bottom: $padding-y; padding-left: $padding-x; padding-right: $padding-x; diff --git a/packages/clay/src/scss/variables/_badges.scss b/packages/clay/src/scss/variables/_badges.scss index 71472b5e1f..22c702f73e 100644 --- a/packages/clay/src/scss/variables/_badges.scss +++ b/packages/clay/src/scss/variables/_badges.scss @@ -6,10 +6,11 @@ $badge-line-height: null !default; $badge-spacer-x: 0.25rem !default; // 4px $badge-spacer-y: 0.125rem !default; // 2px -$badge-lexicon-icon-height: 0.8125em !default; +$badge-lexicon-icon-height: 0.875em !default; $badge-lexicon-icon-margin-top: 0 !default; -$badge-lexicon-icon-width: 0.8125em !default; +$badge-lexicon-icon-width: 0.875em !default; +$badge-item-expand-min-width: 0.375rem !default; $badge-item-spacer-x: 0.5em !default; $badge-link-color: #FFF !default; diff --git a/packages/clay/src/scss/variables/_forms.scss b/packages/clay/src/scss/variables/_forms.scss index 227fb593b4..7bd28c2022 100644 --- a/packages/clay/src/scss/variables/_forms.scss +++ b/packages/clay/src/scss/variables/_forms.scss @@ -54,11 +54,12 @@ $input-readonly-cursor: null !default; $input-textarea-height: 150px !default; -// Form Control Label (Labels inside Form Control) +// Form Control Label (Labels inside Form Control Tag Group) $form-control-label-size: () !default; $form-control-label-size: map-merge(( - height: 1.25rem + border-width: 0.0625rem, // 1px + height: 1.25rem // 20px ), $form-control-label-size); // Form Control Tag Group diff --git a/packages/clay/src/scss/variables/_labels.scss b/packages/clay/src/scss/variables/_labels.scss index 1ac773ba92..dad89fa651 100644 --- a/packages/clay/src/scss/variables/_labels.scss +++ b/packages/clay/src/scss/variables/_labels.scss @@ -3,9 +3,10 @@ $label-link-hover-color: #FFF !default; $label-font-size: 75% !default; $label-font-weight: $font-weight-bold !default; -$label-height: 1.25rem !default; // 20px +$label-height: null !default; +$label-line-height: 1 !default; $label-padding-x: 0.4375rem !default; // 7px -$label-padding-y: null !default; // 3px +$label-padding-y: 0.1875rem !default; // 3px $label-spacer-x: 0.25rem !default; // 4px $label-spacer-y: 0.125rem !default; // 2px $label-text-transform: null !default; @@ -50,8 +51,8 @@ $label-close: map-merge(( $label-lg: () !default; $label-lg: map-merge(( font-size: 0.875rem, // 14px - height: 1.875rem, // 30px padding-x: 1rem, // 16px + padding-y: 0.375rem, // 6px text-transform: none ), $label-lg); From 4c3d1f1b36251982f7897be161d150896bba15ff Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Mon, 16 Apr 2018 09:51:21 -0700 Subject: [PATCH 2/6] Site: (#798) Update Label and Badges to break to new line by default and add examples of truncating text --- .../clay/src/content/badges_and_labels.html | 323 ++++++++---------- packages/clay/src/content/cards.html | 44 ++- .../content/form_elements_input_groups.html | 168 +++++---- packages/clay/src/content/grid.html | 4 +- packages/clay/src/content/list_groups.html | 16 +- packages/clay/src/content/nav-pills.html | 4 +- packages/clay/src/content/sidebar.html | 32 +- .../src/content/test_card_view_template.html | 44 ++- .../test_card_view_template_info_panel.html | 44 ++- .../src/content/test_list_view_template.html | 40 ++- .../test_list_view_template_info_panel.html | 40 ++- .../content/test_localizable_input_field.html | 48 ++- .../src/content/test_table_view_template.html | 40 ++- .../test_table_view_template_info_panel.html | 40 ++- packages/clay/src/content/utilities.html | 36 +- 15 files changed, 559 insertions(+), 364 deletions(-) diff --git a/packages/clay/src/content/badges_and_labels.html b/packages/clay/src/content/badges_and_labels.html index f32fb541dd..5beac3632d 100644 --- a/packages/clay/src/content/badges_and_labels.html +++ b/packages/clay/src/content/badges_and_labels.html @@ -8,89 +8,61 @@

Badges

- - 8 - + 8 - - 87 - + 87 - - 999K - + 999K - - 91 - + 91 - - 21 - + 21 + + + 130 -130
- - 130 - + 130
- - 130 - + 130
- - Primary - + Primary - - Secondary - + Secondary - - Success - + Success - - Info - + Info - - Warning - + Warning - - Danger - + Danger
- - Light - + Light
- - Dark - + Dark
@@ -100,90 +72,58 @@

Badges

Badge Pill

- - 8 - + 8 - - 87 - + 87 - - 999K - + 999K - - 91 - + 91 - - 21 - + 21 - - 130 - + 130
- - 130 - + 130
- - 130 - + 130
- - Primary - + Primary - - Secondary - + Secondary - - Success - + Success - - Info - + Info - - Warning - + Warning - - Danger - + Danger
- - Light - + Light
- - Dark - + Dark
@@ -193,46 +133,30 @@

Badge Pill

Badges as Anchor Tag

- - Primary - + Primary - - Secondary - + Secondary - - Success - + Success - - Info - + Info - - Warning - + Warning - - Danger - + Danger
- - Light - + Light
- - Dark - + Dark @@ -241,6 +165,44 @@

Badges as Anchor Tag

Badge with Links Inside

+ + + + + + + + + + + ReallySuperInsanelyJustIncrediblyLongAndTotallyNotPossibleWordButWeAre + + + + + + + + +
+ + +
+
+

Badge with Text Truncate

+ @@ -258,7 +220,7 @@

Badge with Links Inside

 - Badge + ReallySuperInsanelyJustIncrediblyLongAndTotallyNotPossibleWordButWeAre @@ -292,47 +254,31 @@

Badge Sizes

Labels

- - Primary - + Primary - - Secondary - + Secondary - - Success - + Success - - Info - + Info - - Warning - + Warning - - Danger - + Danger
- - Light - + Light
- - Dark - + Dark
@@ -349,16 +295,14 @@

Label Dismissible

- + - - - Normal Label - - + Normal Label + + + + +

Labels as an Anchor Tag

- - Primary - + Primary - - Secondary - + Secondary - - Success - + Success - - Info - + Info - - Warning - + Warning - - Danger - + Danger
- - Light - + Light
- - Dark - + Dark
@@ -458,14 +413,10 @@

Label Sizes

- - Normal Label - + Normal Label - - Large Label - + Large Label diff --git a/packages/clay/src/content/cards.html b/packages/clay/src/content/cards.html index 24b0e42203..b742c588e2 100644 --- a/packages/clay/src/content/cards.html +++ b/packages/clay/src/content/cards.html @@ -62,7 +62,9 @@

- Approved + + Approved +
@@ -140,7 +142,9 @@

- Approved + + Approved +
@@ -228,7 +232,9 @@

- Approved + + Approved +
@@ -286,7 +292,9 @@

- Approved + + Approved +
@@ -326,7 +334,9 @@

- Approved + + Approved +
@@ -1182,7 +1192,9 @@

- Approved + + Approved +
@@ -1282,7 +1294,9 @@

- Approved + + Approved +
@@ -1402,7 +1416,9 @@

- Approved + + Approved +
@@ -1503,7 +1519,9 @@

- Approved + + Approved +
@@ -1627,7 +1645,9 @@

- Approved + + Approved +
@@ -1794,7 +1814,9 @@

- Approved + + Approved +
diff --git a/packages/clay/src/content/form_elements_input_groups.html b/packages/clay/src/content/form_elements_input_groups.html index 3dcb192062..267daf7eb0 100644 --- a/packages/clay/src/content/form_elements_input_groups.html +++ b/packages/clay/src/content/form_elements_input_groups.html @@ -176,7 +176,9 @@

Input Group (Mixed)

en-US - Default + + Default +
  • @@ -187,7 +189,9 @@

    Input Group (Mixed)

    en-GB - Translated + + Translated +
  • @@ -198,7 +202,9 @@

    Input Group (Mixed)

    es-ES - Translated + + Translated +
  • @@ -209,7 +215,9 @@

    Input Group (Mixed)

    fr-FR - Not Translated + + Not Translated +
    • @@ -753,7 +761,7 @@

    Form Control Tag Group

    - This component requires custom javascript. The class focus must be managed when interacting with this component. It must be added/removed on input-group-item when any item in form-control-tag-group is focused/blurred.

    + This component requires custom javascript. The class focus must be managed when interacting with this component. It must be added/removed on form-control-tag-group when any item in form-control-tag-group is focused/blurred.

    If form-control-tag-group is clicked, form-control-inset must be focused.
    @@ -782,44 +790,54 @@

    Form Control Tag Group

    - wall - + wall + + + - wallpaper - + wallpaper + + + - wonderwall - + wonderwall + + + - winterfell - + winterfell + + + - kings landing - + ReallySuperInsanelyJustIncrediblyLongAndTotallyNotPossibleWordButWeAre + + +
    @@ -879,44 +897,54 @@

    Form Control Tag Group With Contenteditable Elements

    - wall - + wall + + + - wallpaper - + wallpaper + + + - wonderwall - + wonderwall + + + - winterfell - + winterfell + + + - kings landing - + kings landing + + + some value @@ -940,23 +968,23 @@

    Form Control Tag Group With Contenteditable Elements

    }); $('.form-control-inset').on('focusin', function(event) { - $(this).closest('.input-group-item').addClass('focus'); + $(this).closest('.form-control-tag-group').addClass('focus'); }); $('.form-control-inset').on('focusout', function(event) { - $(this).closest('.input-group-item').removeClass('focus'); + $(this).closest('.form-control-tag-group').removeClass('focus'); }); $('.form-control-tag-group .label button').on('focus', function(event) { - $(this).closest('.input-group-item').addClass('focus'); + $(this).closest('.form-control-tag-group').addClass('focus'); }); $('.form-control-tag-group .label button').on('blur', function(event) { - $(this).closest('.input-group-item').removeClass('focus'); + $(this).closest('.form-control-tag-group').removeClass('focus'); }); $('.form-control-hidden').on('focus', function(event) { - $(this).closest('.input-group-item').find('form-control-inset').focus(); + $(this).closest('.form-control-tag-group').find('form-control-inset').focus(); }); $('.form-control-hidden').on('focus', function(event) { diff --git a/packages/clay/src/content/grid.html b/packages/clay/src/content/grid.html index ebdaba73c0..35f68c8bf3 100644 --- a/packages/clay/src/content/grid.html +++ b/packages/clay/src/content/grid.html @@ -314,7 +314,9 @@

    Application

    700KB - Approved + + Approved + 6 days ago 4 days ago diff --git a/packages/clay/src/content/list_groups.html b/packages/clay/src/content/list_groups.html index 997d9e0d30..deea5d6ae7 100644 --- a/packages/clay/src/content/list_groups.html +++ b/packages/clay/src/content/list_groups.html @@ -366,7 +366,9 @@

    - Pending + + Pending +

    @@ -425,7 +427,9 @@

    List Group Subtext

    - Info + + Info +
    @@ -549,7 +553,9 @@

    - Approved + + Approved +

    @@ -608,7 +614,9 @@

    List Group Subtext

    - Approved + + Approved +
    diff --git a/packages/clay/src/content/nav-pills.html b/packages/clay/src/content/nav-pills.html index 6b0ab84ee2..60e2c3e49e 100644 --- a/packages/clay/src/content/nav-pills.html +++ b/packages/clay/src/content/nav-pills.html @@ -78,7 +78,9 @@

    Vertical Nav Pills

  • Fields with Badge - 2 + + 2 +
  • Settings
    • diff --git a/packages/clay/src/content/sidebar.html b/packages/clay/src/content/sidebar.html index f8e3f4db3c..e1b75522fd 100644 --- a/packages/clay/src/content/sidebar.html +++ b/packages/clay/src/content/sidebar.html @@ -157,14 +157,30 @@

    2.0
    Tags
    - Tag One - Tag Two - Tag Three - Tag Four - Tag Five - Tag Six - Tag Seven - Tag Eight + + Tag One + + + Tag Two + + + Tag Three + + + Tag Four + + + Tag Five + + + Tag Six + + + Tag Seven + + + Tag Eight +
    Related Assets
    diff --git a/packages/clay/src/content/test_card_view_template.html b/packages/clay/src/content/test_card_view_template.html index f59a1afb6e..4a0a9a2d9d 100644 --- a/packages/clay/src/content/test_card_view_template.html +++ b/packages/clay/src/content/test_card_view_template.html @@ -340,14 +340,30 @@

    2.0
    Tags
    - Tag One - Tag Two - Tag Three - Tag Four - Tag Five - Tag Six - Tag Seven - Tag Eight + + Tag One + + + Tag Two + + + Tag Three + + + Tag Four + + + Tag Five + + + Tag Six + + + Tag Seven + + + Tag Eight +
    Related Assets
    @@ -757,7 +773,9 @@

    - Approved + + Approved +
    @@ -811,7 +829,9 @@

    - Approved + + Approved +
    @@ -864,7 +884,9 @@

    - Approved + + Approved +
    diff --git a/packages/clay/src/content/test_card_view_template_info_panel.html b/packages/clay/src/content/test_card_view_template_info_panel.html index 3e6b0d81a0..2356cb5c6b 100644 --- a/packages/clay/src/content/test_card_view_template_info_panel.html +++ b/packages/clay/src/content/test_card_view_template_info_panel.html @@ -266,14 +266,30 @@

    2.0
    Tags
    - Tag One - Tag Two - Tag Three - Tag Four - Tag Five - Tag Six - Tag Seven - Tag Eight + + Tag One + + + Tag Two + + + Tag Three + + + Tag Four + + + Tag Five + + + Tag Six + + + Tag Seven + + + Tag Eight +
    Related Assets
    @@ -677,7 +693,9 @@

    - Approved + + Approved +

    @@ -731,7 +749,9 @@

    - Approved + + Approved +
    @@ -784,7 +804,9 @@

    - Approved + + Approved +
    diff --git a/packages/clay/src/content/test_list_view_template.html b/packages/clay/src/content/test_list_view_template.html index b33dfb9775..c7a5228381 100644 --- a/packages/clay/src/content/test_list_view_template.html +++ b/packages/clay/src/content/test_list_view_template.html @@ -340,14 +340,30 @@

    2.0
    Tags
    - Tag One - Tag Two - Tag Three - Tag Four - Tag Five - Tag Six - Tag Seven - Tag Eight + + Tag One + + + Tag Two + + + Tag Three + + + Tag Four + + + Tag Five + + + Tag Six + + + Tag Seven + + + Tag Eight +
    Related Assets
    @@ -587,7 +603,9 @@

    Second Level Text

    - Pending + + Pending +

    @@ -646,7 +664,9 @@

    Second Level Text

    - Info + + Info +
    diff --git a/packages/clay/src/content/test_list_view_template_info_panel.html b/packages/clay/src/content/test_list_view_template_info_panel.html index ebfb3ec58b..8e1e0e69b1 100644 --- a/packages/clay/src/content/test_list_view_template_info_panel.html +++ b/packages/clay/src/content/test_list_view_template_info_panel.html @@ -264,14 +264,30 @@

    2.0
    Tags
    - Tag One - Tag Two - Tag Three - Tag Four - Tag Five - Tag Six - Tag Seven - Tag Eight + + Tag One + + + Tag Two + + + Tag Three + + + Tag Four + + + Tag Five + + + Tag Six + + + Tag Seven + + + Tag Eight +
    Related Assets
    @@ -511,7 +527,9 @@

    Second Level Text

    - Pending + + Pending +
    @@ -570,7 +588,9 @@

    Second Level Text

    - Info + + Info +
    diff --git a/packages/clay/src/content/test_localizable_input_field.html b/packages/clay/src/content/test_localizable_input_field.html index c9de863e38..374aa582dd 100644 --- a/packages/clay/src/content/test_localizable_input_field.html +++ b/packages/clay/src/content/test_localizable_input_field.html @@ -40,7 +40,9 @@

    Localizable Input Fields

    en-US - Default + + Default +
  • @@ -51,7 +53,9 @@

    Localizable Input Fields

    en-GB - Translated + + Translated +
  • @@ -62,7 +66,9 @@

    Localizable Input Fields

    es-ES - Translated + + Translated +
  • @@ -73,7 +79,9 @@

    Localizable Input Fields

    fr-FR - Not Translated + + Not Translated +
    • @@ -111,7 +119,9 @@

    Localizable Input Fields

    en-US - Default + + Default +
  • @@ -122,7 +132,9 @@

    Localizable Input Fields

    en-GB - Translated + + Translated +
  • @@ -133,7 +145,9 @@

    Localizable Input Fields

    es-ES - Translated + + Translated +
  • @@ -144,7 +158,9 @@

    Localizable Input Fields

    fr-FR - Not Translated + + Not Translated +
    • @@ -182,7 +198,9 @@

    Localizable Input Fields

    en-US - Default + + Default +
  • @@ -193,7 +211,9 @@

    Localizable Input Fields

    en-GB - Translated + + Translated +
  • @@ -204,7 +224,9 @@

    Localizable Input Fields

    es-ES - Translated + + Translated +
  • @@ -215,7 +237,9 @@

    Localizable Input Fields

    fr-FR - Not Translated + + Not Translated +
    • diff --git a/packages/clay/src/content/test_table_view_template.html b/packages/clay/src/content/test_table_view_template.html index 9b8eec652d..74fe2793bf 100644 --- a/packages/clay/src/content/test_table_view_template.html +++ b/packages/clay/src/content/test_table_view_template.html @@ -340,14 +340,30 @@

    2.0
    Tags
    - Tag One - Tag Two - Tag Three - Tag Four - Tag Five - Tag Six - Tag Seven - Tag Eight + + Tag One + + + Tag Two + + + Tag Three + + + Tag Four + + + Tag Five + + + Tag Six + + + Tag Seven + + + Tag Eight +
    Related Assets
    @@ -497,7 +513,9 @@

    700KB - Approved + + Approved + 6 days ago 4 days ago @@ -597,7 +615,9 @@

    - In Progress + + In Progress + 100,000 2017.11.24 - 17:15 diff --git a/packages/clay/src/content/test_table_view_template_info_panel.html b/packages/clay/src/content/test_table_view_template_info_panel.html index 8ff52e8428..b4afc786a0 100644 --- a/packages/clay/src/content/test_table_view_template_info_panel.html +++ b/packages/clay/src/content/test_table_view_template_info_panel.html @@ -264,14 +264,30 @@

    2.0
    Tags
    - Tag One - Tag Two - Tag Three - Tag Four - Tag Five - Tag Six - Tag Seven - Tag Eight + + Tag One + + + Tag Two + + + Tag Three + + + Tag Four + + + Tag Five + + + Tag Six + + + Tag Seven + + + Tag Eight +
    Related Assets
    @@ -421,7 +437,9 @@

    700KB - Approved + + Approved + 6 days ago 4 days ago @@ -521,7 +539,9 @@

    - In Progress + + In Progress + 100,000 2017.11.24 - 17:15 diff --git a/packages/clay/src/content/utilities.html b/packages/clay/src/content/utilities.html index 35fef015e8..22ca9bc987 100644 --- a/packages/clay/src/content/utilities.html +++ b/packages/clay/src/content/utilities.html @@ -80,9 +80,15 @@

    ReallySuperInsanelyJustIncrediblyLongAndTotallyNotPossibleWordButWeAreReallyTryingToCoverAllOurBasesHereJustInCaseSomeoneIsNutsAsPerUsual

    - Approved - Pending - Rejected + + Approved + + + Pending + + + Rejected +
    @@ -99,9 +105,15 @@
    ReallySuperInsanelyJustIncrediblyLongAndTotallyNotPossibleWordButWeAreReallyTryingToCoverAllOurBasesHereJustInCaseSomeoneIsNutsAsPerUsual

    - Approved - Pending - Rejected + + Approved + + + Pending + + + Rejected +
    @@ -118,9 +130,15 @@
    ReallySuperInsanelyJustIncrediblyLongAndTotallyNotPossibleWordButWeAreReallyTryingToCoverAllOurBasesHereJustInCaseSomeoneIsNutsAsPerUsual

    - Approved - Pending - Rejected + + Approved + + + Pending + + + Rejected +
    From fb9f211d0f0c5f0730741a10182dff1d653ce74f Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Mon, 16 Apr 2018 10:28:50 -0700 Subject: [PATCH 3/6] Update: (#798) Atlas Badges adjust padding-y so badges are 16px tall --- packages/clay/src/scss/atlas/variables/_badges.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/clay/src/scss/atlas/variables/_badges.scss b/packages/clay/src/scss/atlas/variables/_badges.scss index 75116ffa33..d10431cd75 100644 --- a/packages/clay/src/scss/atlas/variables/_badges.scss +++ b/packages/clay/src/scss/atlas/variables/_badges.scss @@ -3,7 +3,7 @@ $badge-font-size: 0.625rem !default; // 10px $badge-font-weight: $font-weight-semi-bold !default; $badge-line-height: 1.1 !default; $badge-padding-x: 0.25rem !default; // 4px -$badge-padding-y: 0.0625rem !default; // 1px +$badge-padding-y: 0.09375rem !default; // 1.5px $badge-item-spacer-x: 0.85714em !default; From c7c28b06cf74fac56d8298bec87a8310f42658c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matuzale=CC=81m=20S=2E=20Teles?= Date: Tue, 17 Apr 2018 20:02:26 -0300 Subject: [PATCH 4/6] Update the ClayLabel and ClayBadge markups | Fixes #798 --- packages/clay-badge/src/ClayBadge.soy | 4 +--- packages/clay-label/src/ClayLabel.soy | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/packages/clay-badge/src/ClayBadge.soy b/packages/clay-badge/src/ClayBadge.soy index 8dafaf886a..18bb84b085 100644 --- a/packages/clay-badge/src/ClayBadge.soy +++ b/packages/clay-badge/src/ClayBadge.soy @@ -24,8 +24,6 @@ {/let} - - {$label} - + {$label} {/template} diff --git a/packages/clay-label/src/ClayLabel.soy b/packages/clay-label/src/ClayLabel.soy index 8a51ddd1fa..8ce2594e7e 100644 --- a/packages/clay-label/src/ClayLabel.soy +++ b/packages/clay-label/src/ClayLabel.soy @@ -58,24 +58,20 @@ {@param? spritemap: string} {let $labelContent kind="html"} - - - {if $href} - {call ClayLink.render} - {param href: $href /} - {param label: $label /} - {/call} - {else} - {$label} - {/if} - + + {if $href} + {call ClayLink.render} + {param href: $href /} + {param label: $label /} + {/call} + {else} + {$label} + {/if} {/let} {if $closeable and $spritemap} - - {$labelContent} - + {$labelContent} {call ClayButton.render} From 47af17e79aed87f67dd112f8965614dbbea552df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matuzale=CC=81m=20S=2E=20Teles?= Date: Tue, 17 Apr 2018 20:09:29 -0300 Subject: [PATCH 5/6] Regen snapshots | Fixes #798 --- .../__tests__/__snapshots__/ClayBadge.js.snap | 44 +--- .../__snapshots__/ClayCardGrid.js.snap | 24 +- .../__snapshots__/ClayFileCard.js.snap | 52 ++--- .../__snapshots__/ClayImageCard.js.snap | 52 ++--- .../__snapshots__/ClayDatasetDisplay.js.snap | 216 +++++------------- .../__tests__/__snapshots__/ClayLabel.js.snap | 52 ++--- .../__tests__/__snapshots__/ClayList.js.snap | 48 +--- .../__tests__/__snapshots__/ClayTable.js.snap | 48 +--- 8 files changed, 134 insertions(+), 402 deletions(-) diff --git a/packages/clay-badge/src/__tests__/__snapshots__/ClayBadge.js.snap b/packages/clay-badge/src/__tests__/__snapshots__/ClayBadge.js.snap index 5db61add5e..d9f47c5a23 100644 --- a/packages/clay-badge/src/__tests__/__snapshots__/ClayBadge.js.snap +++ b/packages/clay-badge/src/__tests__/__snapshots__/ClayBadge.js.snap @@ -2,88 +2,66 @@ exports[`ClayBadge should render a \`danger color\` badge 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a \`default color\` badge 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a \`info color\` badge 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a \`primary color\` badge 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a \`secondary color\` badge 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a \`success color\` badge 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a \`warning color\` badge 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a badge with classes 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a badge with id 1`] = ` - - Foo - + Foo `; exports[`ClayBadge should render a badge with label 1`] = ` - - Bar - + Bar `; exports[`ClayBadge should render the default markup 1`] = ` - - Foo - + Foo `; diff --git a/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap b/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap index 8105585798..fd67f11906 100644 --- a/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap +++ b/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap @@ -74,9 +74,7 @@ exports[`ClayCardGrid should render the default markup 1`] = `
    U.S.A
    - - No Spicy - + No Spicy
    @@ -99,9 +97,7 @@ exports[`ClayCardGrid should render the default markup 1`] = `
    China
    - - Spicy - + Spicy
    @@ -124,9 +120,7 @@ exports[`ClayCardGrid should render the default markup 1`] = `
    Spain
    - - No Spicy - + No Spicy
    @@ -154,9 +148,7 @@ exports[`ClayCardGrid should render the default markup 1`] = `
    Italy
    - - No Spicy - + No Spicy
    @@ -179,9 +171,7 @@ exports[`ClayCardGrid should render the default markup 1`] = `
    Toledo
    - - Spicy - + Spicy
    @@ -209,9 +199,7 @@ exports[`ClayCardGrid should render the default markup 1`] = `
    Mexico
    - - Very Spicy - + Very Spicy
    diff --git a/packages/clay-card/src/__tests__/__snapshots__/ClayFileCard.js.snap b/packages/clay-card/src/__tests__/__snapshots__/ClayFileCard.js.snap index 4d3166f27c..91bbbb9879 100644 --- a/packages/clay-card/src/__tests__/__snapshots__/ClayFileCard.js.snap +++ b/packages/clay-card/src/__tests__/__snapshots__/ClayFileCard.js.snap @@ -136,9 +136,7 @@ exports[`ClayFileCard should render a ClayFileCard with labelStyle \`danger colo
    My Title
    - - Approved - + Approved
    @@ -163,9 +161,7 @@ exports[`ClayFileCard should render a ClayFileCard with labelStyle \`info color\
    My Title
    - - Approved - + Approved
    @@ -190,9 +186,7 @@ exports[`ClayFileCard should render a ClayFileCard with labelStyle \`secondary c
    My Title
    - - Approved - + Approved
    @@ -217,9 +211,7 @@ exports[`ClayFileCard should render a ClayFileCard with labelStyle \`success col
    My Title
    - - Approved - + Approved
    @@ -244,9 +236,7 @@ exports[`ClayFileCard should render a ClayFileCard with labelStyle \`warning col
    My Title
    - - Approved - + Approved
    @@ -271,19 +261,13 @@ exports[`ClayFileCard should render a ClayFileCard with labels with styles mappe
    My Title
    - - Approved - + Approved - - Pending - + Pending - - Error - + Error
    @@ -308,9 +292,7 @@ exports[`ClayFileCard should render a ClayFileCard with one label 1`] = `
    My Title
    - - Approved - + Approved
    @@ -609,14 +591,10 @@ exports[`ClayFileCard should render a ClayFileCard with two labels 1`] = `
    My Title
    - - Approved - + Approved - - Pending - + Pending
    @@ -641,14 +619,10 @@ exports[`ClayFileCard should render a ClayFileCard with two labels with styles 1
    My Title
    - - Approved - + Approved - - Pending - + Pending
    diff --git a/packages/clay-card/src/__tests__/__snapshots__/ClayImageCard.js.snap b/packages/clay-card/src/__tests__/__snapshots__/ClayImageCard.js.snap index 5aef9bb4a6..97af41aabc 100644 --- a/packages/clay-card/src/__tests__/__snapshots__/ClayImageCard.js.snap +++ b/packages/clay-card/src/__tests__/__snapshots__/ClayImageCard.js.snap @@ -129,9 +129,7 @@ exports[`ClayImageCard should render a ClayImageCard with labelStyle \`danger co
    My Title
    - - Approved - + Approved
    @@ -149,9 +147,7 @@ exports[`ClayImageCard should render a ClayImageCard with labelStyle \`info colo
    My Title
    - - Approved - + Approved
    @@ -169,9 +165,7 @@ exports[`ClayImageCard should render a ClayImageCard with labelStyle \`secondary
    My Title
    - - Approved - + Approved
    @@ -189,9 +183,7 @@ exports[`ClayImageCard should render a ClayImageCard with labelStyle \`success c
    My Title
    - - Approved - + Approved
    @@ -209,9 +201,7 @@ exports[`ClayImageCard should render a ClayImageCard with labelStyle \`warning c
    My Title
    - - Approved - + Approved
    @@ -229,19 +219,13 @@ exports[`ClayImageCard should render a ClayImageCard with labels with styles map
    My Title
    - - Approved - + Approved - - Pending - + Pending - - Error - + Error
    @@ -259,9 +243,7 @@ exports[`ClayImageCard should render a ClayImageCard with one label 1`] = `
    My Title
    - - Approved - + Approved
    @@ -480,14 +462,10 @@ exports[`ClayImageCard should render a ClayImageCard with two labels 1`] = `
    My Title
    - - Approved - + Approved - - Pending - + Pending
    @@ -505,14 +483,10 @@ exports[`ClayImageCard should render a ClayImageCard with two labels with styles
    My Title
    - - Approved - + Approved - - Peding - + Peding
    diff --git a/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap b/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap index 7f425c12f0..97d00c87c6 100644 --- a/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap +++ b/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap @@ -226,9 +226,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 10 min. - - No Spicy - + No Spicy @@ -267,9 +265,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 90 min. - - Spicy - + Spicy @@ -308,9 +304,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 90 min. - - No Spicy - + No Spicy @@ -349,9 +343,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 30 min. - - No Spicy - + No Spicy @@ -390,9 +382,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 50 min. - - Spicy - + Spicy @@ -431,9 +421,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 30 min. - - Very Spicy - + Very Spicy @@ -969,9 +957,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 10 min. - - No Spicy - + No Spicy @@ -1010,9 +996,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 90 min. - - Spicy - + Spicy @@ -1051,9 +1035,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 90 min. - - No Spicy - + No Spicy @@ -1092,9 +1074,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 30 min. - - No Spicy - + No Spicy @@ -1133,9 +1113,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 50 min. - - Spicy - + Spicy @@ -1174,9 +1152,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 30 min. - - Very Spicy - + Very Spicy @@ -1712,9 +1688,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 10 min. - - No Spicy - + No Spicy @@ -1753,9 +1727,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 90 min. - - Spicy - + Spicy @@ -1794,9 +1766,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 90 min. - - No Spicy - + No Spicy @@ -1835,9 +1805,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 30 min. - - No Spicy - + No Spicy @@ -1876,9 +1844,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 50 min. - - Spicy - + Spicy @@ -1917,9 +1883,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o 30 min. - - Very Spicy - + Very Spicy @@ -3183,9 +3147,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
    U.S.A
    - - No Spicy - + No Spicy
    @@ -3226,9 +3188,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
    China
    - - Spicy - + Spicy
    @@ -3269,9 +3229,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
    Spain
    - - No Spicy - + No Spicy
    @@ -3317,9 +3275,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
    Italy
    - - No Spicy - + No Spicy
    @@ -3360,9 +3316,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
    Toledo
    - - Spicy - + Spicy
    @@ -3408,9 +3362,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
    Mexico
    - - Very Spicy - + Very Spicy
    @@ -4117,9 +4069,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li

    U.S.A

    - - No Spicy - + No Spicy
    @@ -4176,9 +4126,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li

    China

    - - Spicy - + Spicy
    @@ -4235,9 +4183,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li

    Spain

    - - No Spicy - + No Spicy
    @@ -4294,9 +4240,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li

    Italy

    - - No Spicy - + No Spicy
    @@ -4353,9 +4297,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li

    Toledo

    - - Spicy - + Spicy
    @@ -4412,9 +4354,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li

    Mexico

    - - Very Spicy - + Very Spicy
    @@ -5158,9 +5098,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li 10 min. - - No Spicy - + No Spicy @@ -5199,9 +5137,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li 90 min. - - Spicy - + Spicy @@ -5240,9 +5176,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li 90 min. - - No Spicy - + No Spicy @@ -5281,9 +5215,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li 30 min. - - No Spicy - + No Spicy @@ -5322,9 +5254,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li 50 min. - - Spicy - + Spicy @@ -5363,9 +5293,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li 30 min. - - Very Spicy - + Very Spicy @@ -6239,9 +6167,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected gro 10 min. - - No Spicy - + No Spicy @@ -6280,9 +6206,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected gro 90 min. - - Spicy - + Spicy @@ -6321,9 +6245,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected gro 90 min. - - No Spicy - + No Spicy @@ -6362,9 +6284,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected gro 30 min. - - No Spicy - + No Spicy @@ -6403,9 +6323,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected gro 50 min. - - Spicy - + Spicy @@ -6444,9 +6362,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected gro 30 min. - - Very Spicy - + Very Spicy @@ -6696,9 +6612,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected ite 10 min. - - No Spicy - + No Spicy @@ -6737,9 +6651,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected ite 90 min. - - Spicy - + Spicy @@ -6778,9 +6690,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected ite 90 min. - - No Spicy - + No Spicy @@ -6819,9 +6729,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected ite 30 min. - - No Spicy - + No Spicy @@ -6860,9 +6768,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected ite 50 min. - - Spicy - + Spicy @@ -6901,9 +6807,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected ite 30 min. - - Very Spicy - + Very Spicy @@ -7090,9 +6994,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it 10 min. - - No Spicy - + No Spicy @@ -7131,9 +7033,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it 90 min. - - Spicy - + Spicy @@ -7172,9 +7072,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it 90 min. - - No Spicy - + No Spicy @@ -7213,9 +7111,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it 30 min. - - No Spicy - + No Spicy @@ -7254,9 +7150,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it 50 min. - - Spicy - + Spicy @@ -7295,9 +7189,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it 30 min. - - Very Spicy - + Very Spicy diff --git a/packages/clay-label/src/__tests__/__snapshots__/ClayLabel.js.snap b/packages/clay-label/src/__tests__/__snapshots__/ClayLabel.js.snap index 5c9220b461..a10eb83dc4 100644 --- a/packages/clay-label/src/__tests__/__snapshots__/ClayLabel.js.snap +++ b/packages/clay-label/src/__tests__/__snapshots__/ClayLabel.js.snap @@ -2,85 +2,63 @@ exports[`ClayLabel should render a \`danger color\` label 1`] = ` - - - + `; exports[`ClayLabel should render a \`default color\` label 1`] = ` - - - + `; exports[`ClayLabel should render a \`info color\` label 1`] = ` - - - + `; exports[`ClayLabel should render a \`success color\` label 1`] = ` - - - + `; exports[`ClayLabel should render a \`warning color\` label 1`] = ` - - - + `; exports[`ClayLabel should render a label with classes 1`] = ` - - - + `; exports[`ClayLabel should render a label with id 1`] = ` - - - + `; exports[`ClayLabel should render a label with label 1`] = ` - - Foo - + Foo `; exports[`ClayLabel should render a label with link 1`] = ` - - - Foo - + + Foo `; exports[`ClayLabel should render a label with removable 1`] = ` - - - Foo - - + Foo
    \ No newline at end of file +
    Clay Card Base Title
    clay-card-base-subtitle
    clay-card-base-label-1 clay-card-base-label-2
    \ No newline at end of file diff --git a/packages/clay-isomorphic/fixtures/expected/ClayCardGrid.items b/packages/clay-isomorphic/fixtures/expected/ClayCardGrid.items index c9f996c244..1a2e08a2a3 100644 --- a/packages/clay-isomorphic/fixtures/expected/ClayCardGrid.items +++ b/packages/clay-isomorphic/fixtures/expected/ClayCardGrid.items @@ -1 +1 @@ -

  • Folders

  • Photos
  • Videos

  • Recipes

  • PDF
    Hamburger
    U.S.A
    No Spicy
  • RamenPDF
    Ramen
    China
    Spicy
  • PaellaPDF
    Paella
    Spain
    No Spicy
  • PDF
    Pizza
    Italy
    No Spicy
  • CarcamusasPDF
    Carcamusas
    Toledo
    Spicy
  • PDF
    Tacos
    Mexico
    Very Spicy

  • Chefs

  • FA
    Ferrán Adriá
  • AC
    Alberto Chicote
    • \ No newline at end of file +

  • Folders

  • Photos
  • Videos

  • Recipes

  • PDF
    Hamburger
    U.S.A
    No Spicy
  • RamenPDF
    Ramen
    China
    Spicy
  • PaellaPDF
    Paella
    Spain
    No Spicy
  • PDF
    Pizza
    Italy
    No Spicy
  • CarcamusasPDF
    Carcamusas
    Toledo
    Spicy
  • PDF
    Tacos
    Mexico
    Very Spicy

  • Chefs

  • FA
    Ferrán Adriá
  • AC
    Alberto Chicote
    • \ No newline at end of file diff --git a/packages/clay-isomorphic/fixtures/expected/ClayFileCard.render b/packages/clay-isomorphic/fixtures/expected/ClayFileCard.render index 970f179e6c..e15ea88a87 100644 --- a/packages/clay-isomorphic/fixtures/expected/ClayFileCard.render +++ b/packages/clay-isomorphic/fixtures/expected/ClayFileCard.render @@ -1 +1 @@ -
    Clay File Card Title
    Clay File Card Subtitle
    clay-file-card-label-1 clay-file-card-label-2
    \ No newline at end of file +
    Clay File Card Title
    Clay File Card Subtitle
    clay-file-card-label-1 clay-file-card-label-2
    \ No newline at end of file diff --git a/packages/clay-isomorphic/fixtures/expected/ClayLabel.content b/packages/clay-isomorphic/fixtures/expected/ClayLabel.content index 373bb8b965..ecfd99c2b5 100644 --- a/packages/clay-isomorphic/fixtures/expected/ClayLabel.content +++ b/packages/clay-isomorphic/fixtures/expected/ClayLabel.content @@ -1 +1 @@ -Clay Label \ No newline at end of file +Clay Label \ No newline at end of file diff --git a/packages/clay-isomorphic/fixtures/expected/ClayLabel.render b/packages/clay-isomorphic/fixtures/expected/ClayLabel.render index fa885fd073..17af1e7aec 100644 --- a/packages/clay-isomorphic/fixtures/expected/ClayLabel.render +++ b/packages/clay-isomorphic/fixtures/expected/ClayLabel.render @@ -1 +1 @@ -Clay Label \ No newline at end of file +Clay Label \ No newline at end of file