Skip to content

Commit

Permalink
Merge pull request #3247 from SEED-platform/format-css-scss
Browse files Browse the repository at this point in the history
autoformat css/scss files
  • Loading branch information
nllong committed May 10, 2022
2 parents 4b4d4c7 + 8cdfcf1 commit e680eef
Show file tree
Hide file tree
Showing 4 changed files with 349 additions and 290 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ repos:
rev: v2.6.2
hooks:
- id: prettier
# for now ignoring css, scss, html, javascript
types_or: [yaml, markdown]
# for now ignoring html, javascript
types_or: [yaml, markdown, css, scss]
48 changes: 29 additions & 19 deletions seed/landing/static/landing/scss/landing.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
$font-family-sans-serif: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-sans-serif-narrow: "PT Sans Narrow", "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-sans-serif: "PT Sans", "Helvetica Neue", Helvetica, Arial,
sans-serif;
$font-family-sans-serif-narrow: "PT Sans Narrow", "Helvetica Neue", Helvetica,
Arial, sans-serif;
$font-family-base: $font-family-sans-serif;
$font-family-base-narrow: $font-family-sans-serif-narrow;
$font-size-base: 13px;
Expand Down Expand Up @@ -71,7 +73,8 @@ $bdp-landing-dk-gray: #606060;
border-top-left-radius: $radius;
}

html, body {
html,
body {
height: 100%;
margin: 0;
padding: 0;
Expand Down Expand Up @@ -108,7 +111,6 @@ body {
@include box-shadow(0 0 26px rgba(0, 0, 0, 0.7));

.page_section {

.section_marketing {
float: left;
width: 50%;
Expand Down Expand Up @@ -184,7 +186,7 @@ body {
min-height: 430px;
text-align: center;
border-left: 1px solid $bdp-landing-md-gray;
background: url('../images/landing/bg-paper.png');
background: url("../images/landing/bg-paper.png");
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;

Expand Down Expand Up @@ -259,22 +261,25 @@ body {
}

.chrome {
background: url('../images/landing/logo-chrome-64.png') top center no-repeat;
background: url("../images/landing/logo-chrome-64.png") top center
no-repeat;
margin-left: 63px;
}

.firefox {
background: url('../images/landing/logo-firefox-64.png') top center no-repeat;
background: url("../images/landing/logo-firefox-64.png") top center
no-repeat;
}

.safari {
background: url('../images/landing/logo-safari-64.png') top center no-repeat;
background: url("../images/landing/logo-safari-64.png") top center
no-repeat;
}

.ie {
background: url('../images/landing/logo-ie-64.png') top center no-repeat;
background: url("../images/landing/logo-ie-64.png") top center
no-repeat;
}

}

.browser_name {
Expand Down Expand Up @@ -310,12 +315,12 @@ body {
padding: 10px;
margin-top: 8px;
margin-bottom: 2px;
font-family: 'PT Sans Narrow', sans-serif;
font-family: "PT Sans Narrow", sans-serif;
font-size: 16px;
line-height: 20px;
color: $bdp-landing-lt-gray;
background-color: $white;
border: 1px solid #CCC;
border: 1px solid #ccc;
border-radius: 3px;
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075));
@include box-shadow(0px 1px 1px $white);
Expand All @@ -325,7 +330,9 @@ body {
input:focus {
border-color: rgba(82, 168, 236, 0.8);
outline: thin dotted 9;
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075) /* , 0 0 8px rgba(82,168,236,.6) */
@include box-shadow(
inset 0 1px 1px rgba(0, 0, 0, 0.075)
/* , 0 0 8px rgba(82,168,236,.6) */
);
}

Expand Down Expand Up @@ -367,7 +374,6 @@ body {
.opt-ins {
padding-top: 16px;
}

}

p {
Expand All @@ -380,7 +386,8 @@ body {
font-size: 16px;
}

.forgot_password, .create_account {
.forgot_password,
.create_account {
display: inline-block;
margin-top: 5px;
margin-bottom: 20px;
Expand All @@ -405,14 +412,13 @@ body {
.thank_you_text {
margin: 0 auto;
width: 75%;
line-height: 22px
line-height: 22px;
}
}

span.email_me {
font-size: 15px;
}

}
}

Expand All @@ -430,15 +436,19 @@ body {
}
}

.login.page .page_section .section_forms .signup_form table.signup_table .errorlist {
.login.page
.page_section
.section_forms
.signup_form
table.signup_table
.errorlist {
margin: 0 0 8px 0;
padding: 0;

li {
left: 0;
position: relative;
}

}

.terms_of_service {
Expand Down
120 changes: 76 additions & 44 deletions seed/static/seed/scss/fonts.scss
Original file line number Diff line number Diff line change
@@ -1,128 +1,160 @@
/* cyrillic-ext */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 400;
src: local('PT Sans'), local('PTSans-Regular'), url(../fonts/jizaRExUiTo99u79D0-ExdGM.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
src: local("PT Sans"), local("PTSans-Regular"),
url(../fonts/jizaRExUiTo99u79D0-ExdGM.woff2) format("woff2");
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 400;
src: local('PT Sans'), local('PTSans-Regular'), url(../fonts/jizaRExUiTo99u79D0aExdGM.woff2) format('woff2');
src: local("PT Sans"), local("PTSans-Regular"),
url(../fonts/jizaRExUiTo99u79D0aExdGM.woff2) format("woff2");
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* latin-ext */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 400;
src: local('PT Sans'), local('PTSans-Regular'), url(../fonts/jizaRExUiTo99u79D0yExdGM.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
src: local("PT Sans"), local("PTSans-Regular"),
url(../fonts/jizaRExUiTo99u79D0yExdGM.woff2) format("woff2");
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 400;
src: local('PT Sans'), local('PTSans-Regular'), url(../fonts/jizaRExUiTo99u79D0KExQ.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src: local("PT Sans"), local("PTSans-Regular"),
url(../fonts/jizaRExUiTo99u79D0KExQ.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 700;
src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/jizfRExUiTo99u79B_mh0OOtLQ0Z.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
src: local("PT Sans Bold"), local("PTSans-Bold"),
url(../fonts/jizfRExUiTo99u79B_mh0OOtLQ0Z.woff2) format("woff2");
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 700;
src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/jizfRExUiTo99u79B_mh0OqtLQ0Z.woff2) format('woff2');
src: local("PT Sans Bold"), local("PTSans-Bold"),
url(../fonts/jizfRExUiTo99u79B_mh0OqtLQ0Z.woff2) format("woff2");
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* latin-ext */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 700;
src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/jizfRExUiTo99u79B_mh0OCtLQ0Z.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
src: local("PT Sans Bold"), local("PTSans-Bold"),
url(../fonts/jizfRExUiTo99u79B_mh0OCtLQ0Z.woff2) format("woff2");
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'PT Sans';
font-family: "PT Sans";
font-style: normal;
font-weight: 700;
src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/jizfRExUiTo99u79B_mh0O6tLQ.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src: local("PT Sans Bold"), local("PTSans-Bold"),
url(../fonts/jizfRExUiTo99u79B_mh0O6tLQ.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 400;
src: local('PT Sans Narrow'), local('PTSans-Narrow'), url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCLwR26eg.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
src: local("PT Sans Narrow"), local("PTSans-Narrow"),
url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCLwR26eg.woff2) format("woff2");
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 400;
src: local('PT Sans Narrow'), local('PTSans-Narrow'), url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCCwR26eg.woff2) format('woff2');
src: local("PT Sans Narrow"), local("PTSans-Narrow"),
url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCCwR26eg.woff2) format("woff2");
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* latin-ext */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 400;
src: local('PT Sans Narrow'), local('PTSans-Narrow'), url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCIwR26eg.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
src: local("PT Sans Narrow"), local("PTSans-Narrow"),
url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCIwR26eg.woff2) format("woff2");
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 400;
src: local('PT Sans Narrow'), local('PTSans-Narrow'), url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCGwR0.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src: local("PT Sans Narrow"), local("PTSans-Narrow"),
url(../fonts/BngRUXNadjH0qYEzV7ab-oWlsbCGwR0.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 700;
src: local('PT Sans Narrow Bold'), local('PTSans-NarrowBold'), url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiIW_3QRQ.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
src: local("PT Sans Narrow Bold"), local("PTSans-NarrowBold"),
url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiIW_3QRQ.woff2) format("woff2");
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F,
U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 700;
src: local('PT Sans Narrow Bold'), local('PTSans-NarrowBold'), url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiBW_3QRQ.woff2) format('woff2');
src: local("PT Sans Narrow Bold"), local("PTSans-NarrowBold"),
url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiBW_3QRQ.woff2) format("woff2");
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* latin-ext */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 700;
src: local('PT Sans Narrow Bold'), local('PTSans-NarrowBold'), url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiLW_3QRQ.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
src: local("PT Sans Narrow Bold"), local("PTSans-NarrowBold"),
url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiLW_3QRQ.woff2) format("woff2");
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'PT Sans Narrow';
font-family: "PT Sans Narrow";
font-style: normal;
font-weight: 700;
src: local('PT Sans Narrow Bold'), local('PTSans-NarrowBold'), url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiFW_0.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src: local("PT Sans Narrow Bold"), local("PTSans-NarrowBold"),
url(../fonts/BngSUXNadjH0qYEzV7ab-oWlsbg95AiFW_0.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}

0 comments on commit e680eef

Please sign in to comment.