Merge remote-tracking branch 'origin/master' into drop-composes

frontend/src/metabase/components/Breadcrumbs/Breadcrumbs.module.css

@@ -47,7 +47,7 @@
 }
 
 .sidebarBreadcrumbs {
-  composes: flex from "style";
+  display: flex;
   composes: breadcrumbs;
   color: var(--sidebar-breadcrumbs-color);
   max-width: 100%;

frontend/src/metabase/components/LabelIcon/LabelIcon.module.css

@@ -1,12 +1,12 @@
 .colorIcon {
-  composes: inline-block from "style";
+  display: inline-block;
   width: 18px;
   height: 18px;
   border-radius: 3px;
 }
 
 .emojiIcon {
-  composes: text-centered from "style";
+  text-align: center;
   font-size: 20px;
 }
 

frontend/src/metabase/components/List/List.module.css

@@ -5,11 +5,13 @@
 }
 
 .list {
-  composes: ml-auto mr-auto from "style";
+  margin-left: auto;
+  margin-right: auto;
 }
 
 .list-wrapper {
-  composes: ml-auto mr-auto from "style";
+  margin-left: auto;
+  margin-right: auto;
 }
 
 .list a {
@@ -17,44 +19,53 @@
 }
 
 .header {
-  composes: flex flex-row from "style";
   composes: mt4 mb2 from "style";
+  flex-direction: row;
+  display: flex;
   color: var(--title-color);
   font-size: 24px;
   min-height: 48px;
 }
 
 .headerBody {
-  composes: flex flex-full border-bottom from "style";
+  composes: border-bottom from "style";
+  flex: 1 0 auto;
+  display: flex;
   align-items: center;
   height: 100%;
   border-color: var(--color-brand);
 }
 
 .headerLink {
-  composes: ml2 flex-no-shrink from "style";
+  composes: ml2 from "style";
+  flex-shrink: 0;
   color: var(--color-brand);
   font-size: 14px;
 }
 
 .headerButton {
-  composes: flex ml1 align-center from "style";
+  composes: ml1 from "style";
+  align-items: center;
+  display: flex;
   font-size: 14px;
 }
 
 .empty {
-  composes: full flex justify-center from "style";
+  width: 100%;
+  justify-content: center;
+  display: flex;
   padding-top: 75px;
 }
 
 .item {
-  composes: flex align-center from "style";
-  composes: relative from "style";
+  position: relative;
+  align-items: center;
+  display: flex;
 }
 
 .itemBody {
-  composes: flex-full from "style";
   max-width: 100%;
+  flex: 1 0 auto;
 }
 
 .itemTitle {
@@ -79,10 +90,15 @@
 }
 
 .icons {
-  composes: flex flex-row align-center from "style";
+  flex-direction: row;
+  align-items: center;
+  display: flex;
 }
 .leftIcons {
-  composes: flex-no-shrink flex align-self-start mr2 from "style";
+  composes: mr2 from "style";
+  align-self: flex-start;
+  flex-shrink: 0;
+  display: flex;
   composes: icons;
 }
 .rightIcons {
@@ -95,7 +111,9 @@
 
 .extraIcons {
   composes: icons;
-  composes: absolute top full-height from "style";
+  top: 0;
+  position: absolute;
+  height: 100%;
   right: -40px;
 }
 
@@ -107,7 +125,7 @@
 }
 
 .icon {
-  composes: relative from "style";
+  position: relative;
   color: var(--muted-color);
 }
 
@@ -140,7 +158,7 @@
 .itemIcon {
   composes: icon;
   visibility: visible !important;
-  composes: relative from "style";
+  position: relative;
 }
 .item:hover .itemIcon,
 .item.selected .itemIcon {
@@ -151,7 +169,7 @@
 .chartIcon {
   composes: icon;
   visibility: visible !important;
-  composes: relative from "style";
+  position: relative;
 }
 
 /* ACTION ICONS */

frontend/src/metabase/components/QueryButton/QueryButton.module.css

@@ -1,8 +1,12 @@
 .queryButton {
-  composes: flex align-center no-decoration text-brand py1 from "style";
+  composes: text-brand py1 from "style";
+  text-decoration: none;
+  align-items: center;
+  display: flex;
 }
 
 .queryButtonText {
-  composes: flex-full ml2 from "style";
+  composes: ml2 from "style";
+  flex: 1 0 auto;
   max-width: 100%;
 }

frontend/src/metabase/components/Sidebar.module.css

@@ -12,8 +12,9 @@
 
 .item,
 .sectionTitle {
-  composes: flex align-center from "style";
   composes: py1 mb1 from "style";
+  align-items: center;
+  display: flex;
 }
 
 .item {
@@ -27,8 +28,7 @@
 }
 
 .sectionTitle {
-  composes: my1 from "style";
-  composes: text-bold from "style";
+  composes: my1 text-bold from "style";
   font-size: 16px;
 }
 
@@ -49,8 +49,7 @@
 }
 
 .divider {
-  composes: my2 from "style";
-  composes: border-bottom from "style";
+  composes: my2 border-bottom from "style";
 }
 
 .name {
@@ -67,5 +66,5 @@
 }
 
 .icon {
-  composes: flex-no-shrink from "style";
+  flex-shrink: 0;
 }

frontend/src/metabase/parameters/components/ParameterValueWidget.module.css

@@ -1,5 +1,6 @@
 .parameter {
-  composes: flex align-center from "style";
+  align-items: center;
+  display: flex;
   font-weight: 600;
   min-height: 30px;
   min-width: 150px;
@@ -7,7 +8,8 @@
 }
 
 .nameInput {
-  composes: flex align-center from "style";
+  align-items: center;
+  display: flex;
   min-height: 30px;
   min-width: 150px;
   color: var(--color-text-medium);
@@ -102,7 +104,9 @@
 
 .editButton,
 .removeButton {
-  composes: flex align-center cursor-pointer from "style";
+  cursor: pointer;
+  align-items: center;
+  display: flex;
 }
 
 .editButton:hover {

frontend/src/metabase/reference/Reference.module.css

@@ -5,21 +5,25 @@
 }
 
 .guideEmpty {
-  composes: flex full justify-center from "style";
+  width: 100%;
+  justify-content: center;
+  display: flex;
   padding-top: 75px;
 }
 
 .guideEmptyBody {
-  composes: text-centered from "style";
+  text-align: center;
   max-width: 400px;
 }
 
 .guideEmptyMessage {
-  composes: text-dark text-paragraph text-centered mt3 from "style";
+  composes: text-dark text-paragraph mt3 from "style";
+  text-align: center;
 }
 
 .columnHeader {
-  composes: flex flex-full from "style";
+  flex: 1 0 auto;
+  display: flex;
   padding-top: 20px;
   padding-bottom: 20px;
 }
@@ -49,7 +53,9 @@
 }
 
 .guideLeftPadded {
-  composes: flex full justify-center from "style";
+  width: 100%;
+  justify-content: center;
+  display: flex;
 }
 
 .guideLeftPadded::before {
@@ -78,7 +84,8 @@
 }
 
 .guideTitleBody {
-  composes: full text-dark text-bold from "style";
+  composes: text-dark text-bold from "style";
+  width: 100%;
   composes: guideLeftPaddedBody;
 }
 
@@ -88,12 +95,17 @@
 }
 
 .guideSeeAllBody {
-  composes: flex full text-dark text-bold mt4 from "style";
+  composes: text-dark text-bold mt4 from "style";
+  width: 100%;
+  display: flex;
   composes: guideLeftPaddedBody;
 }
 
 .guideSeeAllLink {
-  composes: flex-full block no-decoration py1 border-top from "style";
+  composes: py1 border-top from "style";
+  text-decoration: none;
+  display: block;
+  flex: 1 0 auto;
 }
 
 .guideContact {
@@ -103,13 +115,14 @@
 }
 
 .guideContactBody {
-  composes: full from "style";
+  width: 100%;
   composes: guideLeftPaddedBody;
   font-size: 16px;
 }
 
 .guideEditHeader {
-  composes: full text-body my4 from "style";
+  composes: text-body my4 from "style";
+  width: 100%;
   max-width: 550px;
   color: var(--color-text-dark);
 }
@@ -128,7 +141,8 @@
 }
 
 .guideEditLabel {
-  composes: block text-bold mb2 from "style";
+  composes: text-bold mb2 from "style";
+  display: block;
   font-size: 16px;
   color: var(--title-color);
 }
@@ -138,7 +152,8 @@
 }
 
 .guideEditTitle {
-  composes: block text-body text-bold from "style";
+  composes: text-body text-bold from "style";
+  display: block;
   color: var(--title-color);
   font-size: 16px;
   margin-top: 50px;
@@ -152,7 +167,9 @@
 }
 
 .guideEditAddButton {
-  composes: flex full my2 pl4 from "style";
+  composes: my2 pl4 from "style";
+  width: 100%;
+  display: flex;
   padding-right: 3.5rem;
 }
 
@@ -179,7 +196,7 @@
 }
 
 .guideEditContact {
-  composes: flex from "style";
+  display: flex;
 }
 
 .guideEditContactName {
@@ -194,7 +211,8 @@
 }
 
 .guideEditInput {
-  composes: full text-dark input p2 from "style";
+  composes: text-dark input p2 from "style";
+  width: 100%;
   font-size: 16px;
   display: block;
 }

frontend/src/metabase/reference/components/Detail.module.css

@@ -4,8 +4,9 @@
 }
 
 .detail {
-  composes: flex align-center from "style";
-  composes: relative from "style";
+  position: relative;
+  align-items: center;
+  display: flex;
 }
 
 .detailBody {
@@ -14,7 +15,8 @@
 }
 
 .detailTitle {
-  composes: text-bold inline-block from "style";
+  composes: text-bold from "style";
+  display: inline-block;
   color: var(--title-color);
 }
 

frontend/src/metabase/reference/components/EditHeader.module.css

@@ -1,5 +1,7 @@
 .editHeader {
-  composes: text-white flex align-center from "style";
+  composes: text-white from "style";
+  align-items: center;
+  display: flex;
   position: absolute;
   top: 0;
   left: 0;
@@ -9,7 +11,7 @@
 }
 
 .editHeaderButtons {
-  composes: flex-align-right from "style";
+  margin-left: auto;
 }
 
 .editHeaderButton {

frontend/src/metabase/reference/components/Field.module.css

@@ -3,11 +3,13 @@
 }
 
 .field {
-  composes: flex align-center from "style";
+  align-items: center;
+  display: flex;
 }
 
 .fieldNameTitle {
-  composes: flex-half pr2 from "style";
+  composes: pr2 from "style";
+  flex: 0.5;
 }
 
 .fieldName {
@@ -22,17 +24,20 @@
 }
 
 .fieldSelect {
-  composes: input p1 block from "style";
+  composes: input p1 from "style";
+  display: block;
 }
 
 .fieldType {
-  composes: flex-1-quarter text-medium pr2 from "style";
+  composes: text-medium pr2 from "style";
+  flex: 0.25;
   overflow: hidden;
   white-space: nowrap;
 }
 
 .fieldDataType {
-  composes: flex-1-quarter text-medium from "style";
+  composes: text-medium from "style";
+  flex: 0.25;
 }
 
 .fieldSecondary {

frontend/src/metabase/reference/components/FieldToGroupBy.module.css

@@ -1,5 +1,5 @@
 .fieldToGroupByText {
-  composes: flex-full from "style";
+  flex: 1 0 auto;
   font-size: 14px;
   color: var(--color-text-medium);
 }

frontend/src/metabase/reference/components/Formula.module.css

@@ -5,7 +5,9 @@
 }
 
 .formulaHeader {
-  composes: flex align-center text-brand py1 px2 from "style";
+  composes: text-brand py1 px2 from "style";
+  align-items: center;
+  display: flex;
 }
 
 .formulaTitle {

frontend/src/metabase/reference/components/ReferenceHeader.module.css

@@ -3,7 +3,9 @@
 }
 
 .headerBody {
-  composes: flex flex-full text-dark text-bold from "style";
+  composes: text-dark text-bold from "style";
+  flex: 1 0 auto;
+  display: flex;
   overflow: hidden;
   align-items: center;
   border-color: var(--color-border);
@@ -36,7 +38,8 @@
 }
 
 .headerSchema {
-  composes: text-light absolute from "style";
+  composes: text-light from "style";
+  position: absolute;
   top: -10px;
   font-size: 12px;
 }

frontend/src/metabase/reference/components/RevisionMessageModal.module.css

@@ -1,12 +1,15 @@
 .modalBody {
-  composes: flex justify-center align-center from "style";
+  align-items: center;
+  justify-content: center;
+  display: flex;
   padding-left: 32px;
   padding-right: 32px;
   padding-bottom: 32px;
 }
 
 .modalTextArea {
-  composes: flex-full text-dark input p2 from "style";
+  composes: text-dark input p2 from "style";
+  flex: 1 0 auto;
   resize: none;
   font-size: 16px;
   min-height: 100px;