Skip to content

build: consistent line breaks for css files #12977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
604 changes: 473 additions & 131 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"scss-bundle": "^2.0.1-beta.7",
"selenium-webdriver": "^3.6.0",
"sorcery": "^0.10.0",
"stylelint": "^8.4.0",
"stylelint": "^9.5.0",
"ts-node": "^3.0.4",
"tsconfig-paths": "^2.3.0",
"tslint": "^5.11.0",
Expand Down
6 changes: 3 additions & 3 deletions src/demo-app/a11y/select/select-a11y.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.demo-select-a11y-spacer {
margin-bottom: 10px;
}
.demo-select-a11y-spacer {
margin-bottom: 10px;
}
16 changes: 8 additions & 8 deletions src/demo-app/bottom-sheet/bottom-sheet-demo.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.demo-dialog-card {
max-width: 405px;
margin: 20px 0;
}
.mat-raised-button {
margin-right: 5px;
}
.demo-dialog-card {
max-width: 405px;
margin: 20px 0;
}

.mat-raised-button {
margin-right: 5px;
}
198 changes: 99 additions & 99 deletions src/demo-app/drag-drop/drag-drop-demo.scss
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
.list {
width: 500px;
max-width: 100%;
margin-bottom: 25px;
display: inline-block;
margin-right: 25px;
vertical-align: top;
[dir='rtl'] & {
margin-right: 0;
margin-left: 25px;
}
&.horizontal {
width: 1000px;
margin-right: 0;
margin-left: 0;
}
}
.cdk-drop {
border: solid 1px #ccc;
min-height: 60px;
display: block;
.horizontal & {
display: flex;
flex-direction: row;
}
}
.cdk-drag {
padding: 20px 10px;
border-bottom: solid 1px #ccc;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
.cdk-drop-dragging &:not(.cdk-drag-placeholder) {
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
}
.horizontal & {
border: none;
border-right: solid 1px #ccc;
flex-grow: 1;
flex-basis: 0;
[dir='rtl'] & {
border-right: none;
border-left: solid 1px #ccc;
}
}
.cdk-drop &:last-child {
border: none;
}
}
.cdk-drag-preview {
box-sizing: border-box;
opacity: 0.5;
}
.cdk-drag-animating {
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
}
.cdk-drag-placeholder {
opacity: 0;
}
.wrapper {
border: solid 1px red;
}
.cdk-drag-handle {
cursor: move;
svg {
fill: rgba(0, 0, 0, 0.5);
}
}
pre {
white-space: normal;
}
.free-draggable {
width: 200px;
height: 200px;
border: solid 1px #ccc;
cursor: move;
display: flex;
justify-content: center;
align-items: center;
}
.list {
width: 500px;
max-width: 100%;
margin-bottom: 25px;
display: inline-block;
margin-right: 25px;
vertical-align: top;

[dir='rtl'] & {
margin-right: 0;
margin-left: 25px;
}

&.horizontal {
width: 1000px;
margin-right: 0;
margin-left: 0;
}
}

.cdk-drop {
border: solid 1px #ccc;
min-height: 60px;
display: block;

.horizontal & {
display: flex;
flex-direction: row;
}
}

.cdk-drag {
padding: 20px 10px;
border-bottom: solid 1px #ccc;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
box-sizing: border-box;

.cdk-drop-dragging &:not(.cdk-drag-placeholder) {
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
}

.horizontal & {
border: none;
border-right: solid 1px #ccc;
flex-grow: 1;
flex-basis: 0;

[dir='rtl'] & {
border-right: none;
border-left: solid 1px #ccc;
}
}

.cdk-drop &:last-child {
border: none;
}
}

.cdk-drag-preview {
box-sizing: border-box;
opacity: 0.5;
}

.cdk-drag-animating {
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
}

.cdk-drag-placeholder {
opacity: 0;
}

.wrapper {
border: solid 1px red;
}

.cdk-drag-handle {
cursor: move;

svg {
fill: rgba(0, 0, 0, 0.5);
}
}

pre {
white-space: normal;
}

.free-draggable {
width: 200px;
height: 200px;
border: solid 1px #ccc;
cursor: move;
display: flex;
justify-content: center;
align-items: center;
}
46 changes: 23 additions & 23 deletions src/lib/datepicker/datepicker-toggle.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
.mat-form-field-appearance-legacy {
.mat-form-field-prefix,
.mat-form-field-suffix {
.mat-datepicker-toggle-default-icon {
width: 1em;
}
}
}
.mat-form-field:not(.mat-form-field-appearance-legacy) {
.mat-form-field-prefix,
.mat-form-field-suffix {
.mat-datepicker-toggle-default-icon {
display: block;
width: 1.5em;
height: 1.5em;
}
.mat-icon-button .mat-datepicker-toggle-default-icon {
margin: auto;
}
}
}
.mat-form-field-appearance-legacy {
.mat-form-field-prefix,
.mat-form-field-suffix {
.mat-datepicker-toggle-default-icon {
width: 1em;
}
}
}

.mat-form-field:not(.mat-form-field-appearance-legacy) {
.mat-form-field-prefix,
.mat-form-field-suffix {
.mat-datepicker-toggle-default-icon {
display: block;
width: 1.5em;
height: 1.5em;
}

.mat-icon-button .mat-datepicker-toggle-default-icon {
margin: auto;
}
}
}
2 changes: 1 addition & 1 deletion src/lib/form-field/_form-field-legacy-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ $mat-form-field-legacy-dedupe: 0;
}
}

// translateZ causes the label to not appear while printing, so we override it to not
// translateZ causes the label to not appear while printing, so we override it to not
// apply translateZ while printing
@media print {
.mat-form-field-appearance-legacy {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
.dialog-content {
width: 200px;
height: 200px;
border: solid 1px #ccc;
color: rgba(0, 0, 0, 0.87);
cursor: move;
display: flex;
justify-content: center;
align-items: center;
background: #fff;
border-radius: 4px;
transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
0 2px 2px 0 rgba(0, 0, 0, 0.14),
0 1px 5px 0 rgba(0, 0, 0, 0.12);
}
.dialog-content:active {
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
0 8px 10px 1px rgba(0, 0, 0, 0.14),
0 3px 14px 2px rgba(0, 0, 0, 0.12);
}
.dialog-content {
width: 200px;
height: 200px;
border: solid 1px #ccc;
color: rgba(0, 0, 0, 0.87);
cursor: move;
display: flex;
justify-content: center;
align-items: center;
background: #fff;
border-radius: 4px;
transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
0 2px 2px 0 rgba(0, 0, 0, 0.14),
0 1px 5px 0 rgba(0, 0, 0, 0.12);
}

.dialog-content:active {
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
0 8px 10px 1px rgba(0, 0, 0, 0.14),
0 3px 14px 2px rgba(0, 0, 0, 0.12);
}
3 changes: 2 additions & 1 deletion stylelint-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"selector-max-id": 0,
"no-missing-end-of-source-newline": true,
"no-eol-whitespace": true,
"max-line-length": 100
"max-line-length": 100,
"linebreaks": "unix"
}
}