Skip to content
This repository has been archived by the owner on Nov 10, 2020. It is now read-only.

Commit

Permalink
fix(table component): resolve conflicts
Browse files Browse the repository at this point in the history
re #6
  • Loading branch information
Klimonov committed Oct 1, 2020
2 parents b306ae1 + 3b8e240 commit 17419f7
Show file tree
Hide file tree
Showing 136 changed files with 4,928 additions and 2,732 deletions.
3 changes: 3 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build/
dist/
node_modules/
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,56 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.9.0](http://inindca///compare/v1.8.0...v1.9.0) (2020-09-30)


### Features

* **table component:** table component columns sorting feature implementation ([416762c](http://inindca///commit/416762c62eba7010cb89946bdec23c6f3fb16b48))


### Bug Fixes

* **breadcrumb component:** resolve conflict ([c5afeaa](http://inindca///commit/c5afeaa80c9db3e07035792e0ee411921f5fc07a)), closes [#43](http://inindca///issues/43)
* **breadcrumbs component:** remove old test shapshots ([d5d68bd](http://inindca///commit/d5d68bd1337bffb5df0d7d69c70172857d649008)), closes [#43](http://inindca///issues/43)
* **breadcrumbs component:** resolve conflict ([b293b67](http://inindca///commit/b293b67046a9081362762ad4a4fc72749450cf59)), closes [#43](http://inindca///issues/43)
* **breadcrumbs component:** resolve conflicts ([650d843](http://inindca///commit/650d843c91d94b35a641fafdae8d1303a046257a)), closes [#43](http://inindca///issues/43)
* **breadcrumbs component:** small style fixes ([0136ab2](http://inindca///commit/0136ab2a002f7b1bd842dee602c425d2a6ce48dd)), closes [#43](http://inindca///issues/43)
* **breadcrumbs component:** update primary breadcrumbs. use GuxBreadcrumbAccent type for accent" ([8c15fff](http://inindca///commit/8c15fff10fef755ea8bbe30c982ac50eb0527f1f)), closes [#43](http://inindca///issues/43)
* **breadcrumbs component:** update test ([b8ac1f4](http://inindca///commit/b8ac1f491fc269e575185adc001d1936b921cc3e)), closes [#43](http://inindca///issues/43)
* **table component:** fix tests to use gux-table-beta selector ([4348007](http://inindca///commit/4348007d342bf1748e4596111411958f5138f92e))

## [1.8.0](http://inindca///compare/v1.7.1...v1.8.0) (2020-09-28)


### Features

* **table component:** columns resizing feature implementation ([015e183](http://inindca///commit/015e183bfcbccde4f8ae9e440949c1af11296703))


### Bug Fixes

* **icon:** fix overly generic class name within component ([4dcdb62](http://inindca///commit/4dcdb6287e41abe287a93086d4d05caa8e761d14))
* **table component:** fix colors variables ([77060b0](http://inindca///commit/77060b01aed3ff2a980bc4505bd250c5eb26d7ee))
* **table component:** fix getting width of resizable column ([790b3c0](http://inindca///commit/790b3c0460a6ba51abc13a45307fedf6188881c5))
* **table component:** missing docs attribute added ([1d8b05f](http://inindca///commit/1d8b05f895e3606669de5faa004e29502fee3aa0))
* **table component:** tests fixed ([cad3b3b](http://inindca///commit/cad3b3b59da393646b5929f1324e3160a0d3229e))
* **table component:** unused styles removed ([b77bb85](http://inindca///commit/b77bb858d5260cd5c78ce30a76ab1bb567b1bc1f))

### [1.7.1](http://inindca///compare/v1.7.0...v1.7.1) (2020-09-25)


### Bug Fixes

* **gux-modal:** improved documentation of default behaviour ([fe51f5a](http://inindca///commit/fe51f5accd748615ac6d6ed0e55f349121ee2248))

## [1.7.0](http://inindca///compare/v1.6.1...v1.7.0) (2020-09-24)


### Features

* **styles:** added spacing styles to export ([566e820](http://inindca///commit/566e820ca7436e6781275b4d7ba72385be7ca422))

### [1.6.1](http://inindca///compare/v1.6.0...v1.6.1) (2020-09-23)

## [1.6.0](http://inindca///compare/v1.5.2...v1.6.0) (2020-09-22)
Expand Down
23 changes: 13 additions & 10 deletions docs/src/component-viewer/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { toHTML } from '../utils/to-html';
import 'genesys-webcomponents';
import '../styles/component-viewer.less';

window.toHTML = toHTML;
window.webcomponentsDocsMain = (example = '', renderCallback = () => {}) =>
bootstrap(example.trim(), renderCallback);

Expand All @@ -23,16 +24,18 @@ function createLayout() {
<div class="preview gux-light-theme"></div>
<div class="editor"></div>
</div>
<div class="right-column">
<details>
<summary class="heading">Attributes</summary>
<div class="attributes"></div>
</details>
<details>
<summary class="heading">Event Details</summary>
<div class="events"></div>
</details>
</div>
<gux-disclosure-button position="right">
<div slot="panel-content" class="controls-column">
<details>
<summary class="heading">Event Descriptions</summary>
<div class="events"></div>
</details>
<details>
<summary class="heading">Attributes</summary>
<div class="attributes"></div>
</details>
</div>
</gux-disclosure-button>
<div class="notification"></div>
</div>
`);
Expand Down
3 changes: 2 additions & 1 deletion docs/src/component-viewer/panels/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ const CONFIG = {
enabled: false
},
language: 'html',
automaticLayout: true
automaticLayout: true,
tabSize: 2
};

export const createEditor = (panel, changeHandler) => {
Expand Down
20 changes: 8 additions & 12 deletions docs/src/components-spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,10 @@
},
"events": { "check": "toggle state changed" }
},
"gux-tooltip": {
"gux-tooltip": {},
"gux-tooltip-beta": {
"attributes": {
"text": "text",
"for": "text",
"delay": "text",
"is-shown": "checkbox"
},
"events": {
"hidden": "fired when tooltip moves to hidden state",
"shown": "fired when tooltip moves to visible state"
"for": "text"
}
},
"gux-form-field-beta": {
Expand All @@ -330,14 +324,16 @@
"submit": "Standard Event"
}
},
"gux-table": {
"gux-table-beta": {
"attributes": {
"compact": "checkbox",
"object-table": "checkbox",
"epmty-message": "text"
"epmty-message": "text",
"resizable-columns": "checkbox"
},
"events": {
"selectionChanged": "Fired when table row was selected/unselected"
"selectionChanged": "Fired when table row was selected/unselected",
"sortChanged": "Fired when sorting of the table column is changed"
}
},
"typography": {},
Expand Down
5 changes: 4 additions & 1 deletion docs/src/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<html lang="en">
<head>
<title>Genesys Webcomponents</title>
<link href="${CDN_URL}genesys-webcomponents/genesys-webcomponents.css" rel="stylesheet">
<link
href="${CDN_URL}genesys-webcomponents/genesys-webcomponents.css"
rel="stylesheet"
/>
</head>
<body>
<script src="${CDN_URL}componentListing.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions docs/src/styles/component-viewer.less
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,15 @@ body {
}
}

.component-viewer > .right-column {
.component-viewer .controls-column {
width: 300px;
overflow: auto;
line-height: 1.4em;
color: #444a52;

summary {
margin: 5px;

&.heading {
font-size: 20px;
padding: 5px 0;
Expand Down Expand Up @@ -113,7 +114,6 @@ body {
font-weight: 800;
}
}

}
}

Expand Down
5 changes: 4 additions & 1 deletion docs/src/viewer-template.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<html lang="en">
<head>
<link href="${CDN_URL}genesys-webcomponents/genesys-webcomponents.css" rel="stylesheet">
<link
href="${CDN_URL}genesys-webcomponents/genesys-webcomponents.css"
rel="stylesheet"
/>
</head>
<body>
<script src="${CDN_URL}componentViewer.js"></script>
Expand Down
Loading

0 comments on commit 17419f7

Please sign in to comment.