Skip to content

Commit

Permalink
Change style.
Browse files Browse the repository at this point in the history
  • Loading branch information
Apheiro committed Mar 17, 2023
1 parent 8c74a51 commit 3931918
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 49 deletions.
4 changes: 1 addition & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ import App from './scripts/App';

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
</React.StrictMode>
<App />
);
7 changes: 2 additions & 5 deletions src/scripts/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ class App extends React.Component {
changeUnitMeasure(unit) {
this.setState({
unitOfMeasure: unit
})
setTimeout(() => {
console.log(this.state.unitOfMeasure)
}, 0);
}, () => { console.log(this.state.unitOfMeasure) })
}

async getData(e) {
Expand Down Expand Up @@ -130,7 +127,7 @@ class App extends React.Component {

return (
<div className="App">
<div className="background"><img src="https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fi.pinimg.com%2Foriginals%2F58%2F6e%2F51%2F586e51559dc40f48cd8ce65af9c1522f.gif&f=1&nofb=1&ipt=c298129c39d8fa5dd8293245986ac07095604cdc5e5545bdb48ed5fab87e4fd0&ipo=images" alt="" srcset="" /></div>
{/* <div className="background"><img src="https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fi.pinimg.com%2Foriginals%2F58%2F6e%2F51%2F586e51559dc40f48cd8ce65af9c1522f.gif&f=1&nofb=1&ipt=c298129c39d8fa5dd8293245986ac07095604cdc5e5545bdb48ed5fab87e4fd0&ipo=images" alt="" srcset="" /></div> */}
<AnimatePresence>
{!!this.state.daily.length ? <>
<div className="appContainer">
Expand Down
2 changes: 0 additions & 2 deletions src/scripts/FuturePanelData.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ class FuturePanelData extends React.Component {
changeUnit(e) {
this.props.changeUnitMeasure(e.target.value);
this.props.getData()
// console.log(e.target.value);
// console.log(e);
}

removePopup(e) {
Expand Down
20 changes: 10 additions & 10 deletions src/scripts/TodayData.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,30 @@ class TodayData extends React.Component {
"axis": {
"domain": {
"line": {
"stroke": "#ffffff",
"stroke": "#333333",
"strokeWidth": 1
}
},
"legend": {
"text": {
"fontSize": 12,
"fill": "#ffffff"
"fill": "#333333"
}
},
"ticks": {
"line": {
"stroke": "#ffffff",
"stroke": "#333333",
"strokeWidth": 1
},
"text": {
"fontSize": 11,
"fill": "#ffffff"
"fill": "#333333"
}
}
},
"grid": {
"line": {
"stroke": "#ffffff",
"stroke": "#333333",
"strokeWidth": 1
}
},
Expand Down Expand Up @@ -104,34 +104,34 @@ class TodayData extends React.Component {
"fontSize": 13,
"fill": "#333333",
"outlineWidth": 2,
"outlineColor": "#ffffff",
"outlineColor": "#333333",
"outlineOpacity": 1
},
"link": {
"stroke": "#000000",
"strokeWidth": 1,
"outlineWidth": 2,
"outlineColor": "#ffffff",
"outlineColor": "#333333",
"outlineOpacity": 1
},
"outline": {
"stroke": "#000000",
"strokeWidth": 2,
"outlineWidth": 2,
"outlineColor": "#ffffff",
"outlineColor": "#333333",
"outlineOpacity": 1
},
"symbol": {
"fill": "#000000",
"outlineWidth": 2,
"outlineColor": "#ffffff",
"outlineColor": "#333333",
"outlineOpacity": 1
}
},
"tooltip": {
"container": {
"background": "#5c5c5c",
"color": "#ffffff",
"color": "#333333",
"fontSize": 15
},
"basic": {},
Expand Down
12 changes: 5 additions & 7 deletions src/styles/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
font-weight: 800;
scrollbar-width: thin;
user-select: none;
color: #333333;
-webkit-tap-highlight-color: transparent;
}

Expand All @@ -17,7 +18,7 @@ html {
}

body {
background-color: rgb(58, 58, 58);
background: #f1f1f1;
}

.background img {
Expand All @@ -33,7 +34,6 @@ body {
width: 100vw;
height: 100vh;
justify-content: center;
color: white;
}

.appContainer {
Expand All @@ -42,7 +42,7 @@ body {
display: flex;
flex-direction: column;
align-items: center;
padding: 15px;
padding: 35px;
gap: 10px;
}

Expand All @@ -62,7 +62,6 @@ body {
align-items: center;
gap: 10px;
text-decoration: none;
color: white;
font-size: 17px;
width: fit-content;
z-index: 1;
Expand All @@ -75,12 +74,12 @@ body {
}

::-webkit-scrollbar-track {
background: rgba(255, 255, 255, 0.137);
background: rgba(0, 0, 0, 0.137);
border-radius: 20px;
}

::-webkit-scrollbar-thumb {
background-color: rgba(255, 255, 255, 0.39);
background-color: rgba(0, 0, 0, 0.39);
height: 10px;
border-radius: 20px;
}
Expand All @@ -95,7 +94,6 @@ body {
width: 100%;
height: 100%;
justify-content: center;
color: white;
}

.appContainer {
Expand Down
18 changes: 11 additions & 7 deletions src/styles/FuturePanelData.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
gap: 10px;
justify-content: space-between;
align-items: center;
background: rgba(0, 0, 0, 0.3);
padding: 25px;
background: #ffffff;
box-shadow: rgb(0, 0, 0) 0px 0px 25px -15px;
padding: 15px;
display: flex;
border-radius: 20px;
transition: transform cubic-bezier(0.54, 0.81, 0.53, 1.5) 0.25s !important;
Expand All @@ -38,14 +39,16 @@

.futureDayDataCard div {
white-space: nowrap;
font-size: 13px;
}

.futureDayDataCard h3 {
font-size: 20px;
font-size: 16px;
text-align: center;
}

.futureDayDataCard h2 {
font-size: 20px;
align-self: start;
white-space: nowrap;
}
Expand All @@ -56,14 +59,12 @@
}

.formatUnitForm {
backdrop-filter: blur(11px);
border-radius: 10px;
display: flex;
align-items: center;
}

.formatTimeForm {
backdrop-filter: blur(11px);
border-radius: 10px;
display: flex;
align-items: center;
Expand All @@ -81,9 +82,10 @@
}

.formatTimeForm input[type="radio"]:checked+label {
background-color: rgba(255, 255, 255, 0.137);
background: #ffffff;
border-radius: 10px;
padding: 10px;
box-shadow: black 0px 0px 20px -9px;
}

.formatUnitForm label {
Expand All @@ -93,12 +95,14 @@
}

.formatUnitForm input[type="radio"]:checked+label {
background-color: rgba(255, 255, 255, 0.137);
background: #ffffff;
border-radius: 10px;
padding: 10px;
box-shadow: black 0px 0px 20px -9px;
}

.futureDataCardsContainer {
padding: 16px;
display: flex;
gap: 25px;
overflow-x: overlay;
Expand Down
4 changes: 2 additions & 2 deletions src/styles/GraphicData.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.graphicContainer {
position: fixed;
background-color: rgba(0, 0, 0, 0.438);
backdrop-filter: blur(5px);
background-color: rgba(0, 0, 0, 0.3);
top: 0px;
left: 0px;
bottom: 0px;
Expand All @@ -14,8 +14,8 @@
}

.graphicContainerCard {
backdrop-filter: blur(11px);
border-radius: 20px;
background: rgb(255, 255, 255);
max-width: 700px;
max-height: 400px;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/LoadingScreen.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.LoadingScreen {
background-color: #a1ddff;
background-color: #a5a5a5;
width: 100%;
height: 100%;
display: flex;
Expand Down
9 changes: 4 additions & 5 deletions src/styles/PopupInfo.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.popupInfo {
position: fixed;
backdrop-filter: blur(5px);
background-color: rgba(0, 0, 0, 0.3);
backdrop-filter: blur(5px);
top: 0px;
bottom: 0px;
left: 0px;
Expand All @@ -14,7 +14,7 @@
}

.moreInfoCard {
backdrop-filter: blur(11px);
background: #ffffff;
border-radius: 20px;
max-width: 700px;
max-height: 500px;
Expand Down Expand Up @@ -47,13 +47,13 @@
}

.moreInfo {
background-color: rgba(0, 0, 0, 0.3);
background: #ffffff;
box-shadow: #00000017 0px 0px 16px 0px;
border-radius: 20px;
display: flex;
flex-direction: column;
gap: 10px;
width: 50%;
backdrop-filter: blur(10px);
padding: 20px;
justify-content: space-between;
}
Expand All @@ -77,7 +77,6 @@

@media (max-width:700px) {
.moreInfoCard {
backdrop-filter: blur(11px);
border-radius: 20px;
max-width: unset;
max-height: unset;
Expand Down
16 changes: 9 additions & 7 deletions src/styles/TodayData.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
display: flex;
justify-content: space-between;
gap: 20px;
color: white;
}

.info {
Expand Down Expand Up @@ -59,16 +58,14 @@
}

.cardStyle {
background: rgba(0, 0, 0, 0.164);
backdrop-filter: blur(11px);
background: #ffffff;
padding: 25px;
display: flex;
border-radius: 20px;
}

.searchFromCard {
background: rgba(0, 0, 0, 0.164);
backdrop-filter: blur(11px);
background: rgb(255, 255, 255);
padding: 15px;
display: flex;
border-radius: 20px;
Expand All @@ -88,14 +85,19 @@
}

.searchFromCard input::placeholder {
color: rgba(255, 255, 255, 0.589);
color: rgba(0, 0, 0, 0.589);
}

.searchFromCard button {
background: none;
border: none;
width: 45px;
height: 45px;
cursor: pointer;
}

.searchFromCard button svg {
fill: #1f1f1f;
}

.todayCard {
Expand Down Expand Up @@ -133,7 +135,7 @@
}

#inputForm {
color: white;
color: #1f1f1f;
}

@media (max-width:1280px) {
Expand Down

0 comments on commit 3931918

Please sign in to comment.