Skip to content

Commit ebeaae4

Browse files
authored
Merge branch 'master' into reset_all_fix
2 parents a0ddee8 + 18c157f commit ebeaae4

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/app/proposals/proposal-dashboard/proposal-dashboard.component.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ mat-sidenav-container {
44
background-color: #ffffff;
55
overflow-x: hidden;
66

7-
:host-context(.anonymous-site) .action-column {
8-
margin-top: 3.5rem;
9-
}
107
.action-column {
118
.add-card {
129
margin: 1rem 0 1rem;

src/app/shared/modules/dynamic-material-table/table/dynamic-mat-table.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
overflow: hidden;
1010
transition: 0.3s cubic-bezier(0.46, -0.72, 0.46, 1.54);
1111

12-
box-shadow: var(--theme-side-panel-shadow);
13-
border: var(--theme-side-panel-border, 1px solid rgba(153, 213, 233, 0.7));
12+
box-shadow: var(--theme-table-shadow);
13+
border: var(--theme-table-border, 1px solid rgba(153, 213, 233, 0.7));
1414
border-radius: 4px;
1515

1616
&.disable-border {

src/assets/theme.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
"--theme-hover-lighter": "#e5e5e5",
5555
"--theme-hover-lighter-contrast": "#000000",
5656
"--theme-hover-darker": "#b2b2b2",
57-
"--theme-hover-darker-contrast": "#000000"
57+
"--theme-hover-darker-contrast": "#000000",
58+
"--theme-side-panel-border": "none",
59+
"--theme-side-panel-shadow": "0px 2px 1px -1px rgba(0, 0, 0, 0.20), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12)",
60+
"--theme-table-border": "none",
61+
"--theme-table-shadow": "0px 2px 1px -1px rgba(0, 0, 0, 0.20), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12)"
5862
}
5963
}

0 commit comments

Comments
 (0)