forked from PBoleander/Calc
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release/11.0.0-preview1'
# Conflicts: # Calc.Browser/Roots.xml # Calc/App.axaml # Calc/Calc.csproj # Calc/Views/MainView.axaml # Directory.Build.props
- Loading branch information
Showing
6 changed files
with
416 additions
and
248 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,64 +1,133 @@ | ||
| .highlight { | ||
| color: white; | ||
| font-size: 2.5rem; | ||
| display: block; | ||
| } | ||
|
|
||
| .purple { | ||
| color: #8b44ac; | ||
| } | ||
|
|
||
| .icon { | ||
| opacity : 0.05; | ||
| height: 35%; | ||
| width: 35%; | ||
| position : absolute; | ||
| background-repeat: no-repeat; | ||
| right: 0px; | ||
| bottom: 0px; | ||
| margin-right: 3%; | ||
| margin-bottom: 5%; | ||
| z-index: 5000; | ||
| background-position: right bottom; | ||
| pointer-events: none; | ||
| } | ||
|
|
||
| #avalonia-splash a{ | ||
| color: whitesmoke; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| .center { | ||
| .center { | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 100vh; | ||
| } | ||
|
|
||
| #avalonia-splash { | ||
| position: relative; | ||
| position: absolute; | ||
| height: 100%; | ||
| width: 100%; | ||
| color: whitesmoke; | ||
| background: #1b2a4e; | ||
| font-family: 'Nunito', sans-serif; | ||
| background-position: center; | ||
| background-size: cover; | ||
| background-repeat: no-repeat; | ||
| background: black; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .splash-close { | ||
| animation: fadeout 0.25s linear forwards; | ||
| animation: fadeout 0.3s linear forwards; | ||
| } | ||
|
|
||
| .spinner-container { | ||
| display: flex; | ||
| position: absolute; | ||
| height: 100%; | ||
| width: 100%; | ||
| justify-content: center; | ||
| align-items: center; | ||
| animation: delayedFadeIn 4s linear both; | ||
| background: transparent; | ||
| } | ||
|
|
||
| #out { | ||
| position: absolute; | ||
| height: 100%; | ||
| width: 100%; | ||
| z-index: 1; | ||
| } | ||
|
|
||
| @keyframes fadeout { | ||
| 0% { | ||
| opacity:100%; | ||
| 0% { | ||
| opacity: 100%; | ||
| } | ||
| 100% { | ||
| opacity: 0; | ||
| visibility: collapse; | ||
| left: 100%; | ||
| } | ||
| } | ||
|
|
||
| @keyframes delayedFadeIn { | ||
| 0% { | ||
| visibility: collapse; | ||
| } | ||
| 100% { | ||
| opacity:0; | ||
| 99% { | ||
| visibility: collapse; | ||
| } | ||
| 100% { | ||
| visibility: visible; | ||
| } | ||
| } | ||
|
|
||
| .loader { | ||
| animation: rotate 1s infinite; | ||
| height: 50px; | ||
| width: 50px; | ||
| } | ||
|
|
||
| .loader:before, | ||
| .loader:after { | ||
| border-radius: 50%; | ||
| content: ''; | ||
| display: block; | ||
| height: 20px; | ||
| width: 20px; | ||
| } | ||
| .loader:before { | ||
| animation: ball1 1s infinite; | ||
| background-color: white; | ||
| box-shadow: 30px 0 0 white; | ||
| margin-bottom: 10px; | ||
| } | ||
| .loader:after { | ||
| animation: ball2 1s infinite; | ||
| background-color: white; | ||
| box-shadow: 30px 0 0 white; | ||
| } | ||
|
|
||
| @keyframes rotate { | ||
| 0% { | ||
| -webkit-transform: rotate(0deg) scale(0.8); | ||
| -moz-transform: rotate(0deg) scale(0.8); | ||
| } | ||
| 50% { | ||
| -webkit-transform: rotate(360deg) scale(1.2); | ||
| -moz-transform: rotate(360deg) scale(1.2); | ||
| } | ||
| 100% { | ||
| -webkit-transform: rotate(720deg) scale(0.8); | ||
| -moz-transform: rotate(720deg) scale(0.8); | ||
| } | ||
| } | ||
|
|
||
| @keyframes ball1 { | ||
| 0% { | ||
| box-shadow: 30px 0 0 white; | ||
| } | ||
| 50% { | ||
| box-shadow: 0 0 0 white; | ||
| margin-bottom: 0; | ||
| -webkit-transform: translate(15px,15px); | ||
| -moz-transform: translate(15px, 15px); | ||
| } | ||
| 100% { | ||
| box-shadow: 30px 0 0 white; | ||
| margin-bottom: 10px; | ||
| } | ||
| } | ||
|
|
||
| @keyframes ball2 { | ||
| 0% { | ||
| box-shadow: 30px 0 0 white; | ||
| } | ||
| 50% { | ||
| box-shadow: 0 0 0 white; | ||
| margin-top: -20px; | ||
| -webkit-transform: translate(15px,15px); | ||
| -moz-transform: translate(15px, 15px); | ||
| } | ||
| 100% { | ||
| box-shadow: 30px 0 0 white; | ||
| margin-top: 0; | ||
| } | ||
| } |
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
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
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
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.