Skip to content

Commit

Permalink
Merge c1a989e into e6d0c03
Browse files Browse the repository at this point in the history
  • Loading branch information
@vidya-ram
vidya-ram committed Nov 12, 2019
2 parents e6d0c03 + c1a989e commit 6bf2333
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 73 deletions.
72 changes: 39 additions & 33 deletions baseframe/static/css/mui.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1688,10 +1688,10 @@ html {
}

body {
font-family: "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 14px;
font-weight: 400;
line-height: 1.429;
line-height: 1.5;
color: #1F2D3D;
background-color: #F9FAFC;
}
Expand All @@ -1715,18 +1715,18 @@ a:focus {
}

p {
margin: 0 0 10px;
margin: 0 0 10.5px;
}

ul,
ol {
margin-top: 0;
margin-bottom: 10px;
margin-bottom: 10.5px;
}

hr {
margin-top: 20px;
margin-bottom: 20px;
margin-top: 21px;
margin-bottom: 21px;
border: 0;
height: 1px;
background-color: rgba(132, 146, 166, 0.2);
Expand All @@ -1742,13 +1742,13 @@ abbr[title] {
}

h1, h2, h3 {
margin-top: 20px;
margin-bottom: 10px;
margin-top: 21px;
margin-bottom: 10.5px;
}

h4, h5, h6 {
margin-top: 10px;
margin-bottom: 10px;
margin-top: 10.5px;
margin-bottom: 10.5px;
}

/**
Expand Down Expand Up @@ -2085,7 +2085,7 @@ h4, h5, h6 {
}
.mui-radio > label,
.mui-checkbox > label {
min-height: 20px;
min-height: 21px;
padding-left: 20px;
margin-bottom: 0;
font-weight: normal;
Expand Down Expand Up @@ -2269,7 +2269,7 @@ h4, h5, h6 {
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 1.429;
line-height: 1.5;
color: #1F2D3D;
text-decoration: none;
white-space: nowrap;
Expand Down Expand Up @@ -2301,7 +2301,7 @@ h4, h5, h6 {
display: block;
width: 100%;
padding: 0;
margin-bottom: 10px;
margin-bottom: 10.5px;
font-size: 21px;
color: #1F2D3D;
line-height: inherit;
Expand Down Expand Up @@ -2350,7 +2350,7 @@ h4, h5, h6 {
*/
.mui-panel {
padding: 15px;
margin-bottom: 20px;
margin-bottom: 21px;
border-radius: 0;
background-color: #FFF;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.16), 0 0px 2px 0 rgba(0, 0, 0, 0.12);
Expand Down Expand Up @@ -2512,7 +2512,7 @@ h4, h5, h6 {
.mui-table {
width: 100%;
max-width: 100%;
margin-bottom: 20px;
margin-bottom: 21px;
}
.mui-table > thead > tr > th,
.mui-table > tbody > tr > th,
Expand All @@ -2526,7 +2526,7 @@ h4, h5, h6 {
.mui-table > tfoot > tr > th,
.mui-table > tfoot > tr > td {
padding: 10px;
line-height: 1.429;
line-height: 1.5;
}
.mui-table > thead > tr > th {
border-bottom: 2px solid rgba(132, 146, 166, 0.3);
Expand Down Expand Up @@ -3295,43 +3295,48 @@ h4, h5, h6 {
.mui--text-display3 {
font-weight: 400;
font-size: 64px;
line-height: 64px;
line-height: 1.2;
}

.mui--text-display2 {
font-weight: 400;
font-size: 48px;
line-height: 58px;
line-height: 1.2;
}

.mui--text-display1, h1, h1 {
.mui--text-display1, h1,
h1 {
font-weight: 400;
font-size: 32px;
line-height: 40px;
line-height: 1.2;
}

.mui--text-headline, h2, .header__site-title, .header__site-title__item, h2 {
.mui--text-headline, h2, .header__site-title, .header__site-title__item,
h2 {
font-weight: 400;
font-size: 24px;
line-height: 32px;
line-height: 1.4;
}

.mui--text-title, h3, .header__side-nav-list .header__side-nav-list__item__icon, .form-message, .modal .modal__header, h3 {
.mui--text-title, h3, .header__side-nav-list .header__side-nav-list__item__icon, .form-message, .modal .modal__header,
h3 {
font-weight: 400;
font-size: 18px;
line-height: 28px;
line-height: 1.5;
}

.mui--text-subhead, h4, .alert .alert__text, h4 {
.mui--text-subhead, h4, .alert .alert__text,
h4 {
font-weight: 400;
font-size: 16px;
line-height: 24px;
line-height: 1.5;
}

.mui--text-body2, h5, .header__dropdown-app-title, .header__side-nav-list .header__side-nav-list__item, .card .card__body, .modal .modal__body, h5 {
.mui--text-body2, h5, .header__dropdown-app-title, .header__side-nav-list .header__side-nav-list__item, .card .card__body, .modal .modal__body,
h5 {
font-weight: 400;
font-size: 14px;
line-height: 24px;
line-height: 1.5;
}

.mui--text-body1 {
Expand All @@ -3341,17 +3346,18 @@ h4, h5, h6 {
}

.mui--text-caption, .footer .footer__container, .mui-form .mui-form__sidetext,
.mui-form .mui-form__helptext, .mui-form .mui-form__error, h6 {
.mui-form .mui-form__helptext, .mui-form .mui-form__error,
h6 {
font-weight: 400;
font-size: 12px;
line-height: 16px;
line-height: 1.5;
}

.mui--text-menu,
.mui--text-button {
font-weight: 400;
font-size: 14px;
line-height: 18px;
line-height: 1.5;
}

.mui--text-uppercase {
Expand Down Expand Up @@ -4031,8 +4037,8 @@ li p + ol {

@media (min-width: 768px) {
.alert {
margin-top: 1em;
margin-bottom: 1em;
margin-top: 15px;
margin-bottom: 15px;
}
}
.thumbnail {
Expand Down
80 changes: 43 additions & 37 deletions baseframe/static/sass/baseframe-material/_helper.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
// ============================================================================

.mui-list--aligned {
padding-left: $reflex-cell-spacing;
padding-left: $reflex-cell-spacing;
}

// ============================================================================
// DISPLAY
// ============================================================================

.mui--d-block {
display: block;
.mui--d-block {
display: block;
}
.mui--d-inlineblock {
display: inline-block;
.mui--d-inlineblock {
display: inline-block;
}
.mui--d-inline {
display: inline;
.mui--d-inline {
display: inline;
}

// ============================================================================
// BACKGROUND COLORS
// ============================================================================

.mui--bg-primary {
background-color: $mui-bg-color-primary;
.mui--bg-primary {
background-color: $mui-bg-color-primary;
}
.mui--bg-primary-dark {
background-color: $mui-bg-color-dark;
.mui--bg-primary-dark {
background-color: $mui-bg-color-dark;
}
.mui--bg-primary-light {
background-color: $mui-bg-color-light;
.mui--bg-primary-light {
background-color: $mui-bg-color-light;
}

.mui--bg-accent {
background-color: $mui-bg-color-accent;
.mui--bg-accent {
background-color: $mui-bg-color-accent;
}

// ============================================================================
Expand All @@ -45,43 +45,48 @@
.mui--text-display3 {
font-weight: 400;
font-size: 64px;
line-height: 64px;
line-height: 1.2;
}

.mui--text-display2 {
font-weight: 400;
font-size: 48px;
line-height: 58px;
line-height: 1.2;
}

.mui--text-display1, h1 {
.mui--text-display1,
h1 {
font-weight: 400;
font-size: 32px;
line-height: 40px;
line-height: 1.2;
}

.mui--text-headline, h2 {
.mui--text-headline,
h2 {
font-weight: 400;
font-size: 24px;
line-height: 32px;
line-height: 1.4;
}

.mui--text-title, h3 {
.mui--text-title,
h3 {
font-weight: 400;
font-size: 18px;
line-height: 28px;
line-height: 1.5;
}

.mui--text-subhead, h4 {
font-weight: 400;
font-size: 16px;
line-height: 24px;
.mui--text-subhead,
h4 {
font-weight: 400;
font-size: 16px;
line-height: 1.5;
}

.mui--text-body2, h5 {
.mui--text-body2,
h5 {
font-weight: 400;
font-size: 14px;
line-height: 24px;
line-height: 1.5;
}

.mui--text-body1 {
Expand All @@ -90,17 +95,18 @@
line-height: 24px;
}

.mui--text-caption, h6 {
.mui--text-caption,
h6 {
font-weight: 400;
font-size: 12px;
line-height: 16px;
line-height: 1.5;
}

.mui--text-menu,
.mui--text-button {
font-weight: 400;
font-size: 14px;
line-height: 18px;
line-height: 1.5;
}

// ============================================================================
Expand Down Expand Up @@ -128,9 +134,9 @@
// ============================================================================

.mui-btn--nostyle {
padding: 0;
border: 0;
margin: 0;
cursor: pointer;
background: none;
padding: 0;
border: 0;
margin: 0;
cursor: pointer;
background: none;
}
6 changes: 4 additions & 2 deletions baseframe/static/sass/mui/_custom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@ $mui-bg-color-dark: #1F2D3D !default;
$mui-body-bg-color: $mui-bg-color-accent !default;

$mui-base-font-color: $mui-text-dark !default;
$mui-base-font-family: "Source Sans Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
$mui-base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
Oxygen, Ubuntu, Cantarell, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji",
"Segoe UI Emoji", "Segoe UI Symbol";
$mui-base-font-size: 14px !default;
$mui-base-font-size-desktop: 16px !default;
$mui-base-font-weight: 400 !default;
$mui-base-line-height: 1.429 !default;
$mui-base-line-height: 1.5 !default;
$mui-base-font-smoothing: false !default;

$mui-link-font-color: $mui-text-hyperlink !default;
Expand Down
1 change: 0 additions & 1 deletion baseframe/templates/baseframe/mui/baseframe.html.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
{% assets "css_all" -%}
<link rel="stylesheet" type="text/css" href="{{ ASSET_URL }}" />
{%- endassets %}
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400italic,600italic,400,600" />

{%- block typekit %}
{%- if config['TYPEKIT_CODE'] %}
Expand Down

0 comments on commit 6bf2333

Please sign in to comment.