From 57d9ac91cae18d0a2faf8dca883f1fe18363b9d9 Mon Sep 17 00:00:00 2001 From: Orlando Pozo Date: Fri, 26 Jun 2020 19:47:50 -0700 Subject: [PATCH 1/2] feat(material-experimental/mdc-snackbar): Copy in the canonical MDC DOM and add the MDC styles. --- .../mdc-snackbar/BUILD.bazel | 8 ++++++++ .../mdc-snackbar/_snackbar-theme.scss | 3 +++ .../mdc-snackbar/snackbar.html | 16 +++++++++++++++- .../mdc-snackbar/snackbar.scss | 4 +++- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/material-experimental/mdc-snackbar/BUILD.bazel b/src/material-experimental/mdc-snackbar/BUILD.bazel index 0861e6029d54..abc8490116be 100644 --- a/src/material-experimental/mdc-snackbar/BUILD.bazel +++ b/src/material-experimental/mdc-snackbar/BUILD.bazel @@ -29,4 +29,12 @@ sass_library( sass_binary( name = "snackbar_scss", src = "snackbar.scss", + include_paths = [ + "external/npm/node_modules", + ], + deps = [ + "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", + "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", + "//src/material/core:core_scss_lib", + ], ) diff --git a/src/material-experimental/mdc-snackbar/_snackbar-theme.scss b/src/material-experimental/mdc-snackbar/_snackbar-theme.scss index ff13ebfb6c3f..975ad6cf8f04 100644 --- a/src/material-experimental/mdc-snackbar/_snackbar-theme.scss +++ b/src/material-experimental/mdc-snackbar/_snackbar-theme.scss @@ -1,3 +1,6 @@ +@import '@material/snackbar/mixins.import'; +@import '@material/snackbar/variables.import'; +@import '@material/theme/functions.import'; @import '../mdc-helpers/mdc-helpers'; @mixin mat-mdc-snackbar-color($config-or-theme) {} diff --git a/src/material-experimental/mdc-snackbar/snackbar.html b/src/material-experimental/mdc-snackbar/snackbar.html index 78297c677be9..36774ae5048c 100644 --- a/src/material-experimental/mdc-snackbar/snackbar.html +++ b/src/material-experimental/mdc-snackbar/snackbar.html @@ -1 +1,15 @@ - +
+
+
+ Can't send photo. Retry in 5 seconds. +
+
+ +
+
+
diff --git a/src/material-experimental/mdc-snackbar/snackbar.scss b/src/material-experimental/mdc-snackbar/snackbar.scss index 98a14dcc113f..38fff9df8ecd 100644 --- a/src/material-experimental/mdc-snackbar/snackbar.scss +++ b/src/material-experimental/mdc-snackbar/snackbar.scss @@ -1 +1,3 @@ -// WIP: MDC-based snackbar +@import '@material/snackbar/mixins.import'; +@import '../mdc-helpers/mdc-helpers'; +@import '../../material/core/style/_layout-common.scss'; \ No newline at end of file From 2ebdec35e387e71f95972bb8f98bd3c756dda4ba Mon Sep 17 00:00:00 2001 From: Orlando Pozo Date: Fri, 26 Jun 2020 19:52:48 -0700 Subject: [PATCH 2/2] Add newline --- src/material-experimental/mdc-snackbar/snackbar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/material-experimental/mdc-snackbar/snackbar.scss b/src/material-experimental/mdc-snackbar/snackbar.scss index 38fff9df8ecd..aae9face7342 100644 --- a/src/material-experimental/mdc-snackbar/snackbar.scss +++ b/src/material-experimental/mdc-snackbar/snackbar.scss @@ -1,3 +1,3 @@ @import '@material/snackbar/mixins.import'; @import '../mdc-helpers/mdc-helpers'; -@import '../../material/core/style/_layout-common.scss'; \ No newline at end of file +@import '../../material/core/style/_layout-common.scss';