Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #954

Merged
merged 30 commits into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8aad151
feat: :lipstick: new ui
thkruz Sep 28, 2024
1e52b2f
fix: :bug: fix bug in processLimitedSats_ that caused duplicated ids
thkruz Sep 28, 2024
4aaca31
feat: :sparkles: add camera reset function
thkruz Sep 28, 2024
eee3c4a
fix: :bug: fix bug where some plugins reenable in mobile mode
thkruz Sep 28, 2024
1031a8c
fix: :lipstick: fix missing nav-bar-height on mobile
thkruz Sep 28, 2024
d8a6121
fix: :bug: fix dark-clouds preset
thkruz Sep 28, 2024
a740e58
feat: :sparkles: add sateliot preset
thkruz Sep 28, 2024
d34171f
fix: :bug: fix unknown countries showing up as Grenada
thkruz Sep 28, 2024
ae65e20
refactor: :wastebasket: remove deprecated style code
thkruz Sep 28, 2024
1599330
refactor: :lipstick: more changes to ui color
thkruz Sep 28, 2024
6b52f82
refactor: :recycle: refactor the satellite cone mesh distance from ea…
thkruz Sep 28, 2024
5d71775
feat: :sparkles: add different logic for rotation reset vs full camer…
thkruz Sep 28, 2024
ccdd349
fix: :lipstick: fix duplicate shadow effect
thkruz Sep 28, 2024
588cc81
refactor: :lipstick: more color updates
thkruz Sep 28, 2024
e122005
fix: :lipstick: fix custom sensor plugin menu width
thkruz Sep 28, 2024
e87a748
feat: :sparkles: add links to satellite owner websites
thkruz Sep 28, 2024
47f9fd7
feat: :sparkles: add colorbox header
thkruz Sep 28, 2024
5b31fc7
fix: :bug: fix bug where polar plot could be opened without a sensor …
thkruz Sep 28, 2024
876c13b
feat: :lipstick: shrink sat-info-box when multiple menus are collapsed
thkruz Sep 28, 2024
da818f9
feat: :lipstick: add iss flag
thkruz Sep 28, 2024
fe3cb6f
refactor: :recycle: change default search size
thkruz Sep 28, 2024
31eb09e
fix: :bug: fix sensor-list side menu size
thkruz Sep 28, 2024
bd285c3
refactor: :lipstick: update styling for new theme
thkruz Sep 28, 2024
77e9f9b
refactor: :recycle: rename css variables to match home page
thkruz Sep 28, 2024
9bfa33f
refactor: :lipstick: change color of polar plot to match new theme
thkruz Sep 28, 2024
62538c0
feat: :sparkles: add new splash screens
thkruz Sep 29, 2024
3c2e3cd
feat: :sparkles: add new logo always on
thkruz Sep 29, 2024
f515cdd
refactor: :recycle: remove deprecated settings and names
thkruz Sep 29, 2024
9c7efa0
fix: :lipstick: fix collapsing sat-infobox on mobile
thkruz Sep 29, 2024
c39273b
test: :white_check_mark: fix colorbox test
thkruz Sep 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 73 additions & 80 deletions public/css/astroux/css/astro.css

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions public/css/flag-icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@

.fi-esa {
background-image: url(../flags/esa.png);
}

.fi-iss {
background-image: url(../flags/iss.png);
}
11 changes: 7 additions & 4 deletions public/css/limitedUI.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
border: 1px solid rgba(255, 255, 255, 0.2);
pointer-events: none;
}

#orbit-btn {
display: block;
background: red;
Expand All @@ -39,6 +40,7 @@
border-radius: 5px;
border: 1px solid rgba(255, 255, 255, 0.2);
}

#countries-btn {
display: block;
background: green;
Expand Down Expand Up @@ -118,12 +120,12 @@

.right-btn-menu {
display: none;
background: var(--colorTertiaryDarken2);
background: var(--color-dark-background);
color: white;
position: absolute;
width: 165px;
border-radius: 0px;
border: 5px solid var(--colorTertiaryDarken3);
border: 5px solid var(--color-dark-border);
z-index: 10;
/*Prevent fighting with the slide down button on mobile */
}
Expand Down Expand Up @@ -164,7 +166,7 @@ ul li {
}

.right-btn-menu ul li:hover {
background-color: var(--colorSecondaryDarken1);
background-color: var(--color-primary-dark);
}

.right-btn-menu ul li:hover a {
Expand All @@ -186,6 +188,7 @@ ul li {
min-width: 100%;
top: 50px;
}

.toast {
width: 100%;
border-radius: 0;
Expand All @@ -208,4 +211,4 @@ ul li {
right: 7%;
max-width: 86%;
}
}
}
51 changes: 30 additions & 21 deletions public/css/loading-screen.css
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
:root {
--colorTertiary: rgb(40, 63, 88);
--colorTertiaryLighten1: rgb(82, 102, 122);
--colorTertiaryLighten2: rgb(126, 140, 155);
--colorTertiaryLighten3: rgb(169, 178, 188);
--colorTertiaryLighten4: rgb(212, 217, 222);
--colorTertiaryDarken1: rgb(31, 51, 71);
--colorTertiaryDarken2: rgb(24, 38, 53);
--colorTertiaryDarken3: rgb(16, 25, 35);
--colorTertiaryDarken4: rgb(8, 13, 18);
--colorTertiary: #4a4a4a !important;
--color-dark-background: #1f1f1f !important;
--color-dark-border: #3a3a3a !important;
--color-dark-text-accent: #dd382f !important;
--color-dark-text-muted: #6b6b6b !important;
--color-primary: #ba160c !important;
/* International Orange Engineering */
--color-dark-text-accent: #ff2827;
/* Brighter version of International Orange Engineering for icons */
--color-primary-light: #e01a0e !important;
/* Lighter shade of International Orange Engineering */
--color-primary-dark: #860f08 !important;
/* Darker shade of International Orange Engineering */
}

#keeptrack-root {
overflow: hidden;
font-family: 'Open Sans', sans-serif;
color: white;
background: var(--colorTertiaryDarken2);
background: -moz-linear-gradient(45deg, var(--colorTertiaryDarken2), var(--colorTertiaryDarken2));
background: -webkit-linear-gradient(45deg, var(--colorTertiaryDarken2), var(--colorTertiaryDarken2));
background: linear-gradient(45deg, var(--colorTertiaryDarken2), var(--colorTertiaryDarken2));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='var(--colorTertiaryDarken2)', endColorstr='#4096ee', GradientType=1);
background: var(--color-dark-background);
background: -moz-linear-gradient(45deg, var(--color-dark-background), var(--color-dark-background));
background: -webkit-linear-gradient(45deg, var(--color-dark-background), var(--color-dark-background));
background: linear-gradient(45deg, var(--color-dark-background), var(--color-dark-background));
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='var(--color-dark-background)', endColorstr='#4096ee', GradientType=1);
}

.ui-icon-minus {
Expand All @@ -34,7 +38,8 @@
}

#canvas-holder {
display: none; /* Display none till loading is complete main.js -227 */
display: none;
/* Display none till loading is complete main.js -227 */
}

#loading-screen {
Expand Down Expand Up @@ -71,14 +76,17 @@
padding-top: 25px;
padding-bottom: 5px;
overflow: hidden;
background: var(--colorTertiaryDarken2);
background: var(--color-dark-background);
background: -moz-linear-gradient(45deg, var(--colorTertiaryDarken4), var(--colorTertiary));
background: -webkit-linear-gradient(45deg, var(--colorTertiaryDarken4), var(--colorTertiary));
background: linear-gradient(45deg, var(--colorTertiaryDarken4), var(--colorTertiary));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='var(--colorTertiaryDarken2)', endColorstr='#4096ee', GradientType=1);
-moz-background-clip: padding; /* Firefox 3.6 */
-webkit-background-clip: padding; /* Safari 4? Chrome 6? */
background-clip: padding-box; /* Firefox 4, Safari 5, Opera 10, IE 9 */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='var(--color-dark-background)', endColorstr='#4096ee', GradientType=1);
-moz-background-clip: padding;
/* Firefox 3.6 */
-webkit-background-clip: padding;
/* Safari 4? Chrome 6? */
background-clip: padding-box;
/* Firefox 4, Safari 5, Opera 10, IE 9 */
}

#logo-inner-container {
Expand Down Expand Up @@ -149,6 +157,7 @@
#logo-text {
font-size: 3em;
}

#logo-text-version {
font-size: 3em;
}
Expand Down Expand Up @@ -185,4 +194,4 @@

.start-hidden {
display: none;
}
}
119 changes: 106 additions & 13 deletions public/css/materialize-local.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
.page-footer {
background-color: var(--colorTertiaryDarken2) !important;
background-color: var(--color-dark-background) !important;
}

.spinner-layer {
border-color: #ffffff !important;
}

label {
color: #ffffff !important;
}

.switch label input[type='checkbox']:checked + .lever:after {
.switch label input[type='checkbox']:checked+.lever:after {
background-color: rgb(255, 255, 255) !important;
}

Expand All @@ -36,25 +32,29 @@ textarea.materialize-textarea {
.btn,
.btn-large,
.btn-small {
background-color: var(--colorPrimary);
background-color: var(--color-primary);
}

.btn:hover,
.btn-large:hover,
.btn-small:hover {
background-color: rgb(0, 165, 244);
background-color: var(--color-primary-light);
}

.btn:focus,
.btn-large:focus,
.btn-small:focus,
.btn-floating:focus {
background-color: rgb(0, 115, 214);
background-color: var(--color-primary-dark);
}

.dropdown-content li > a,
.dropdown-content li > span {
color: var(--colorPrimary) !important;
.switch label input[type='checkbox']:checked+.lever {
background-color: var(--color-primary) !important;
}

.dropdown-content li>a,
.dropdown-content li>span {
color: var(--color-primary) !important;
font-size: 14px !important;
}

Expand All @@ -63,12 +63,105 @@ textarea.materialize-textarea {
min-height: 4.25rem !important;
}

.select-wrapper input.select-dropdown {
height: 2rem !important;
line-height: 2rem !important;
}

.input-field {
margin-top: 0 !important;
margin-bottom: 0 !important;
}

.input-field.col label {
padding-top: 0px;
}

input:not([type]):focus:not([readonly])+label,
input[type='text']:not(.browser-default):focus:not([readonly])+label,
input[type='password']:not(.browser-default):focus:not([readonly])+label,
input[type='email']:not(.browser-default):focus:not([readonly])+label,
input[type='url']:not(.browser-default):focus:not([readonly])+label,
input[type='time']:not(.browser-default):focus:not([readonly])+label,
input[type='date']:not(.browser-default):focus:not([readonly])+label,
input[type='datetime']:not(.browser-default):focus:not([readonly])+label,
input[type='datetime-local']:not(.browser-default):focus:not([readonly])+label,
input[type='tel']:not(.browser-default):focus:not([readonly])+label,
input[type='number']:not(.browser-default):focus:not([readonly])+label,
input[type='search']:not(.browser-default):focus:not([readonly])+label,
textarea.materialize-textarea:focus:not([readonly])+label {
color: var(--color-dark-text-accent);
}

input:not([type]):disabled+label,
input:not([type])[readonly='readonly']+label,
input[type='text']:not(.browser-default):disabled+label,
input[type='text']:not(.browser-default)[readonly='readonly']+label,
input[type='password']:not(.browser-default):disabled+label,
input[type='password']:not(.browser-default)[readonly='readonly']+label,
input[type='email']:not(.browser-default):disabled+label,
input[type='email']:not(.browser-default)[readonly='readonly']+label,
input[type='url']:not(.browser-default):disabled+label,
input[type='url']:not(.browser-default)[readonly='readonly']+label,
input[type='time']:not(.browser-default):disabled+label,
input[type='time']:not(.browser-default)[readonly='readonly']+label,
input[type='date']:not(.browser-default):disabled+label,
input[type='date']:not(.browser-default)[readonly='readonly']+label,
input[type='datetime']:not(.browser-default):disabled+label,
input[type='datetime']:not(.browser-default)[readonly='readonly']+label,
input[type='datetime-local']:not(.browser-default):disabled+label,
input[type='datetime-local']:not(.browser-default)[readonly='readonly']+label,
input[type='tel']:not(.browser-default):disabled+label,
input[type='tel']:not(.browser-default)[readonly='readonly']+label,
input[type='number']:not(.browser-default):disabled+label,
input[type='number']:not(.browser-default)[readonly='readonly']+label,
input[type='search']:not(.browser-default):disabled+label,
input[type='search']:not(.browser-default)[readonly='readonly']+label,
textarea.materialize-textarea:disabled+label,
textarea.materialize-textarea[readonly='readonly']+label {
color: var(--color-dark-text-muted)
}

input:not([type]):disabled,
input:not([type])[readonly='readonly'],
input[type='text']:not(.browser-default):disabled,
input[type='text']:not(.browser-default)[readonly='readonly'],
input[type='password']:not(.browser-default):disabled,
input[type='password']:not(.browser-default)[readonly='readonly'],
input[type='email']:not(.browser-default):disabled,
input[type='email']:not(.browser-default)[readonly='readonly'],
input[type='url']:not(.browser-default):disabled,
input[type='url']:not(.browser-default)[readonly='readonly'],
input[type='time']:not(.browser-default):disabled,
input[type='time']:not(.browser-default)[readonly='readonly'],
input[type='date']:not(.browser-default):disabled,
input[type='date']:not(.browser-default)[readonly='readonly'],
input[type='datetime']:not(.browser-default):disabled,
input[type='datetime']:not(.browser-default)[readonly='readonly'],
input[type='datetime-local']:not(.browser-default):disabled,
input[type='datetime-local']:not(.browser-default)[readonly='readonly'],
input[type='tel']:not(.browser-default):disabled,
input[type='tel']:not(.browser-default)[readonly='readonly'],
input[type='number']:not(.browser-default):disabled,
input[type='number']:not(.browser-default)[readonly='readonly'],
input[type='search']:not(.browser-default):disabled,
input[type='search']:not(.browser-default)[readonly='readonly'],
textarea.materialize-textarea:disabled,
textarea.materialize-textarea[readonly='readonly'] {
color: var(--color-dark-text-muted)
}

.input-field>label {
color: var(--color-dark-text-muted);
}

@media only screen and (min-width: 601px) {

nav,
nav .nav-wrapper i,
nav a.sidenav-trigger,
nav a.sidenav-trigger i {
height: 64px;
line-height: 64px;
}
}
}
Loading
Loading