Skip to content

Commit

Permalink
Merge pull request #978 from liferay/develop
Browse files Browse the repository at this point in the history
v2.1.7
  • Loading branch information
jbalsas authored Jun 8, 2018
2 parents ffa0f75 + 053b022 commit f91f880
Show file tree
Hide file tree
Showing 51 changed files with 502 additions and 261 deletions.
9 changes: 9 additions & 0 deletions packages/clay-button/src/ClayButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,15 @@ ClayButton.STATE = {
'primary'
),

/**
* The title attribute of the element.
* @default undefined
* @instance
* @memberof ClayButton
* @type {?(string|undefined)}
*/
title: Config.string(),

/**
* The type attribute value of the element.
* @default button
Expand Down
5 changes: 5 additions & 0 deletions packages/clay-button/src/ClayButton.soy
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
{@param? size: string}
{@param? spritemap: string}
{@param? style: string}
{@param? title: string}
{@param? type: string}
{@param? value: string}

Expand Down Expand Up @@ -65,6 +66,10 @@
name="{$name}"
{/if}

{if $title}
title="{$title}"
{/if}

{if $value}
value="{$value}"
{/if}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`ClayFileCard should render a ClayFileCard with actionItems 1`] = `
</div>
<div class="autofit-col">
<div class="dropdown dropdown-action">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" type="button">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" title="actions" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-ellipsis-v" focusable="false">
<title>ellipsis-v</title>
<use xlink:href="icons.svg#ellipsis-v"></use>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ exports[`ClayHorizontalCard should render a ClayHorizontalCard with actionItems
</div>
<div class="autofit-col">
<div class="dropdown dropdown-action">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" type="button">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" title="actions" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-ellipsis-v" focusable="false">
<title>ellipsis-v</title>
<use xlink:href="icons.svg#ellipsis-v"></use>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exports[`ClayImageCard should render a ClayImageCard with actionItems 1`] = `
</div>
<div class="autofit-col">
<div class="dropdown dropdown-action">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" type="button">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" title="actions" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-ellipsis-v" focusable="false">
<title>ellipsis-v</title>
<use xlink:href="icons.svg#ellipsis-v"></use>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exports[`ClayUserCard should render a ClayUserCard with actionItems 1`] = `
</div>
<div class="autofit-col">
<div class="dropdown dropdown-action">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" type="button">
<button aria-expanded="false" aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn component-action btn-unstyled" title="actions" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-ellipsis-v" focusable="false">
<title>ellipsis-v</title>
<use xlink:href="icons.svg#ellipsis-v"></use>
Expand Down
8 changes: 8 additions & 0 deletions packages/clay-css/src/images/icons/environment-connected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/clay-css/src/images/icons/environment.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 7 additions & 10 deletions packages/clay-css/src/images/icons/list-ol.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions packages/clay-css/src/images/icons/oauth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions packages/clay-css/src/images/icons/open-id.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions packages/clay-css/src/images/icons/third-party.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/clay-css/src/scss/atlas/variables/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $table-hover-bg: lighten($component-active-bg, 44.90) !default;
$table-border-color: lighten(saturate(adjust-hue($secondary, 3), 6.13), 46.08) !default;
$table-font-size: 0.875rem !default;

$table-head-bg: #FFF !default;
$table-head-border-bottom-width: 1px !default;
$table-head-color: $secondary !default;
$table-head-font-weight: $font-weight-semi-bold !default;
Expand Down Expand Up @@ -61,6 +62,8 @@ $table-list-active-bg: $table-list-hover-bg !default;
$table-list-border-color: lighten(saturate(adjust-hue($secondary, 3), 6.13), 46.08) !default;
$table-list-color: $body-color !default;

$table-list-head-bg: #FFF !default;

$table-list-link-color: $secondary !default;

$table-list-divider-padding-x: 0.75rem !default; // 12px
Expand Down
4 changes: 4 additions & 0 deletions packages/clay-css/src/scss/components/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,10 @@
@include clay-card-type-asset-variant($file-card);
}

.user-card {
@include clay-card-type-asset-variant($user-card);
}

// Card Type Directory

.card-type-directory {
Expand Down
59 changes: 55 additions & 4 deletions packages/clay-css/src/scss/components/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ th {
thead {
td,
th {
// Webkit rendering issue with responsive-tables
background-color: $table-head-bg;
border-bottom-width: $table-head-border-bottom-width;
border-top-width: $table-head-border-top-width;
}
Expand Down Expand Up @@ -68,6 +70,15 @@ th {
}
}

tbody,
tfoot {
td,
th {
// Webkit rendering issue with responsive-tables
background-color: $table-bg;
}
}

.autofit-col {
justify-content: center;
padding-left: $table-cell-padding;
Expand Down Expand Up @@ -131,6 +142,39 @@ th {
}
}

// Table Striped

.table-striped {
tbody tr:nth-of-type(odd) {
td,
th {
background-color: $table-accent-bg;
}
}
}

// Table Hover

.table-hover {
tbody tr {
@include hover {
td,
th {
background-color: $table-hover-bg;
}
}
}
}

// Table Active

.table .table-active {
> td,
> th {
background-color: $table-active-bg;
}
}

// Table Title

.table-title {
Expand All @@ -156,8 +200,6 @@ th {
// Table List Skin

.table-list {
background-color: $table-list-bg;

@include border-radius($table-list-border-radius);

color: $table-list-color;
Expand Down Expand Up @@ -243,6 +285,7 @@ th {
thead {
td,
th {
// Webkit rendering issue with responsive-tables
background-color: $table-list-head-bg;
border-width: 0;
font-size: $table-list-head-font-size;
Expand All @@ -260,6 +303,8 @@ th {
tfoot {
td,
th {
// Webkit rendering issue with responsive-tables
background-color: $table-list-bg;
border-width: 0;
vertical-align: middle;
}
Expand Down Expand Up @@ -291,14 +336,20 @@ th {

.table-list.table-striped {
tbody tr:nth-of-type(odd) {
background-color: $table-list-accent-bg;
td,
th {
background-color: $table-list-accent-bg;
}
}
}

.table-list.table-hover {
tbody tr {
@include hover {
background-color: $table-list-hover-bg;
td,
th {
background-color: $table-list-hover-bg;
}
}
}
}
Expand Down
Loading

0 comments on commit f91f880

Please sign in to comment.