Skip to content

Commit

Permalink
Merge pull request #216 from GTBitsOfGood/tony/tutorial-modal
Browse files Browse the repository at this point in the history
#207 create a reusable system of modals
  • Loading branch information
its-edmund authored Nov 20, 2022
2 parents 26bfeda + 61b549f commit 5dd57c9
Show file tree
Hide file tree
Showing 9 changed files with 2,678 additions and 3,116 deletions.
14 changes: 0 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,6 @@
"url-loader": "^4.0.0",
"uuid": "^7.0.3"
},
"devDependencies": {
"@bitwarden/cli": "^1.11.0",
"cross-env": "^7.0.2",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-standard": "^14.1.0",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.18.0",
"eslint-plugin-react-hooks": "^1.7.0",
"fx": "^20.0.0"
},
"babel": {
"presets": [
"env",
Expand Down
55 changes: 41 additions & 14 deletions src/assets/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,32 @@
font-family: "Avenir";
font-style: normal;
font-weight: 400;
src: local("Avenir LT Pro 45 Book"), local("AvenirLTPro-Book"), url(https://fonts.gstatic.com/l/font?kit=ijwUs5PnXdA4ZZUA55d-&skey=8887f17a62203d44&v=v3) 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("Avenir LT Pro 45 Book"), local("AvenirLTPro-Book"),
url(https://fonts.gstatic.com/l/font?kit=ijwUs5PnXdA4ZZUA55d-&skey=8887f17a62203d44&v=v3)
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;
}

@font-face {
font-family: "Avenir";
font-style: normal;
font-weight: 900;
src: url(//db.onlinewebfonts.com/c/901497541657a2f24e42848bcf7fad52?family=Avenir+Heavy);
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;
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;
}

@font-face {
font-family: "Avenir";
font-style: normal;
font-weight: 700;
src: url(//db.onlinewebfonts.com/c/901497541657a2f24e42848bcf7fad52?family=Avenir+Heavy);
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;
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;
}

* {
Expand All @@ -29,7 +37,9 @@
}

body {
font-family: "Avenir", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
font-family: "Avenir", -apple-system, BlinkMacSystemFont, "Segoe UI",
"Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
"Helvetica Neue", sans-serif;
}

#map {
Expand Down Expand Up @@ -353,7 +363,6 @@ h2 {
flex-flow: column-reverse;
}


/*Loading Spinner, Temporary*/

.spinner-wrap {
Expand All @@ -369,11 +378,27 @@ h2 {
height: 11em;
border-radius: 50%;
background: #ffffff;
background: -moz-linear-gradient( left, #0069d9 10%, rgba(0, 105, 217, 0) 42%);
background: -webkit-linear-gradient( left, #0069d9 10%, rgba(0, 105, 217, 0) 42%);
background: -moz-linear-gradient(
left,
#0069d9 10%,
rgba(0, 105, 217, 0) 42%
);
background: -webkit-linear-gradient(
left,
#0069d9 10%,
rgba(0, 105, 217, 0) 42%
);
background: -o-linear-gradient(left, #0069d9 10%, rgba(0, 105, 217, 0) 42%);
background: -ms-linear-gradient( left, #0069d9 10%, rgba(0, 105, 217, 0) 42%);
background: linear-gradient( to right, #0069d9 10%, rgba(0, 105, 217, 0) 42%);
background: -ms-linear-gradient(
left,
#0069d9 10%,
rgba(0, 105, 217, 0) 42%
);
background: linear-gradient(
to right,
#0069d9 10%,
rgba(0, 105, 217, 0) 42%
);
position: relative;
-webkit-animation: load3 1.4s infinite linear;
animation: load3 1.4s infinite linear;
Expand Down Expand Up @@ -742,14 +767,16 @@ h2 {
width: 90px;
background: #1a4f97;
transition: all 500ms;
box-shadow: 23.8596px 5.61404px 50px rgba(0, 0, 0, 0.02), 35.0877px 0px 70px rgba(86, 128, 248, 0.05), 14.0351px 0px 25px rgba(86, 128, 248, 0.03);
box-shadow: 23.8596px 5.61404px 50px rgba(0, 0, 0, 0.02),
35.0877px 0px 70px rgba(86, 128, 248, 0.05),
14.0351px 0px 25px rgba(86, 128, 248, 0.03);
}

#sidebar:hover {
width: 230px;
}

.logo:hover+#sidebar {
.logo:hover + #sidebar {
width: 230px;
}

Expand Down Expand Up @@ -1032,7 +1059,7 @@ h2 {
color: red;
}

.options-item .options-close:hover+.options-label:after {
.options-item .options-close:hover + .options-label:after {
transform: scaleX(1);
}

Expand Down Expand Up @@ -1458,4 +1485,4 @@ h2 {
max-height: 3vw;
max-width: 3vw;
margin-top: 35px;
}
}
Loading

0 comments on commit 5dd57c9

Please sign in to comment.