Skip to content
This repository was archived by the owner on May 20, 2023. It is now read-only.

Commit cabbe15

Browse files
har79nshahan
authored andcommitted
Adding all_material for consistency but NOT going to migrate users from _material.scss given large amount of churn and issues with transitive dependencies.
PiperOrigin-RevId: 225360180
1 parent 1d0e91a commit cabbe15

File tree

5 files changed

+39
-139
lines changed

5 files changed

+39
-139
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.
4+
5+
@charset 'UTF-8';
6+
// Make sure the charset is set appropriately
7+
8+
9+
// How to use me:
10+
//
11+
// This set of scss files should never output any css unless sass classes are
12+
// extended in the importing file. This allows you to import _material without
13+
// bloating the css files for your components. All variables and components
14+
// within the material stylesheet are prefixed with "mat-" in order to give a
15+
// clear distinction between them and the styles in components that are using
16+
// these material styles.
17+
//
18+
// Example:
19+
//
20+
// small-example.scss
21+
// @import "package:angular_components/css/material/material";
22+
//
23+
// .my-app {
24+
// background-color: $mat-blue-700;
25+
// }
26+
27+
@import 'color_palette_material';
28+
@import 'color_material';
29+
@import 'core';
30+
@import 'elevation_material';
31+
@import 'scrollbar_material';
32+
@import 'transition_material';
33+
@import 'typography_material';

angular_components/lib/css/_core.scss

Lines changed: 1 addition & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ $mat-option-inline-icons: false !default;
153153
}
154154

155155
// Similar to icon button, but to be used with a button containing an
156-
// acx `<glyph>` element.
156+
// `<glyph>` element.
157157
// DEPRECATED: use <material-button icon> instead.
158158
@mixin glyph-button($button-size: 6 * $mat-grid, $circle: false) {
159159

@@ -206,97 +206,3 @@ $mat-option-inline-icons: false !default;
206206
box-sizing: $type; // Chrome, IE 8+, Opera, Safari 5.1
207207
}
208208

209-
@mixin flex-block() {
210-
display: -ms-flexbox; // IE 10
211-
display: -webkit-flex; // Chrome
212-
display: flex; // Spec
213-
}
214-
215-
@mixin flex-justify-start() {
216-
-ms-flex-pack: start; // IE 10
217-
-webkit-flex-align: start;
218-
-webkit-justify-content: flex-start; // safari
219-
justify-content: flex-start;
220-
}
221-
222-
@mixin flex-justify-end() {
223-
-ms-flex-pack: end; // IE 10
224-
-webkit-flex-align: end;
225-
-webkit-justify-content: flex-end; // safari
226-
justify-content: flex-end;
227-
}
228-
229-
@mixin flex-justify-center() {
230-
-ms-flex-pack: center; // IE 10
231-
-webkit-flex-align: center;
232-
-webkit-justify-content: center; // safari
233-
justify-content: center;
234-
}
235-
236-
@mixin flex-justify-space-between() {
237-
-ms-flex-pack: justify; // IE 10
238-
-webkit-flex-align: justify;
239-
-webkit-justify-content: space-between; // safari
240-
justify-content: space-between;
241-
}
242-
243-
// DOES NOT WORK IN IE 10, it is the same as 'space-between'
244-
@mixin flex-justify-space-around() {
245-
-ms-flex-pack: justify; // IE 10
246-
-webkit-flex-align: justify;
247-
justify-content: space-around;
248-
}
249-
250-
@mixin flex-align-start() {
251-
-ms-flex-align: start; // IE 10
252-
-webkit-flex-align: start;
253-
align-items: flex-start;
254-
}
255-
256-
@mixin flex-align-end() {
257-
-ms-flex-align: end; // IE 10
258-
-webkit-flex-align: end;
259-
align-items: flex-end;
260-
}
261-
262-
@mixin flex-align-center() {
263-
-ms-flex-align: center; // IE 10
264-
-webkit-flex-align: center;
265-
align-items: center;
266-
}
267-
268-
@mixin flex-align-stretch() {
269-
-ms-flex-align: stretch; // IE 10
270-
-webkit-flex-align: stretch;
271-
align-items: stretch;
272-
}
273-
274-
@mixin flex-align-baseline() {
275-
-ms-flex-align: baseline; // IE 10
276-
-webkit-flex-align: baseline;
277-
align-items: baseline;
278-
}
279-
280-
@mixin flex-direction($direction) {
281-
-ms-flex-direction: $direction; // IE 10
282-
-webkit-flex-direction: $direction;
283-
flex-direction: $direction;
284-
}
285-
286-
@mixin flex-grow($amount) {
287-
-ms-flex-positive: $amount; // IE 10
288-
-webkit-flex-grow: $amount;
289-
flex-grow: $amount;
290-
}
291-
292-
@mixin flex-shrink($amount) {
293-
-ms-flex-negative: $amount; // IE 10
294-
-webkit-flex-shrink: $amount;
295-
flex-shrink: $amount;
296-
}
297-
298-
@mixin flex($values...) {
299-
-ms-flex: $values; // IE 10
300-
-webkit-flex: $values;
301-
flex: $values;
302-
}

angular_components/lib/css/_typography_material.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
// Typography constants
6-
// https://material.googleplex.com/style/typography.html
6+
// https://material.io/design/typography
77

88
// Roboto font stack.
99
$mat-font-family: Roboto, Noto, sans-serif;
@@ -68,7 +68,7 @@ $mat-font-leading-caption: 20px;
6868
// * nowrap (for styles that should "exist as single lines")
6969
//
7070
// "/" in CSS font property has to be specified with #{} interpolation to
71-
// prevent the sass compiler from trying to perform division (go/sass-slash).
71+
// prevent the sass compiler from trying to perform division (goo.gl/H76dyp).
7272

7373
@mixin mat-font-display-4 {
7474
@include nowrap;
@@ -171,7 +171,7 @@ $mat-font-leading-caption: 20px;
171171
}
172172

173173
// Set link colors across encapsulation boundaries. This can be used at the
174-
// top level of an application to ensure that all links are ACX-styled, even
174+
// top level of an application to ensure that all links are styled, even
175175
// if generated dynamically.
176176
@mixin mat-link-deep {
177177
::ng-deep a {

angular_components/lib/css/material/_material.scss

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,4 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
@charset 'UTF-8';
6-
// Make sure the charset is set appropriately
7-
8-
9-
// How to use me:
10-
//
11-
// This set of scss files should never output any css unless sass classes are
12-
// extended in the importing file. This allows you to import _material without
13-
// bloating the css files for your components. All variables and components
14-
// within the material stylesheet are prefixed with "mat-" in order to give a
15-
// clear distinction between them and the styles in components that are using
16-
// these material styles.
17-
//
18-
// Example:
19-
//
20-
// small-example.scss
21-
// @import "package:angular_components/css/material/material";
22-
//
23-
// .my-app {
24-
// background-color: $mat-blue-700;
25-
// }
26-
27-
// TODO: See if we can reference go/icon svgs instead of copying them to res/
28-
29-
// Behold, the import of all things:
30-
@import 'const/global';
5+
@import 'package:angular_components/css/all_material';

angular_components/lib/css/material/const/_global.scss

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,4 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// #############################################################################
6-
//
7-
// WARNING: DO NOT IMPORT DIRECTLY OUTSIDE OF
8-
// THIRD_PARTY/DART_SRC/ACX/CSS/MATERIAL
9-
//
10-
// #############################################################################
11-
12-
// Global material imports, settings, variables, mixins and functions.
13-
14-
@import 'functions';
15-
@import 'color';
16-
@import 'palette';
17-
@import 'settings';
18-
@import 'mixins';
19-
@import 'typography';
5+
@import 'package:angular_components/css/all_material';

0 commit comments

Comments
 (0)