Skip to content

Commit d3cc708

Browse files
author
Vidya Ramakrishnan
authored
Merge b12e84b into b346451
2 parents b346451 + b12e84b commit d3cc708

File tree

16 files changed

+361
-272
lines changed

16 files changed

+361
-272
lines changed

baseframe/static/css/mui.css

Lines changed: 104 additions & 83 deletions
Large diffs are not rendered by default.

baseframe/static/img/favicon.ico

-16.6 KB
Binary file not shown.
23.2 KB
Loading

baseframe/static/img/logo.png

2.35 KB
Loading

baseframe/static/img/logo@2x.png

5.44 KB
Loading

baseframe/static/js/baseframe-material.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ window.Baseframe.Forms = {
321321
.find('button[type="submit"]')
322322
.click(function (event) {
323323
event.preventDefault();
324+
324325
$.ajax({
325326
url: url,
326327
type: 'POST',

baseframe/static/sass/baseframe-material/_alert.scss

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
padding: $mui-grid-padding;
33
border: 1px solid transparent;
44
border-radius: $mui-border-radius-default;
5-
background-color: transparentize($mui-info-color, 0.9);
6-
border-color: transparentize($mui-info-color, 0.8);
7-
color: $mui-info-color;
5+
background-color: $mui-info-color;
6+
border-color: transparentize($mui-text-info, 0.8);
7+
color: $mui-text-info;
88

99
.alert__heading {
1010
margin-top: 0;
@@ -42,39 +42,39 @@
4242
}
4343

4444
.alert--success {
45-
background-color: transparentize($mui-success-color, 0.9);
46-
border-color: transparentize($mui-success-color, 0.8);
47-
color: $mui-success-color;
45+
background-color: $mui-success-color;
46+
border-color: transparentize($mui-text-success, 0.8);
47+
color: $mui-text-success;
4848
}
4949

5050
.alert--success .alert__hr {
51-
border-top-color: #c9e2b3;
51+
border-top-color: transparentize($mui-text-success, 0.9);
5252
}
5353

5454
.alert--info .alert__hr {
55-
border-top-color: #a6e1ec;
55+
border-top-color: transparentize($mui-text-info, 0.9);
5656
}
5757

5858
.alert--warning {
59-
background-color: transparentize($mui-warning-color, 0.9);
60-
border-color: transparentize($mui-warning-color, 0.8);
61-
color: $mui-warning-color;
59+
background-color: $mui-warning-color;
60+
border-color: transparentize($mui-text-warning, 0.8);
61+
color: $mui-text-warning;
6262
}
6363

6464
.alert-warning .alert__hr {
65-
border-top-color: #f7e1b5;
65+
border-top-color: transparentize($mui-text-warning, 0.9);
6666
}
6767

6868
.alert--error,
6969
.alert--danger {
70-
background-color: transparentize($mui-danger-color, 0.9);
71-
border-color: transparentize($mui-danger-color, 0.8);
72-
color: $mui-danger-color;
70+
background-color: $mui-danger-color;
71+
border-color: transparentize($mui-text-danger, 0.8);
72+
color: $mui-text-danger;
7373
}
7474

7575
.alert--error .alert__hr,
7676
.alert--danger .alert__hr {
77-
border-top-color: #e4b9c0;
77+
border-top-color: transparentize($mui-text-danger, 0.9);
7878
}
7979

8080
@media (min-width: 768px) {

baseframe/static/sass/baseframe-material/_card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
.card__header {
2020
padding: $mui-grid-padding;
21-
background: $mui-bg-color-light;
21+
background: $mui-bg-color-dark;
2222
}
2323

2424
.card__header__title {

baseframe/static/sass/baseframe-material/_chip.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020

2121
.chip--bg-light {
22-
background-color: $mui-bg-color-light;
22+
background-color: $mui-bg-color-dark;
2323
color: $mui-text-dark;
2424
}
2525

baseframe/static/sass/baseframe-material/_form.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
.mui-form__error {
7171
color: $mui-text-white;
7272
margin: $mui-grid-padding/2 0 0;
73-
background: $mui-danger-color;
74-
border: 1px solid $mui-text-danger;
73+
background: $mui-text-danger;
74+
border: 1px solid transparentize($mui-text-danger, 0.8);
7575
padding: $mui-grid-padding/2 $mui-grid-padding;
7676
position: relative;
7777
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.14);
@@ -204,15 +204,15 @@
204204
position: absolute;
205205
top: 4px;
206206
left: 0;
207-
color: $mui-danger-color;
207+
color: $mui-text-danger;
208208
}
209209
.progress__bar--danger {
210-
background-color: $mui-danger-color;
210+
background-color: $mui-text-danger;
211211
}
212212
.progress__bar--success {
213-
background-color: $mui-success-color;
213+
background-color: $mui-text-success;
214214
.progress__txt {
215-
color: $mui-success-color;
215+
color: $mui-text-success;
216216
}
217217
}
218218
}

0 commit comments

Comments
 (0)