Skip to content

Commit

Permalink
Merge branch 'develop' into fix/build-deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
ravichdev committed Mar 10, 2021
2 parents bd6243c + 4099171 commit ce586e5
Show file tree
Hide file tree
Showing 83 changed files with 13,913 additions and 192,992 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ install:
- npm run build:js
- export DEV_LIB_PATH=vendor/xwp/wp-dev-lib/scripts
- export DIFF_HEAD=HEAD
- export DEFAULT_BASE_BRANCH=main
- source "$DEV_LIB_PATH/travis.install.sh"

before_script:
Expand Down
16 changes: 13 additions & 3 deletions assets/css/src/components/material.css
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,19 @@
}
}

.mdc-icon-button::before,
.mdc-icon-button::after {
background-color: var(--mdc-theme-on-surface, #000);
.mdc-icon-button {
color: var(--mdc-theme-primary, #6200ee);

&:hover,
&:focus,
&:visited {
color: var(--mdc-theme-primary, #6200ee);
}

&::before,
&::after {
background-color: var(--mdc-theme-on-surface, #000);
}
}

.mdc-switch:not(.mdc-switch--checked)
Expand Down
1 change: 1 addition & 0 deletions assets/css/src/material-components.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@
@import "@material/tab-scroller/dist/mdc.tab-scroller.css";
@import "@material/textfield/dist/mdc.textfield.css";
@import "@material/typography/dist/mdc.typography.css";
@import "@material/tooltip/dist/mdc.tooltip.css";
@import "./components/material.css";
16 changes: 16 additions & 0 deletions assets/css/src/overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ html {

&:hover,
&:focus {
background-color: transparent !important;
color: var(--mdc-theme-primary, #6200ee) !important;
text-decoration: none !important;
}
Expand All @@ -94,6 +95,7 @@ html {

&:hover,
&:focus {
background-color: var(--mdc-theme-primary, #6200ee) !important;
color: var(--mdc-theme-on-primary, #fff) !important;
}
}
Expand All @@ -113,6 +115,20 @@ html {
border-color: rgba(var(--mdc-theme-on-surface-rgb), .12) !important;
}

.mdc-icon-button {

&::before,
&::after {
background-color: var(--mdc-theme-on-surface, #000) !important;
}

&:hover,
&:focus {
background-color: transparent !important;
text-decoration: none !important;
}
}

/* Data Table */
.mdc-data-table {
background-color: var(--mdc-theme-surface, #fff) !important;
Expand Down
Loading

0 comments on commit ce586e5

Please sign in to comment.