Skip to content

Commit

Permalink
chore(release): release 9.2.0 (#59)
Browse files Browse the repository at this point in the history
Co-authored-by: huaweidevcloud <devcloudmobile@huawei.com>
  • Loading branch information
wangyaju and huaweidevcloud authored Aug 31, 2020
1 parent 00a022b commit e148e6a
Show file tree
Hide file tree
Showing 391 changed files with 7,935 additions and 2,436 deletions.
6 changes: 5 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@
"jsxSingleQuote": true,
"bracketSpacing": true,
"jsxBracketSameLine": true,
"printWidth":140
"printWidth":140,
"endOfLine": "auto",
"proseWrap": "preserve",
"trailingComma": "es5",
"useTabs": false
}
50 changes: 50 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"extends": [
"stylelint-config-standard",
"stylelint-config-recommended-scss"
],
"plugins": [
"stylelint-scss"
],
"rules": {
"string-quotes": "single",
"property-no-unknown": true,
"selector-pseudo-class-no-unknown": true,
"at-rule-empty-line-before": ["always",{
"except":["blockless-after-same-name-blockless","first-nested","inside-block"],
"ignore": ["after-comment", "first-nested"]
}],
"rule-empty-line-before":["always",{
"except": [ "after-single-line-comment", "first-nested"]
}],
"block-no-empty": true,
"selector-pseudo-element-no-unknown": [
true,
{
"ignorePseudoElements": [
"ng-deep"
]
}
],
"selector-type-no-unknown": [
true,
{
"ignoreTypes": [
"/^d-/"
]
}
],
"color-hex-length": "long",
"no-descending-specificity": null,
"font-family-no-missing-generic-family-keyword": null,
"no-duplicate-selectors": null,
"declaration-block-no-duplicate-properties": [
true,
{
"ignore": [
"consecutive-duplicates"
]
}
]
}
}
25 changes: 17 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"customWebpackConfig": {
"path": "scripts/extra-webpack.config.js"
},
"outputPath": "dist/components",
"index": "src/index.html",
"main": "src/main.ts",
Expand All @@ -23,8 +26,8 @@
"src/assets"
],
"styles": [
"src/styles.scss",
"node_modules/highlight.js/styles/vs.css"
"node_modules/highlight.js/styles/an-old-hope.css",
"src/styles.scss"
],
"scripts": []
},
Expand All @@ -48,7 +51,7 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumWarning": "3mb",
"maximumError": "5mb"
}
]
Expand All @@ -59,7 +62,7 @@
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "devui:build"
},
Expand All @@ -79,8 +82,11 @@
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "@angular-builders/custom-webpack:karma",
"options": {
"customWebpackConfig": {
"path": "scripts/extra-webpack.config.js"
},
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
Expand Down Expand Up @@ -156,8 +162,11 @@
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "@angular-builders/custom-webpack:karma",
"options": {
"customWebpackConfig": {
"path": "scripts/extra-webpack.config.js"
},
"main": "devui/test.ts",
"tsConfig": "devui/tsconfig.spec.json",
"karmaConfig": "devui/karma.conf.js",
Expand All @@ -184,4 +193,4 @@
}
},
"defaultProject": "devui"
}
}
36 changes: 18 additions & 18 deletions devui/accordion/accordion.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
/* 菜单底色 */
:host ::ng-deep .devui-accordion-menu {
display: block;
background: $bg-white;
background: $devui-base-bg;
width: 100%;
overflow-y: auto;
border-radius: 2px;
height: 100%;

&.devui-accordion-menu-normal {
box-shadow: 0 2px 4px 0 $dark-1-boxshadow;
box-shadow: 0 2px 4px 0 $devui-shadow;
}

& > .devui-accordion-list {
Expand All @@ -38,7 +38,7 @@
}

:host ::ng-deep .devui-accordion-submenu {
background: $bg-white;
background: $devui-base-bg;
width: 100%;
}

Expand All @@ -50,32 +50,32 @@
padding: 0 10px 0 20px;
font-weight: 400;
line-height: 40px;
color: $dark-2;
color: $devui-text-weak;
background: transparent;
cursor: pointer;

&.disabled {
color: $disabled-content;
color: $devui-disabled-text;
cursor: not-allowed;

& > a {
color: $disabled-content;
color: $devui-disabled-text;
}
}

&:not(.disabled) {
&:hover {
background: $hover-content;
color: $hover-control;
background: $devui-list-item-hover-bg;
color: $devui-list-item-hover-text;
}

&.devui-router-active,
&.active:not(.open) {
color: $hwc-color-text-active-text-link;
color: $devui-brand-active;
font-weight: bold;

& > a {
color: $hwc-color-text-active-text-link;
color: $devui-brand-active;
}
}
}
Expand All @@ -84,7 +84,7 @@
text-decoration: none;
display: block;
width: 100%;
color: $dark-2;
color: $devui-text-weak;

&:hover {
color: inherit;
Expand Down Expand Up @@ -126,15 +126,15 @@
height: 16px;

polygon {
fill: $dark-2;
fill: $devui-text-weak;
}
}
}

&:not(.open) {
&.active {
svg polygon {
fill: $hwc-color-icon-hover-active;
fill: $devui-icon-fill-active;
}
}

Expand All @@ -145,10 +145,10 @@
}

&.disabled > .devui-accordion-open-icon {
color: $disabled-content;
color: $devui-disabled-text;

svg polygon {
fill: $disabled-content;
fill: $devui-disabled-text;
}
}
}
Expand All @@ -158,7 +158,7 @@
padding-right: 30px;

&.active:not(.open) {
color: $hwc-color-text-active-text-link;
color: $devui-brand-active;
background: transparent;
}
}
Expand All @@ -177,7 +177,7 @@
left: 10px;
width: 2px;
height: 40px;
background: $gray-2;
background: $devui-dividing-line;
vertical-align: middle;

&.devui-parent-list {
Expand All @@ -192,7 +192,7 @@
display: block;
width: 2px;
height: 18px;
background: $hwc-color-border-active;
background: $devui-form-control-line-active;
position: absolute;
top: 11px;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion devui/accordion/demo/accordion-demo.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class AccordionDemoComponent {
AccordionDemoTemplate: Array<DevuiSourceData> = [
{title: 'HTML', language: 'xml', code: require('!!raw-loader!./template/template.component.html')},
{title: 'TS', language: 'typescript', code: require('!!raw-loader!./template/template.component.ts')},
{title: 'CSS', language: 'css', code: require('!!raw-loader!./template/template.component.css')}
{title: 'CSS', language: 'css', code: require('!!raw-loader!./template/template.component.scss')}
];

AccordionDemoInnerListTemplate: Array<DevuiSourceData> = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../../style/theme/color';

.menu {
width: 400px;
}
Expand All @@ -12,7 +14,7 @@
padding: 2px;
color: #ffffff;
text-align: center;
background: #5170ff;
background: $devui-brand;
margin-top: -2px;
font-weight: 400;
}
Expand Down
2 changes: 1 addition & 1 deletion devui/accordion/demo/template/template.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Component } from '@angular/core';
@Component({
selector: 'd-template',
templateUrl: './template.component.html',
styleUrls: ['./template.component.css'],
styleUrls: ['./template.component.scss'],
})
export class TemplateComponent {
menu = [{
Expand Down
2 changes: 1 addition & 1 deletion devui/alert/alert.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
class="devui-icon"
[ngClass]="type === 'danger'? 'devui-icon-error': 'devui-icon-' + type"
[ngClass]="type === 'danger' ? 'devui-icon-error' : 'devui-icon-' + type"
>
<g *ngIf="type === 'success'" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path fill-rule="nonzero" d="M8,0 C3.6,0 0,3.6 0,8 C0,12.4 3.6,16 8,16 C12.4,16 16,12.4 16,8 C16,3.6 12.4,0 8,0 Z"></path>
Expand Down
Loading

0 comments on commit e148e6a

Please sign in to comment.