-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from cyprste2717218/dev
Bringing in conversion functionality
- Loading branch information
Showing
20 changed files
with
2,476 additions
and
1,707 deletions.
There are no files selected for viewing
Empty file.
Large diffs are not rendered by default.
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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,62 +1,248 @@ | ||
| .navbar-text { | ||
| font-size: 50px !important; | ||
| color: #FFFFFF; | ||
| } | ||
|
|
||
|
|
||
| .unit-category { | ||
| width: 110px; | ||
| height: 110px; | ||
| width: 100px; | ||
| height: 100px; | ||
| background-color: #FFFFFF; | ||
| overflow: visible; | ||
|
|
||
|
|
||
| } | ||
|
|
||
| .convert-div { | ||
| width: 90vw; | ||
| background-color: #D9D9D9; | ||
| .unit-option { | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-direction: column; | ||
| height: 100px; | ||
| border: 1px solid #000; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .convert-div { | ||
|
|
||
| .app-font { | ||
| font-family: 'Work Sans', sans-serif; | ||
| background-color: #D9D9D9; | ||
| } | ||
|
|
||
| .convert-div-title-box { | ||
| width: 90%; | ||
| height: 80px; | ||
| background-color: #346C2A; | ||
| font-size: 2.5em; | ||
| } | ||
|
|
||
| .hide-scroll::-webkit-scrollbar { | ||
| display: none; | ||
| background-color: #346C2A | ||
| } | ||
|
|
||
| .switch-units-div { | ||
| width: 60px; | ||
| height: 60px; | ||
| background-color: #D9D9D9; | ||
| margin-right: auto; | ||
| margin-left: auto; | ||
| margin-bottom: auto; | ||
| margin-top: auto; | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-direction: column; | ||
| font-size: 32px; | ||
| } | ||
|
|
||
| .dropdown-styling { | ||
| height: 80px; | ||
| .switch-units-div:hover { | ||
| animation: switch-units-scale-up-anim 0.15s ease-in-out forwards, switch-units-colour-focus-anim 0.15s ease-in-out forwards, switch-units-rotate-forward-anim 0.6s ease-in-out forwards; | ||
| } | ||
|
|
||
| .imperial-metric-unit-options { | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| .switch-units-div:not(:hover) { | ||
| animation: switch-units-scale-down-anim 0.15s ease-in-out forwards, switch-units-colour-unfocus-anim 0.15s ease-in-out forwards, switch-units-rotate-backward-anim 0.6s ease-in-out forwards; | ||
| } | ||
|
|
||
| .app-footer { | ||
| height: 150px; | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| .footer { | ||
|
|
||
| position: block; | ||
| bottom: 0; | ||
| left: 0; | ||
| right: 0; | ||
| height: 200px; | ||
| background-color: #D9D9D9; | ||
| font-size: 1.5em; | ||
| text-align: center; | ||
|
|
||
| } | ||
|
|
||
| .header-box { | ||
| font-size: 35px; | ||
| } | ||
|
|
||
|
|
||
| @media screen and (min-width: 1024px) { | ||
|
|
||
|
|
||
| .navbar-div { | ||
| background-color: #3EAD17; | ||
| height: 150px; | ||
| } | ||
|
|
||
| .navbar-text { | ||
| font-size: 45px; | ||
| color: #FFFFFF !important; | ||
| } | ||
|
|
||
| .from-to-unit-options { | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-direction: row; | ||
| } | ||
|
|
||
| .unit-details-div { | ||
| width: 100%; | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .mobile-br-elems { | ||
| display: none; | ||
| } | ||
|
|
||
| .dropdown-styling { | ||
| width: 20%; | ||
| height: 100px; | ||
| } | ||
|
|
||
| .larger-br-elems { | ||
| display: block; | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| } | ||
|
|
||
| @media screen and (max-width: 1023px) { | ||
|
|
||
| .navbar-text { | ||
| font-size: 30px; | ||
| color: #FFFFFF !important; | ||
| } | ||
|
|
||
| .navbar-div { | ||
| background-color: #3EAD17; | ||
| height: 100px; | ||
| font-size: 1px; | ||
| } | ||
|
|
||
| .from-to-unit-options { | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .unit-details-div { | ||
| display: flex; | ||
| justify-content: center; | ||
|
|
||
| } | ||
|
|
||
| .unit-details-span { | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-direction: row; | ||
| } | ||
|
|
||
| .switch-units-div { | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .mobile-br-elems { | ||
| display: block; | ||
| } | ||
|
|
||
| .dropdown-styling { | ||
| width: 100%; | ||
| height: 80px; | ||
| } | ||
|
|
||
| .larger-br-elems { | ||
| display: none; | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Animations */ | ||
|
|
||
| @keyframes switch-units-scale-up-anim { | ||
| from { | ||
| transform: scale(1); | ||
| } | ||
| to { | ||
| transform: scale(1.2); | ||
| } | ||
| } | ||
|
|
||
| @keyframes switch-units-scale-down-anim { | ||
| from { | ||
| transform: scale(1.2); | ||
| } | ||
| to { | ||
| transform: scale(1); | ||
| } | ||
| } | ||
|
|
||
| @keyframes switch-units-scale-up-down-anim { | ||
| from { | ||
| transform: scale(1); | ||
| } | ||
| 50% { | ||
| transform: scale(1.1); | ||
| } | ||
| to { | ||
| transform: scale(1) | ||
| } | ||
| } | ||
|
|
||
| @keyframes switch-units-colour-focus-anim { | ||
| from { | ||
| background-color: #D9D9D9; | ||
| color: #000; | ||
| } | ||
| to { | ||
| background-color: blue; | ||
| color: #fff; | ||
|
|
||
| } | ||
| } | ||
|
|
||
| @keyframes switch-units-colour-unfocus-anim { | ||
| from { | ||
| background-color: blue; | ||
| color: #fff; | ||
| } | ||
| to { | ||
| background-color: #d9d9d9; | ||
| color: #000; | ||
|
|
||
| } | ||
| } | ||
|
|
||
| @keyframes switch-units-rotate-forward-anim { | ||
| from { | ||
| transform: rotate(0deg); | ||
| } | ||
| to { | ||
| transform: rotate(180deg); | ||
| } | ||
| } | ||
|
|
||
| @keyframes switch-units-rotate-backward-anim { | ||
| from { | ||
| transform: rotate(180deg); | ||
| } | ||
| to { | ||
| transform: rotate(0deg); | ||
| } | ||
| } | ||
|
|
||
| /* @keyframes switch-units-font-anim { | ||
| from { | ||
| font-size: 32px; | ||
| } | ||
| } | ||
| to { | ||
| font-size: 32px; | ||
| } | ||
| } */ |
Oops, something went wrong.