Merge pull request #123 from brightlayer-ui/dev

Publish 7.01
etn-ccis · Jun 21, 2022 · 028e050 · 028e050
2 parents 7d136b1 + f28102c
commit 028e050
Show file tree

Hide file tree

Showing 11 changed files with 216 additions and 127 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,8 @@
+version: 1
+labels:
+- label: "master"
+  branch: "^hotfix/.*"
+- label: "master"
+  branch: "^release/.*"
+- label: "master"
+  branch: "^dev/.*"
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
@@ -0,0 +1,19 @@
+name: 'Comment on PR'
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  example_comment_pr:
+    runs-on: ubuntu-latest
+    name: comment PR if needed
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@v1
+        with:
+           message: 'Thank you for the master pull request. 👍 Please be sure this pull request is for the master branch. The master branch is used for items that are ready for publishing.
+           The dev branch is our working branch for all issues and enhancements. Please read our [Contributing Guidelines](https://github.com/brightlayer-ui/.github/blob/master/CONTRIBUTING.md#contributing-to-brightlayer-ui) for more information.'
+           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
@@ -0,0 +1,14 @@
+name: Label PRs
+
+on:
+- pull_request
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: srvaroa/labeler@master
+      env:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v7.0.1 (June 20, 2022)
+
+### Fixed
+
+-   Fixed incorrect autocomplete colors for input fields in dark theme ([#76](https://github.com/brightlayer-ui/angular-themes/issues/76)).
+-   Fixed default `mat-button` height not being 36px. ([#103](https://github.com/brightlayer-ui/angular-themes/issues/103))
+-   Fixed `mat-expansion-panel-header` border color not similar to divider color ([#107](https://github.com/brightlayer-ui/angular-themes/issues/107))
+-   Fixed `<blui-info-list-item>` disabled state when within a `<mat-nav-list>` ([#114](https://github.com/brightlayer-ui/angular-themes/issues/114))
+-   Fixed stepper input styles ([#90](https://github.com/brightlayer-ui/angular-themes/issues/90))
+-   Fixed `mat-button-toggle` border styles ([#109](https://github.com/brightlayer-ui/angular-themes/issues/109))
+
 ## v7.0.0 (March 14, 2022)
 
 ### Added

diff --git a/_blueTheme.scss b/_blueTheme.scss
@@ -514,4 +514,19 @@
     th.mat-header-cell {
         color: map-get($foreground, text);
     }
+
+    /* Mat Expansion Panel Header */
+    .mat-expansion-panel {
+        .mat-expansion-panel-header {
+            &.mat-expanded {
+                border-bottom: 1px solid map-get($foreground, divider);
+            }
+        }
+    }
+
+    /* Mat Nav List */
+    .mat-list-base .blui-info-list-item .mat-list-item-disabled {
+        color: unset;
+        background-color: unset;
+    }
 }
diff --git a/_common.scss b/_common.scss
@@ -4,6 +4,12 @@
         line-height: 1.24;
     }
 
+    button.mat-button,
+    a.mat-button {
+        height: 36px;
+        line-height: 36px;
+    }
+
     .mat-chip .mat-chip-avatar.mat-icon {
         height: 18px;
         width: 18px;
@@ -28,99 +34,77 @@
         }
     }
 
-    [dir='rtl'] {
-        .mat-button-toggle-group-appearance-standard {
-            .mat-button-toggle-appearance-standard {
-                &:first-of-type {
-                    .mat-button-toggle-button,
-                    .mat-button-toggle-focus-overlay,
-                    .mat-ripple.mat-button-toggle-ripple {
-                        border-radius: 0 4px 4px 0;
-                    }
-                }
-
-                &:last-of-type {
-                    .mat-button-toggle-button,
-                    .mat-button-toggle-focus-overlay,
-                    .mat-ripple.mat-button-toggle-ripple {
-                        border-radius: 4px 0 0 4px;
-                    }
-                }
-
-                &:not(:first-of-type) {
-                    margin-left: 0px;
-                    margin-right: -1px;
-                }
-            }
-
-            .mat-button-toggle-checked.mat-button-toggle-appearance-standard {
-                border-width: 1px;
-
-                .mat-button-toggle-button {
-                    margin-right: 0px;
-                    margin-left: -1px;
-                }
-
-                + {
-                    .mat-button-toggle-appearance-standard {
-                        margin-right: 0px;
-                    }
-                }
-            }
-        }
-    }
+    .mat-button-toggle-standalone.mat-button-toggle-appearance-standard,
     .mat-button-toggle-group-appearance-standard {
-        border: 0;
-        border-radius: 0;
-
+        border: 0 !important;
         .mat-button-toggle-appearance-standard {
             .mat-button-toggle-button {
-                border: 1px solid;
+                background-color: transparent;
+                border-radius: 4px;
             }
-
-            &:first-of-type {
-                .mat-button-toggle-button,
-                .mat-button-toggle-focus-overlay,
-                .mat-ripple.mat-button-toggle-ripple {
-                    border-radius: 4px 0 0 4px;
-                }
+        }
+        .mat-button-toggle-appearance-standard:first-of-type {
+            margin-left: 0;
+            border-right: 1px solid transparent !important ;
+        }
+        .mat-button-toggle-appearance-standard:not(:first-of-type) {
+            margin-left: -1px;
+        }
+        .mat-button-toggle-appearance-standard:last-of-type {
+            margin-right: -1px;
+        }
+        .mat-button-toggle-appearance-standard:not(:first-of-type) {
+            .mat-button-toggle-button {
+                margin-left: -1px;
+                border-left: 1px solid transparent;
+                border-top-left-radius: 0;
+                border-bottom-left-radius: 0;
             }
-
-            &:last-of-type {
-                .mat-button-toggle-button,
-                .mat-button-toggle-focus-overlay,
-                .mat-ripple.mat-button-toggle-ripple {
-                    border-radius: 0 4px 4px 0px;
-                }
+        }
+        .mat-button-toggle-appearance-standard:not(:last-of-type) {
+            .mat-button-toggle-button {
+                border-top-right-radius: 0;
+                border-bottom-right-radius: 0;
             }
+        }
+        .mat-button-toggle-checked {
+            background-color: transparent;
+        }
+    }
 
-            &:not(:first-of-type) {
-                margin-left: -1px;
-            }
+    [dir='rtl'] {
+        .mat-button-toggle-appearance-standard:last-of-type {
+            margin-right: 0;
+            border-left: 1px solid transparent !important ;
+        }
 
-            &.mat-button-toggle-checked {
-                background-color: transparent;
+        .mat-button-toggle-appearance-standard:first-of-type,
+        .mat-button-toggle-appearance-standard:last-of-type {
+            .mat-button-toggle-button {
+                border-radius: 4px;
             }
         }
 
-        // checked toggle button
-        .mat-button-toggle-checked.mat-button-toggle-appearance-standard {
-            border-width: 1px;
-
+        .mat-button-toggle-appearance-standard:not(:first-of-type) {
             .mat-button-toggle-button {
                 margin-right: -1px;
+                border-right: 1px solid transparent;
+                border-top-right-radius: 0;
+                border-bottom-right-radius: 0;
             }
+        }
 
-            + {
-                .mat-button-toggle-appearance-standard {
-                    margin-left: 0px;
-                }
+        .mat-button-toggle-appearance-standard:not(:last-of-type) {
+            .mat-button-toggle-button {
+                border-top-left-radius: 0;
+                border-bottom-left-radius: 0;
             }
         }
     }
 
     .mat-expansion-panel {
         .mat-expansion-panel-header {
+            border-radius: 0;
             .mat-expansion-indicator {
                 transition: margin 150ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
                 margin-top: -8px;
@@ -304,6 +288,11 @@
         }
     }
 
+    .mat-horizontal-content-container,
+    .mat-vertical-content {
+        padding: 8px 1.5rem 24px 1.5rem;
+    }
+
     $ltrOutlinePadding: 0 12px 0 16px;
     $rtlOutlinePadding: 0 16px 0 12px;
     [dir='rtl'] {

diff --git a/_darkTheme.scss b/_darkTheme.scss
@@ -189,6 +189,23 @@
     .mat-form-field-appearance-outline.mat-form-field-disabled .mat-form-field-outline {
         color: map-get($foreground, disabled);
     }
+    // Autocomplete overrides
+    input:-webkit-autofill,
+    input:-webkit-autofill:hover,
+    input:-webkit-autofill:focus,
+    input:-webkit-autofill:active {
+        -webkit-box-shadow: 0 0 0 30px #333d43 inset !important;
+        -webkit-text-fill-color: map-get($foreground, text);
+    }
+    .mat-form-field-appearance-fill {
+        input:-webkit-autofill,
+        input:-webkit-autofill:hover,
+        input:-webkit-autofill:focus,
+        input:-webkit-autofill:active {
+            //#1e2529
+            -webkit-box-shadow: 0 0 0 30px #424e54 inset !important;
+        }
+    }
 
     /* Buttons*/
     $buttonPrimary: (
@@ -631,4 +648,19 @@
     th.mat-header-cell {
         color: map-get($foreground, text);
     }
+
+    /* Mat Expansion Panel Header */
+    .mat-expansion-panel {
+        .mat-expansion-panel-header {
+            &.mat-expanded {
+                border-bottom: 1px solid map-get($foreground, divider);
+            }
+        }
+    }
+
+    /* Mat Nav List */
+    .mat-list-base .blui-info-list-item .mat-list-item-disabled {
+        color: unset;
+        background-color: unset;
+    }
 }