Skip to content

Commit b5f4d53

Browse files
committed
feat(form components): Add invalid and disabled
1 parent 34296f5 commit b5f4d53

File tree

233 files changed

+13454
-13356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+13454
-13356
lines changed

.storybook/addons.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ import "zone.js/dist/zone";
1919
import '@storybook/addon-storysource/register';
2020
import "@storybook/addon-actions/register";
2121
import "@storybook/addon-links/register";
22-
import "@storybook/addon-notes/register";
22+
import '@storybook/addon-notes/register';
2323
import "@storybook/addon-knobs/register";
2424
import '@storybook/addon-options/register';

.storybook/bootstrap.module.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

.storybook/config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ addDecorator(
2727
);
2828

2929
// load global styles
30-
require("!style-loader!css-loader!sass-loader!./preview.scss");
31-
require("!style-loader!css-loader!sass-loader!./preview-experimental.scss");
30+
require("!style-loader!css-loader!postcss-loader!sass-loader!./preview.scss");
3231

3332
require("../src/index.stories");
3433
// automatically import all files ending in *.stories.ts

.storybook/experimental.component.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

.storybook/manager-head.html

Lines changed: 4 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,16 @@
1+
<!-- Open Graph -->
12
<meta property="og:title" content="Carbon Components Angular">
23
<meta property="og:description" content="An Angular implementation of the Carbon Design System for IBM.">
34
<meta property="og:image" content="https://angular.carbondesignsystem.com/carbon.jpg">
45
<meta property="og:url" content="https://angular.carbondesignsystem.com">
56

7+
<!-- Social -->
68
<meta name="twitter:title" content="Carbon Components Angular">
79
<meta name="twitter:description" content="An Angular implementation of the Carbon Design System for IBM.">
810
<meta name="twitter:image" content="https://angular.carbondesignsystem.com/carbon.jpg">
911
<meta name="twitter:card" content="summary_large_image">
1012

11-
<style id="iframestyle">
12-
.sb-show-main:not(.welcome) {
13-
padding: 3em;
14-
display: flex;
15-
flex-direction: column;
16-
align-items: center;
17-
}
18-
.experimental .toggle-btn,
19-
.toggle-btn {
20-
padding: 9px;
21-
background: white;
22-
border: none;
23-
border-radius: 5px;
24-
color: darkcyan;
25-
transition: all 0.2s ease-out;
26-
outline: 0;
27-
cursor: pointer;
28-
}
29-
.experimental .experimental-selected,
30-
.experimental-selected {
31-
background: darkcyan;
32-
color: white;
33-
}
34-
</style>
35-
13+
<!-- Storybook override -->
3614
<script>
37-
function setExperimental(event) {
38-
var frame = document.querySelector("#storybook-preview-iframe");
39-
var classList = frame.contentDocument.body.classList;
40-
if(event.target.previousElementSibling) {
41-
classList.add("experimental");
42-
classList.remove("carbon");
43-
event.target.previousElementSibling.classList.remove("experimental-selected");
44-
} else {
45-
classList.remove("experimental");
46-
classList.add("carbon");
47-
event.target.nextElementSibling.classList.remove("experimental-selected");
48-
}
49-
event.target.classList.add("experimental-selected");
50-
};
51-
52-
var experimentalToggleInterval = setInterval(function() {
53-
var frame = document.querySelector("#storybook-preview-iframe");
54-
if(!frame ||
55-
!frame.contentDocument ||
56-
!frame.contentDocument.getElementById("root")) {
57-
return;
58-
}
59-
60-
frame.contentDocument.head.appendChild(
61-
document.getElementById("iframestyle")
62-
);
63-
64-
clearInterval(experimentalToggleInterval);
65-
frame.contentDocument.body.insertAdjacentHTML(
66-
"beforeend",
67-
`<div style="position: fixed; right: 15px; bottom: 15px">
68-
<button
69-
class="toggle-btn experimental-selected"
70-
onclick="setExperimental(event)">
71-
Standard
72-
</button>
73-
<button
74-
class="toggle-btn"
75-
onclick="setExperimental(event)">
76-
Experimental
77-
</button>
78-
</div>
79-
`);
80-
frame.contentWindow.setExperimental = setExperimental;
81-
82-
var classList = frame.contentDocument.body.classList;
83-
classList.add("carbon");
84-
}, 100);
15+
document.title = "Carbon Components Angular";
8516
</script>

.storybook/preview-experimental.scss

Lines changed: 0 additions & 38 deletions
This file was deleted.

.storybook/preview.scss

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,12 @@
11
$feature-flags: (
2-
components-x: false,
32
ui-shell: true
43
);
54

6-
$css--body: false; // we're providing our own body styles
7-
$css--reset: false; // prevent thousands of resets being included...
5+
@import '~carbon-components/scss/globals/scss/styles';
86

9-
.carbon {
10-
@import '~carbon-components/scss/globals/scss/styles';
11-
@import '~carbon-components/scss/globals/scss/css--typography';
12-
13-
// carbon body reset and styles
14-
@include typography;
15-
@include font-family;
16-
//reset
17-
color: $text-01;
18-
background-color: $ui-02;
19-
box-sizing: border-box;
20-
margin: 0;
21-
padding: 0;
22-
border: 0;
23-
font-size: 100%;
24-
vertical-align: baseline;
25-
26-
& > *,
27-
& > *:before,
28-
& > *:after {
29-
box-sizing: inherit;
30-
}
31-
32-
ul {
33-
list-style: none;
34-
margin: 0;
35-
padding: 0;
36-
}
7+
.sb-show-main:not(.full-page) {
8+
padding: 3em;
9+
display: flex;
10+
flex-direction: column;
11+
align-items: center;
3712
}

.storybook/webpack.config.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require('path');
22

3-
module.exports = (baseConfig, env, defaultConfig) => {
4-
defaultConfig.module.rules.push({
3+
module.exports = ({config, mode}) => {
4+
config.module.rules.push({
55
test: [/\.stories\.tsx?$/, /index\.ts$/],
66
loaders: [
77
{
@@ -15,7 +15,7 @@ module.exports = (baseConfig, env, defaultConfig) => {
1515
enforce: 'pre',
1616
});
1717

18-
defaultConfig.mode = "development";
19-
defaultConfig.devtool = "source-map";
20-
return defaultConfig;
18+
config.mode = "development";
19+
config.devtool = "source-map";
20+
return config;
2121
};

.travis.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
sudo: required
21
dist: trusty
32
language: node_js
43
node_js:
@@ -15,22 +14,10 @@ before_script:
1514
- "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
1615
script: "npm run lint && npm test"
1716
deploy:
18-
-
19-
provider: script
20-
script: "bash ./scripts/deploy.sh"
21-
skip_cleanup: true
22-
true:
23-
branch: master
24-
-
25-
allow-empty-commit: true
26-
27-
github-token: $GH_TOKEN
28-
keep-history: true
29-
local-dir: pages
30-
name: carbon-bot
31-
provider: pages
32-
skip_cleanup: true
33-
true:
34-
branch: master
17+
provider: script
18+
script: "bash ./scripts/deploy.sh"
19+
skip_cleanup: true
20+
on:
21+
all_branches: true
3522
notifications:
3623
email: false

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @cal-smith @zvonimirfras @magedhennawy @youda97
1+
* @cal-smith @zvonimirfras @youda97

0 commit comments

Comments
 (0)