Skip to content

Commit

Permalink
Merge dad4513 into 8dc691b
Browse files Browse the repository at this point in the history
  • Loading branch information
@vidya-ram
vidya-ram committed Jul 30, 2020
2 parents 8dc691b + dad4513 commit bd384bf
Show file tree
Hide file tree
Showing 13 changed files with 357 additions and 259 deletions.
179 changes: 102 additions & 77 deletions baseframe/static/css/mui.css
View file

Large diffs are not rendered by default.

Binary file modified baseframe/static/img/favicon.ico
View file
Binary file not shown.
Binary file modified baseframe/static/img/logo-large.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified baseframe/static/img/logo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified baseframe/static/img/logo@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions baseframe/static/js/baseframe-material.js
View file
Expand Up @@ -321,6 +321,7 @@ window.Baseframe.Forms = {
.find('button[type="submit"]')
.click(function (event) {
event.preventDefault();
console.log('handleFormSubmit');
$.ajax({
url: url,
type: 'POST',
Expand Down
32 changes: 16 additions & 16 deletions baseframe/static/sass/baseframe-material/_alert.scss
View file
Expand Up @@ -2,9 +2,9 @@
padding: $mui-grid-padding;
border: 1px solid transparent;
border-radius: $mui-border-radius-default;
background-color: transparentize($mui-info-color, 0.9);
border-color: transparentize($mui-info-color, 0.8);
color: $mui-info-color;
background-color: $mui-info-color;
border-color: transparentize($mui-text-info, 0.8);
color: $mui-text-info;

.alert__heading {
margin-top: 0;
Expand Down Expand Up @@ -42,39 +42,39 @@
}

.alert--success {
background-color: transparentize($mui-success-color, 0.9);
border-color: transparentize($mui-success-color, 0.8);
color: $mui-success-color;
background-color: $mui-success-color;
border-color: transparentize($mui-text-success, 0.8);
color: $mui-text-success;
}

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

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

.alert--warning {
background-color: transparentize($mui-warning-color, 0.9);
border-color: transparentize($mui-warning-color, 0.8);
color: $mui-warning-color;
background-color: $mui-warning-color;
border-color: transparentize($mui-text-warning, 0.8);
color: $mui-text-warning;
}

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

.alert--error,
.alert--danger {
background-color: transparentize($mui-danger-color, 0.9);
border-color: transparentize($mui-danger-color, 0.8);
color: $mui-danger-color;
background-color: $mui-danger-color;
border-color: transparentize($mui-text-danger, 0.8);
color: $mui-text-danger;
}

.alert--error .alert__hr,
.alert--danger .alert__hr {
border-top-color: #e4b9c0;
border-top-color: transparentize($mui-text-danger, 0.9);
}

@media (min-width: 768px) {
Expand Down
12 changes: 6 additions & 6 deletions baseframe/static/sass/baseframe-material/_form.scss
View file
Expand Up @@ -70,8 +70,8 @@
.mui-form__error {
color: $mui-text-white;
margin: $mui-grid-padding/2 0 0;
background: $mui-danger-color;
border: 1px solid $mui-text-danger;
background: $mui-text-danger;
border: 1px solid transparentize($mui-text-danger, 0.8);
padding: $mui-grid-padding/2 $mui-grid-padding;
position: relative;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.14);
Expand Down Expand Up @@ -204,15 +204,15 @@
position: absolute;
top: 4px;
left: 0;
color: $mui-danger-color;
color: $mui-text-danger;
}
.progress__bar--danger {
background-color: $mui-danger-color;
background-color: $mui-text-danger;
}
.progress__bar--success {
background-color: $mui-success-color;
background-color: $mui-text-success;
.progress__txt {
color: $mui-success-color;
color: $mui-text-success;
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions baseframe/static/sass/baseframe-material/_layout.scss
View file
Expand Up @@ -134,3 +134,17 @@ li p + ol {
display: inline-block;
vertical-align: middle;
}

.mui-btn--accent,
.mui-btn--accent:hover,
.mui-btn--accent:active,
.mui-btn--accent:focus {
background: $mui-bg-color-primary;
color: $mui-primary-color;
border: 1px solid $mui-primary-color;
box-shadow: none;
}

.mui-btn--accent.mui-btn--flat {
border: none !important;
}
5 changes: 2 additions & 3 deletions baseframe/static/sass/baseframe-material/_menu.scss
View file
Expand Up @@ -136,7 +136,7 @@
.header__nav-links {
font-size: 14px;
line-height: 1;
color: $mui-text-light;
color: $mui-neutral-color;
display: inline-block;
text-decoration: none;
text-align: center;
Expand All @@ -152,7 +152,7 @@
}

.header__nav-links-active .header__nav-links__icon {
color: #e05f26;
color: $mui-primary-color;
}

@media only screen and (max-device-width: 1200px) and (orientation: landscape) {
Expand Down Expand Up @@ -180,7 +180,6 @@
}

.header__nav-links:hover {
color: $mui-text-light;
text-decoration: none;
}

Expand Down
92 changes: 42 additions & 50 deletions baseframe/static/sass/mui/_buttons.scss
View file
Expand Up @@ -4,43 +4,43 @@

@mixin x-btn-box-shadow-raised() {
box-shadow: 0 0px 2px rgba(mui-color('black'), 0.12),
0 2px 2px rgba(mui-color('black'), 0.20);
0 2px 2px rgba(mui-color('black'), 0.2);

// IE10+
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
box-shadow: 0 -1px 2px rgba(mui-color('black'), 0.12),
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 2px rgba(mui-color('black'), 0.12),
0 2px 2px rgba(mui-color('black'), 0.20);
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 2px rgba(mui-color('black'), 0.12),
0 2px 2px rgba(mui-color('black'), 0.2);
}

// Edge
@supports (-ms-ime-align:auto) {
@supports (-ms-ime-align: auto) {
box-shadow: 0 -1px 2px rgba(mui-color('black'), 0.12),
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 2px rgba(mui-color('black'), 0.12),
0 2px 2px rgba(mui-color('black'), 0.20);
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 2px rgba(mui-color('black'), 0.12),
0 2px 2px rgba(mui-color('black'), 0.2);
}
}

@mixin x-btn-box-shadow-active() {
box-shadow: 0 0px 4px rgba(mui-color('black'), 0.12),
1px 3px 4px rgba(mui-color('black'), 0.20);
1px 3px 4px rgba(mui-color('black'), 0.2);

// IE10+
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
box-shadow: 0 -1px 2px rgba(mui-color('black'), 0.12),
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 4px rgba(mui-color('black'), 0.12),
1px 3px 4px rgba(mui-color('black'), 0.20);
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 4px rgba(mui-color('black'), 0.12),
1px 3px 4px rgba(mui-color('black'), 0.2);
}

// Edge
@supports (-ms-ime-align:auto) {
@supports (-ms-ime-align: auto) {
box-shadow: 0 -1px 2px rgba(mui-color('black'), 0.12),
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 4px rgba(mui-color('black'), 0.12),
1px 3px 4px rgba(mui-color('black'), 0.20);
-1px 0px 2px rgba(mui-color('black'), 0.12),
0 0px 4px rgba(mui-color('black'), 0.12),
1px 3px 4px rgba(mui-color('black'), 0.2);
}
}

Expand All @@ -49,30 +49,32 @@
// ============================================================================

.mui-btn {
@include mui-text("button");
@include mui-text('button');

@include button-variant(
$mui-btn-default-font-color,
$mui-btn-default-bg-color);
$mui-btn-default-bg-color
);

@include button-flat-variant(
$mui-btn-default-font-color,
$mui-btn-flat-bg-color-hover);
$mui-btn-flat-bg-color-hover
);

transition: all 0.2s ease-in-out;

// Layout
display: inline-block;
height: $mui-btn-height;
padding: 0 $mui-btn-padding-horizontal;
margin: $mui-btn-margin-vertical 0;

// Look and feel
border: none;
border-radius: $mui-btn-border-radius;
cursor: pointer;
touch-action: manipulation;
background-image: none; // reset unusual Firefox-on-Android
background-image: none; // reset unusual Firefox-on-Android

// Typography
text-align: center;
Expand All @@ -87,7 +89,7 @@
// For ripples
position: relative;
overflow: hidden;

&:hover,
&:focus,
&:active {
Expand All @@ -100,7 +102,7 @@
&:focus {
@include x-btn-box-shadow-raised();
}

&:active:hover {
@include x-btn-box-shadow-active();
}
Expand All @@ -109,7 +111,7 @@
&.mui--is-disabled {
cursor: $mui-cursor-disabled;
pointer-events: none;
opacity: 0.60;
opacity: 0.6;
box-shadow: none;
}
}
Expand All @@ -118,13 +120,10 @@
margin-left: $mui-btn-spacing-horizontal;
}



// ============================================================================
// BUTTON-TYPES
// ============================================================================


// ----------------------------------------------------------------------------
// FLAT
// ----------------------------------------------------------------------------
Expand All @@ -141,7 +140,6 @@
}
}


// ----------------------------------------------------------------------------
// RAISED
// ----------------------------------------------------------------------------
Expand All @@ -154,7 +152,6 @@
}
}


// ----------------------------------------------------------------------------
// FLOATING-ACTION-BUTTON-(FAB)
// ----------------------------------------------------------------------------
Expand All @@ -172,50 +169,45 @@
z-index: 1;
}



// ============================================================================
// BUTTON-STYLES
// ============================================================================

.mui-btn--primary {
@include button-variant(
$mui-btn-primary-font-color,
$mui-btn-primary-bg-color);
$mui-btn-primary-bg-color
);
@include button-flat-variant(
$mui-btn-primary-bg-color,
$mui-btn-flat-bg-color-hover);
$mui-btn-flat-bg-color-hover
);
}

.mui-btn--dark {
@include button-variant(
$mui-btn-dark-font-color,
$mui-btn-dark-bg-color);
@include button-variant($mui-btn-dark-font-color, $mui-btn-dark-bg-color);
@include button-flat-variant(
$mui-btn-dark-bg-color,
$mui-btn-flat-bg-color-hover);
$mui-btn-flat-bg-color-hover
);
}

.mui-btn--danger {
@include button-variant(
$mui-btn-danger-font-color,
$mui-btn-danger-bg-color);
@include button-variant($mui-btn-danger-font-color, $mui-btn-danger-bg-color);
@include button-flat-variant(
$mui-btn-danger-bg-color,
$mui-btn-flat-bg-color-hover);
$mui-btn-flat-bg-color-hover
);
}

.mui-btn--accent {
@include button-variant(
$mui-btn-accent-font-color,
$mui-btn-accent-bg-color);
@include button-variant($mui-btn-accent-font-color, $mui-btn-accent-bg-color);
@include button-flat-variant(
$mui-btn-accent-bg-color,
$mui-btn-flat-bg-color-hover);
$mui-btn-flat-bg-color-hover
);
}



// ============================================================================
// BUTTON-SIZES
// ============================================================================
Expand Down

0 comments on commit bd384bf

Please sign in to comment.