-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/dbdoyle182/Untitled-Dev-D…
…ictionary into cleanup
- Loading branch information
Showing
14 changed files
with
459 additions
and
507 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,14 @@ | ||
| # Untitled-Dev-Dictionary | ||
| TBA | ||
| # ConTech | ||
| Putting Tech into context. | ||
|
|
||
| By: | ||
| Alexander Bradley | ||
| Daniel Doyle | ||
| Brad Ferrel | ||
| Abby Olaleye | ||
|
|
||
| Live Link: | ||
|
|
||
| Inspiration: | ||
|
|
||
| The desire behind this project came from our experience first starting the UNCC Full Stack bootcamp and hearing many terms that just didn't quite stick. However, most resources went so far in depth we weren't sure were to start. Our application is an attempt to simply definitions for people new to the industry. |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,21 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> | ||
| <meta name="theme-color" content="#000000"> | ||
| <!-- | ||
| manifest.json provides metadata used when your web app is added to the | ||
| homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/ | ||
| --> | ||
| <link rel="manifest" href="%PUBLIC_URL%/manifest.json"> | ||
| <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico"> | ||
| <link rel="stylesheet" href="/reset.css"> | ||
| <link href="https://fonts.googleapis.com/css?family=Lora:400,400i|Roboto+Mono:300,700" rel="stylesheet"> | ||
| <!-- | ||
| Notice the use of %PUBLIC_URL% in the tags above. | ||
| It will be replaced with the URL of the `public` folder during the build. | ||
| Only files inside the `public` folder can be referenced from the HTML. | ||
|
|
||
| Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will | ||
| work correctly both with client-side routing and a non-root public URL. | ||
| Learn how to configure a non-root public URL by running `npm run build`. | ||
| --> | ||
| <title>ConTECH</title> | ||
| </head> | ||
| <body> | ||
| <noscript> | ||
| You need to enable JavaScript to run this app. | ||
| </noscript> | ||
| <div id="root"></div> | ||
| <!-- | ||
| This HTML file is a template. | ||
| If you open it directly in the browser, you will see an empty page. | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> | ||
| <meta name="theme-color" content="#000000"> | ||
| <link rel="stylesheet" href="/reset.css"> | ||
| <link href="https://fonts.googleapis.com/css?family=Rubik|Roboto+Mono:300,700" rel="stylesheet"> | ||
| <title>ConTECH | A Developer's Dictionary and Interactive Reference Tool.</title> | ||
|
|
||
| You can add webfonts, meta tags, or analytics to this file. | ||
| The build step will place the bundled scripts into the <body> tag. | ||
| </head> | ||
|
|
||
| To begin the development, run `npm start` or `yarn start`. | ||
| To create a production bundle, use `npm run build` or `yarn build`. | ||
| --> | ||
| </body> | ||
| </html> | ||
| <body> | ||
| <noscript> | ||
| You need to enable JavaScript to run this app. | ||
| </noscript> | ||
| <div id="root"></div> | ||
| </body> | ||
|
|
||
| </html> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,154 +1,145 @@ | ||
| .browse { | ||
| margin: 2% 5%; | ||
| position: relative; | ||
| background: #fff; | ||
| box-shadow: 0px 1px 4px 0 rgba(0,0,0,.15); | ||
| transition: all .3s ease-in-out; | ||
| text-align: center; | ||
| margin: 2% 5%; | ||
| position: relative; | ||
| background: #fff; | ||
| box-shadow: 0px 1px 4px 0 rgba(0, 0, 0, 0.15); | ||
| transition: all 0.3s ease-in-out; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .browse .title { | ||
| background: #32555a; | ||
| padding: 20px; | ||
| color: white; | ||
| font-size: 1.2em; | ||
| letter-spacing: .25px; | ||
| text-align: left; | ||
| background: #32555a; | ||
| padding: 20px; | ||
| color: white; | ||
| font-size: 1.2em; | ||
| letter-spacing: 0.25px; | ||
| text-align: left; | ||
| } | ||
|
|
||
| .stack { | ||
| display: flex; | ||
| flex-direction: column; | ||
| margin: 20px 0 0 0; | ||
| align-items: center; | ||
| text-align: left; | ||
| display: flex; | ||
| flex-direction: column; | ||
| margin: 20px 0 0 0; | ||
| align-items: center; | ||
| text-align: left; | ||
| } | ||
|
|
||
| .menu { | ||
| margin: 3% 0; | ||
| background: #55a2ac; | ||
| padding: 10px 20px 0 20px; | ||
| box-shadow: 0px 1px 5px #a0a0a0; | ||
| margin: 3% 0; | ||
| background: #55a2ac; | ||
| padding: 10px 20px 0 20px; | ||
| box-shadow: 0px 1px 5px #a0a0a0; | ||
| } | ||
|
|
||
| .browse:hover { | ||
| box-shadow: -2px 8px 22px 0 rgba(0,0,0,.15); | ||
| box-shadow: -2px 8px 22px 0 rgba(0, 0, 0, 0.15); | ||
| } | ||
|
|
||
| .browse-button { | ||
| background: #3f686e; | ||
| color: white; | ||
| padding: 15px 20px; | ||
| margin: 20px 0 20px 0; | ||
| letter-spacing: 1px; | ||
| font-size: 1em; | ||
| font-family: 'Lora', serif; | ||
| cursor: pointer; | ||
| box-shadow: 0px 1px 5px #a0a0a0; | ||
| transition: all .2s ease-in-out; | ||
| border: none; | ||
| background: #3f686e; | ||
| color: white; | ||
| padding: 15px 20px; | ||
| margin: 20px 0 20px 0; | ||
| letter-spacing: 1px; | ||
| font-size: 1em; | ||
| font-family: "Rubik", sans-serif; | ||
| cursor: pointer; | ||
| box-shadow: 0px 1px 5px #a0a0a0; | ||
| transition: all 0.2s ease-in-out; | ||
| border: none; | ||
| } | ||
|
|
||
| .browse-button:hover { | ||
| background: #32555a; | ||
| box-shadow: 0px 1px 5px #a0a0a0; | ||
| background: #32555a; | ||
| box-shadow: 0px 1px 5px #a0a0a0; | ||
| } | ||
|
|
||
| .browse-results { | ||
| margin: 0 5px 0 5px; | ||
| padding: 0 0 20px 0; | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: center; | ||
| flex-wrap: wrap; | ||
| margin: 0 5px 0 5px; | ||
| padding: 0 0 20px 0; | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: center; | ||
| flex-wrap: wrap; | ||
| } | ||
|
|
||
| .browse-link { | ||
| text-decoration-line: none; | ||
| color: white; | ||
| text-decoration-line: none; | ||
| color: white; | ||
| } | ||
|
|
||
| .browse-word { | ||
| background: #57bc90; | ||
| padding: 10px 15px; | ||
| border-radius: 20px; | ||
| transition: all .2s ease-in-out; | ||
| box-shadow: 0px 1px 4px 0 rgba(0,0,0,.15); | ||
| margin: 4px 2px; | ||
| cursor: pointer; | ||
| background: #57bc90; | ||
| padding: 10px 15px; | ||
| border-radius: 20px; | ||
| transition: all 0.2s ease-in-out; | ||
| box-shadow: 0px 1px 4px 0 rgba(0, 0, 0, 0.15); | ||
| margin: 4px 2px; | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .browse-word:hover { | ||
| color: white; | ||
| background: #3f8d6b; | ||
| box-shadow: -2px 8px 22px 0 rgba(0,0,0,.15); | ||
| color: white; | ||
| background: #3f8d6b; | ||
| box-shadow: -2px 8px 22px 0 rgba(0, 0, 0, 0.15); | ||
| } | ||
|
|
||
| @media only screen and (min-width: 600px) { | ||
|
|
||
| .browse { | ||
| margin: 5% 20%; | ||
| } | ||
|
|
||
| @media only screen and (min-width: 600px) { | ||
| .browse { | ||
| margin: 5% 20%; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (min-width: 1020px) { | ||
|
|
||
| .browse { | ||
| margin: 5% 10%; | ||
| } | ||
|
|
||
| .stack { | ||
| flex-direction: row; | ||
| justify-content: space-around; | ||
| margin: 0 0 20px 0; | ||
| } | ||
|
|
||
| .stack div { | ||
| margin: 0 2% 0 2%; | ||
| } | ||
|
|
||
| .browse .title { | ||
| font-size: 1.3em; | ||
| } | ||
|
|
||
| .browse-button { | ||
| font-size: 1.05em; | ||
| margin: 0; | ||
| padding: 22px 20px; | ||
| } | ||
|
|
||
| .holder { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-around; | ||
| align-items: center; | ||
| margin: 4% 0 0 0; | ||
| } | ||
|
|
||
| .browse-results { | ||
| margin: 0 20px 0 20px; | ||
| } | ||
|
|
||
| .browse-word { | ||
| margin: 5px 3px; | ||
| } | ||
|
|
||
| } | ||
| @media only screen and (min-width: 1020px) { | ||
| .browse { | ||
| margin: 5% 10%; | ||
| } | ||
|
|
||
| .stack { | ||
| flex-direction: row; | ||
| justify-content: space-around; | ||
| margin: 0 0 20px 0; | ||
| } | ||
|
|
||
| @media only screen and (min-width: 1200px) { | ||
| .stack div { | ||
| margin: 0 2% 0 2%; | ||
| } | ||
|
|
||
| .browse { | ||
| margin: 5% 15%; | ||
| } | ||
|
|
||
| } | ||
| .browse .title { | ||
| font-size: 1.3em; | ||
| } | ||
|
|
||
| .browse-button { | ||
| font-size: 1.05em; | ||
| margin: 0; | ||
| padding: 22px 20px; | ||
| } | ||
|
|
||
| @media only screen and (min-width: 1380px) { | ||
| .holder { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-around; | ||
| align-items: center; | ||
| margin: 4% 0 0 0; | ||
| } | ||
|
|
||
| .browse-results { | ||
| margin: 0 20px 0 20px; | ||
| } | ||
|
|
||
| .browse-word { | ||
| margin: 5px 3px; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (min-width: 1200px) { | ||
| .browse { | ||
| margin: 5% 15%; | ||
| } | ||
| } | ||
|
|
||
| .browse { | ||
| margin: 5% 20%; | ||
| } | ||
|
|
||
| @media only screen and (min-width: 1380px) { | ||
| .browse { | ||
| margin: 5% 20%; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.