Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout-classes.html

Issue 1862213002: Roll third_party/polymer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete appearance_browsertest.js, result of a previous bad merge. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout-classes.html
diff --git a/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout-classes.html b/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout-classes.html
index 2b8cd1a9b949878e27b2b74a08c48c9dc8f1760f..d382652b717ea05befdf8fe8c426540ade236c25 100644
--- a/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout-classes.html
+++ b/third_party/polymer/v1_0/components-chromium/iron-flex-layout/iron-flex-layout-classes.html
@@ -15,7 +15,7 @@ You must include this file in every element that needs to use them.
Sample use:
<link rel="import" href="../iron-flex-layout/iron-flex-layout-classes.html">
- <style is="custom-style" include="iron-flex iron-flex-alignment">
+ <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
<div class="layout horizontal layout-start">
<div>cross axis start alignment</div>
@@ -161,6 +161,12 @@ The following imports are available:
align-items: flex-end;
}
+ .layout.baseline {
+ -ms-flex-align: baseline;
+ -webkit-align-items: baseline;
+ align-items: baseline;
+ }
+
/**
* Alignment in main axis.
*/
@@ -221,6 +227,50 @@ The following imports are available:
-webkit-align-self: stretch;
align-self: stretch;
}
+
+ .self-baseline {
+ -ms-align-self: baseline;
+ -webkit-align-self: baseline;
+ align-self: baseline;
+ };
+
+ /**
+ * multi-line alignment in main axis.
+ */
+ .layout.start-aligned {
+ -ms-flex-line-pack: start; /* IE10 */
+ -ms-align-content: flex-start;
+ -webkit-align-content: flex-start;
+ align-content: flex-start;
+ }
+
+ .layout.end-aligned {
+ -ms-flex-line-pack: end; /* IE10 */
+ -ms-align-content: flex-end;
+ -webkit-align-content: flex-end;
+ align-content: flex-end;
+ }
+
+ .layout.center-aligned {
+ -ms-flex-line-pack: center; /* IE10 */
+ -ms-align-content: center;
+ -webkit-align-content: center;
+ align-content: center;
+ }
+
+ .layout.between-aligned {
+ -ms-flex-line-pack: justify; /* IE10 */
+ -ms-align-content: space-between;
+ -webkit-align-content: space-between;
+ align-content: space-between;
+ }
+
+ .layout.around-aligned {
+ -ms-flex-line-pack: distribute; /* IE10 */
+ -ms-align-content: space-around;
+ -webkit-align-content: space-around;
+ align-content: space-around;
+ }
</style>
</template>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698