Skip to content

Commit e3fcb1e

Browse files
jschulerjschuler
authored
Merge pull request #1 from patternfly/style-update
Style updates
2 parents 9333dc7 + 5dffe18 commit e3fcb1e

27 files changed

+100
-966
lines changed

‎packages/dev/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "serve public"
1010
},
1111
"dependencies": {
12-
"@patternfly/quickstarts": "1.0.0-rc.5",
12+
"@patternfly/quickstarts": "1.0.0-rc.6",
1313
"@patternfly/react-core": "^4.101.3",
1414
"asciidoctor": "^2.2.1",
1515
"react": "^16.14.0",

‎packages/dev/src/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta name="theme-color" content="#000000" />
1111
<title>React Demo App</title>
1212
</head>
13-
<body style="--pf-global--FontSize--md: 14px;">
13+
<body>
1414
<noscript>You need to enable JavaScript to run this app.</noscript>
1515
<div id="root"></div>
1616
</body>

‎packages/module/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/quickstarts",
3-
"version": "1.0.0-rc.5",
3+
"version": "1.0.0-rc.6",
44
"description": "PatternFly quick starts",
55
"files": [
66
"dist"

‎packages/module/rollup.config.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,21 @@ export default [
6060
external: ['react', 'react-dom'],
6161
plugins: plugins(true),
6262
},
63+
// {
64+
// input: 'src/overrides.ts',
65+
// output: {
66+
// file: 'dist/overrides.js',
67+
// format: 'es',
68+
// sourcemap: true,
69+
// },
70+
// plugins: [
71+
// scss({
72+
// output: 'dist/overrides.css',
73+
// includePaths: ['../../node_modules/'],
74+
// importer(path) {
75+
// return { file: path[0] !== '~' ? path : path.slice(1) };
76+
// }
77+
// }),
78+
// ],
79+
// },
6380
];

‎packages/module/src/ConsoleInternal/style.scss‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
@import 'style/vars';
2-
@import 'style/base';
3-
4-
// Mixins
5-
@import 'style/mixin/break-word';
62

7-
// Overrides
8-
@import 'style/overrides';
3+
@import 'style/base';
94

105
// React Components
116
@import 'components/icon-and-text';
@@ -15,4 +10,11 @@
1510
.ocs-page-layout__content {
1611
--pf-global--FontSize--md: 14px;
1712
--pf-global--FontSize--sm: 13px;
13+
14+
ul {
15+
list-style-type: disc;
16+
}
1817
}
18+
19+
// Overrides
20+
// @import 'style/overrides';

‎packages/module/src/ConsoleInternal/style/_base.scss‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,22 @@
33
.co-quick-start-panel-content {
44
ul,
55
ol {
6-
padding-left: 20px;
7-
margin-left: 0;
8-
}
6+
padding-left: 20px; }
97

108
dl {
11-
margin: 0px;
12-
}
9+
margin: 0px; }
1310

1411
// match pf4 styling / table col head styling
1512
dt {
16-
font-weight: var(--pf-global--FontWeight--bold);
17-
}
13+
font-weight: var(--pf-global--FontWeight--bold); }
1814

1915
dd {
20-
margin-bottom: 20px;
21-
}
16+
margin-bottom: 20px; }
2217

2318
dd:last-child {
24-
margin-bottom: 0px;
25-
}
19+
margin-bottom: 0px; }
2620

27-
input[type='number'] {
21+
input[type="number"] {
2822
-webkit-appearance: textfield;
2923
appearance: textfield;
3024
max-width: 100px;
@@ -34,7 +28,7 @@
3428
}
3529
}
3630

37-
input[type='radio'] {
31+
input[type="radio"] {
3832
margin-right: 7px;
3933
}
4034
}

0 commit comments

Comments
 (0)