This commit is contained in:
Layne 2021-07-06 22:26:22 -04:00
parent 7780eb6592
commit 57d0342e64
5 changed files with 502 additions and 78 deletions

View File

@ -461,19 +461,82 @@
"camera.available.effects": [ "camera.available.effects": [
{ {
"name": "dark_sepia", "name": "dark_sepia",
"colorMatrix": [0.4, 0.4, 0.1, 0, 110, 0.3, 0.4, 0.1, 0, 30, 0.3, 0.2, 0.1, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0.4,
0.4,
0.1,
0,
110,
0.3,
0.4,
0.1,
0,
30,
0.3,
0.2,
0.1,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 0, "minLevel": 0,
"enabled": true "enabled": true
}, },
{ {
"name": "increase_saturation", "name": "increase_saturation",
"colorMatrix": [2, -0.5, -0.5, 0, 0, -0.5, 2, -0.5, 0, 0, -0.5, -0.5, 2, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
2,
-0.5,
-0.5,
0,
0,
-0.5,
2,
-0.5,
0,
0,
-0.5,
-0.5,
2,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 0, "minLevel": 0,
"enabled": true "enabled": true
}, },
{ {
"name": "increase_contrast", "name": "increase_contrast",
"colorMatrix": [1.5, 0, 0, 0, -50, 0, 1.5, 0, 0, -50, 0, 0, 1.5, 0, -50, 0, 0, 0, 1.5, 0], "colorMatrix": [
1.5,
0,
0,
0,
-50,
0,
1.5,
0,
0,
-50,
0,
0,
1.5,
0,
-50,
0,
0,
0,
1.5,
0
],
"minLevel": 0, "minLevel": 0,
"enabled": true "enabled": true
}, },
@ -486,13 +549,55 @@
}, },
{ {
"name": "color_1", "name": "color_1",
"colorMatrix": [0.393, 0.769, 0.189, 0, 0, 0.349, 0.686, 0.168, 0, 0, 0.272, 0.534, 0.131, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0.393,
0.769,
0.189,
0,
0,
0.349,
0.686,
0.168,
0,
0,
0.272,
0.534,
0.131,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 1, "minLevel": 1,
"enabled": true "enabled": true
}, },
{ {
"name": "hue_bright_sat", "name": "hue_bright_sat",
"colorMatrix": [1, 0.6, 0.2, 0, -50, 0.2, 1, 0.6, 0, -50, 0.6, 0.2, 1, 0, -50, 0, 0, 0, 1, 0], "colorMatrix": [
1,
0.6,
0.2,
0,
-50,
0.2,
1,
0.6,
0,
-50,
0.6,
0.2,
1,
0,
-50,
0,
0,
0,
1,
0
],
"minLevel": 1, "minLevel": 1,
"enabled": true "enabled": true
}, },
@ -519,13 +624,55 @@
}, },
{ {
"name": "color_2", "name": "color_2",
"colorMatrix": [0.333, 0.333, 0.333, 0, 0, 0.333, 0.333, 0.333, 0, 0, 0.333, 0.333, 0.333, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0.333,
0.333,
0.333,
0,
0,
0.333,
0.333,
0.333,
0,
0,
0.333,
0.333,
0.333,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 2, "minLevel": 2,
"enabled": true "enabled": true
}, },
{ {
"name": "night_vision", "name": "night_vision",
"colorMatrix": [0, 0, 0, 0, 0, 0, 1.1, 0, 0, -50, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0,
0,
0,
0,
0,
0,
1.1,
0,
0,
-50,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 2, "minLevel": 2,
"enabled": true "enabled": true
}, },
@ -566,13 +713,55 @@
}, },
{ {
"name": "decr_conrast", "name": "decr_conrast",
"colorMatrix": [0.5, 0, 0, 0, 50, 0, 0.5, 0, 0, 50, 0, 0, 0.5, 0, 50, 0, 0, 0, 1, 0], "colorMatrix": [
0.5,
0,
0,
0,
50,
0,
0.5,
0,
0,
50,
0,
0,
0.5,
0,
50,
0,
0,
0,
1,
0
],
"minLevel": 4, "minLevel": 4,
"enabled": true "enabled": true
}, },
{ {
"name": "green_2", "name": "green_2",
"colorMatrix": [0.5, 0.5, 0.5, 0, 0, 0.5, 0.5, 0.5, 0, 90, 0.5, 0.5, 0.5, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0.5,
0.5,
0.5,
0,
0,
0.5,
0.5,
0.5,
0,
90,
0.5,
0.5,
0.5,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 4, "minLevel": 4,
"enabled": true "enabled": true
}, },
@ -585,13 +774,55 @@
}, },
{ {
"name": "color_3", "name": "color_3",
"colorMatrix": [0.609, 0.609, 0.082, 0, 0, 0.309, 0.609, 0.082, 0, 0, 0.309, 0.609, 0.082, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0.609,
0.609,
0.082,
0,
0,
0.309,
0.609,
0.082,
0,
0,
0.309,
0.609,
0.082,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 5, "minLevel": 5,
"enabled": true "enabled": true
}, },
{ {
"name": "color_4", "name": "color_4",
"colorMatrix": [0.8, -0.8, 1, 0, 70, 0.8, -0.8, 1, 0, 70, 0.8, -0.8, 1, 0, 70, 0, 0, 0, 1, 0], "colorMatrix": [
0.8,
-0.8,
1,
0,
70,
0.8,
-0.8,
1,
0,
70,
0.8,
-0.8,
1,
0,
70,
0,
0,
0,
1,
0
],
"minLevel": 5, "minLevel": 5,
"enabled": true "enabled": true
}, },
@ -604,13 +835,55 @@
}, },
{ {
"name": "hypersaturated", "name": "hypersaturated",
"colorMatrix": [2, -1, 0, 0, 0, -1, 2, 0, 0, 0, 0, -1, 2, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
2,
-1,
0,
0,
0,
-1,
2,
0,
0,
0,
0,
-1,
2,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 6, "minLevel": 6,
"enabled": true "enabled": true
}, },
{ {
"name": "Yellow", "name": "Yellow",
"colorMatrix": [1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
1,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 6, "minLevel": 6,
"enabled": true "enabled": true
}, },
@ -623,13 +896,55 @@
}, },
{ {
"name": "x_ray", "name": "x_ray",
"colorMatrix": [0, 1.2, 0, 0, -100, 0, 2, 0, 0, -120, 0, 2, 0, 0, -120, 0, 0, 0, 1, 0], "colorMatrix": [
0,
1.2,
0,
0,
-100,
0,
2,
0,
0,
-120,
0,
2,
0,
0,
-120,
0,
0,
0,
1,
0
],
"minLevel": 7, "minLevel": 7,
"enabled": true "enabled": true
}, },
{ {
"name": "decrease_saturation", "name": "decrease_saturation",
"colorMatrix": [0.7, 0.2, 0.2, 0, 0, 0.2, 0.7, 0.2, 0, 0, 0.2, 0.2, 0.7, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0.7,
0.2,
0.2,
0,
0,
0.2,
0.7,
0.2,
0,
0,
0.2,
0.2,
0.7,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 7, "minLevel": 7,
"enabled": true "enabled": true
}, },
@ -691,31 +1006,136 @@
}, },
{ {
"name": "color_5", "name": "color_5",
"colorMatrix": [3.309, 0.609, 1.082, 0.2, 0, 0.309, 0.609, 0.082, 0, 0, 1.309, 0.609, 0.082, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
3.309,
0.609,
1.082,
0.2,
0,
0.309,
0.609,
0.082,
0,
0,
1.309,
0.609,
0.082,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 10, "minLevel": 10,
"enabled": true "enabled": true
}, },
{ {
"name": "black_white_negative", "name": "black_white_negative",
"colorMatrix": [-0.5, -0.5, -0.5, 0, 0, -0.5, -0.5, -0.5, 0, 0, -0.5, -0.5, -0.5, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
-0.5,
-0.5,
-0.5,
0,
0,
-0.5,
-0.5,
-0.5,
0,
0,
-0.5,
-0.5,
-0.5,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 10, "minLevel": 10,
"enabled": true "enabled": true
}, },
{ {
"name": "blue", "name": "blue",
"colorMatrix": [0.5, 0.5, 0.5, 0, -255, 0.5, 0.5, 0.5, 0, -170, 0.5, 0.5, 0.5, 0, 0, 0, 0, 0, 1, 0], "colorMatrix": [
0.5,
0.5,
0.5,
0,
-255,
0.5,
0.5,
0.5,
0,
-170,
0.5,
0.5,
0.5,
0,
0,
0,
0,
0,
1,
0
],
"minLevel": 10, "minLevel": 10,
"enabled": true "enabled": true
}, },
{ {
"name": "red", "name": "red",
"colorMatrix": [0.5, 0.5, 0.5, 0, 0, 0.5, 0.5, 0.5, 0, -170, 0.5, 0.5, 0.5, 0, -170, 0, 0, 0, 1, 0], "colorMatrix": [
0.5,
0.5,
0.5,
0,
0,
0.5,
0.5,
0.5,
0,
-170,
0.5,
0.5,
0.5,
0,
-170,
0,
0,
0,
1,
0
],
"minLevel": 10, "minLevel": 10,
"enabled": true "enabled": true
}, },
{ {
"name": "green", "name": "green",
"colorMatrix": [0.5, 0.5, 0.5, 0, -170, 0.5, 0.5, 0.5, 0, 0, 0.5, 0.5, 0.5, 0, -170, 0, 0, 0, 1, 0], "colorMatrix": [
0.5,
0.5,
0.5,
0,
-170,
0.5,
0.5,
0.5,
0,
0,
0.5,
0.5,
0.5,
0,
-170,
0,
0,
0,
1,
0
],
"minLevel": 10, "minLevel": 10,
"enabled": true "enabled": true
} }

View File

@ -1,14 +1,18 @@
.nitro-purse { .nitro-purse {
background: rgba($dark,.95); padding: 2px;
border: 1px solid lighten($dark,8.3); background-color: #1c323f;
box-shadow: inset 0px 3px lighten(rgba($dark,.6),2.5), inset 0 -2px darken(rgba($dark,.6),4); border: 2px solid rgba($white, 0.5);
font-weight: bolder; border-top:0;
font-size: $font-size-sm;
z-index: $context-menu-zindex;
.notification-button { .notification-button {
color:lighten($dark,20); color:lighten($dark,20);
cursor: pointer; cursor: pointer;
font-size: 0.9rem; font-size: 0.9rem;
pointer-events: all; pointer-events: all;
display: none
} }
} }

View File

@ -36,16 +36,18 @@ export const PurseView: FC<PurseViewProps> = props =>
return ( return (
<PurseContextProvider value={ { purseState, dispatchPurseState }}> <PurseContextProvider value={ { purseState, dispatchPurseState }}>
<PurseMessageHandler /> <PurseMessageHandler />
<div className="nitro-purse rounded d-flex flex-row py-1 justify-content-between"> <div className="nitro-purse rounded-bottom d-flex flex-row justify-content-between">
<div className="row row-cols-2 mx-0">
{ currencies && currencies.map((currency, index) => { currencies && currencies.map((currency, index) =>
{ {
if(displayedCurrencies.indexOf(currency.type) === -1) return null; if(displayedCurrencies.indexOf(currency.type) === -1) return null;
return <CurrencyView key={ index } currency={ currency } />; return <CurrencyView key={ index } currency={ currency } />;
})} })}
<div className="notification-button px-2" onClick={ toggleNotificationCenter }>
<i className="fas fa-bars" />
</div> </div>
{/*<div className="notification-button px-2" onClick={toggleNotificationCenter}>
<i className="fas fa-bars" />
</div>*/}
</div> </div>
</PurseContextProvider> </PurseContextProvider>
); );

View File

@ -1,10 +1,8 @@
.nitro-currency { .nitro-currency {
pointer-events: all; pointer-events: all;
background: $bg-mirage-split-background;
.nitro-currency-text { .nitro-currency-text {
max-width: 60px; max-width: 60px;
} }
&:not(:last-child) {
border-right:1px solid #000;
box-shadow: 1px 0 lighten($dark,8.3)
}
} }

View File

@ -1,7 +1,7 @@
.nitro-right-side { .nitro-right-side {
position: absolute; position: absolute;
top: 10px; top: 0px;
right: 10px; right: 5px;
min-width: 200px; min-width: 200px;
max-width: 400px; max-width: 400px;
z-index: $rightside-zindex; z-index: $rightside-zindex;