diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index da46c14..dba0842 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -20,28 +20,33 @@ const Header = (props) => { return (
-

Clockify Pomodoro Timer

-
- { - props.signedIn || process.env?.REACT_APP_ENVIRONMENT === "development" ? - <> - - - - - - - - : null - } - -
-
- {props.KonamiCodeActive ? 'Konami Code ON' : null} +
+

Clockify Pomodoro Timer

+
+ { + props.signedIn || process.env?.REACT_APP_ENVIRONMENT === "development" ? + <> + + + + + + + + : null + } + +
+ { + props.KonamiCodeActive && +
+ Konami Code ON +
+ } { props.notificationPermission === undefined || process.env.REACT_APP_ENVIROMENT === "development" ?
@@ -66,7 +71,6 @@ const Header = (props) => { : null }
- ) } diff --git a/src/components/Header/header-styles.css b/src/components/Header/header-styles.css index cd5cedf..49b17f4 100644 --- a/src/components/Header/header-styles.css +++ b/src/components/Header/header-styles.css @@ -6,7 +6,13 @@ height: 24vh; box-sizing: border-box; } -.header-main-page .title-link { +.header-main-page .main-title { + width: 100%; + display: flex; + justify-content: space-between; + padding: 1vh 0px; +} +.header-main-page .main-title .title-link { width: -webkit-fit-content; width: -moz-fit-content; width: fit-content; @@ -20,25 +26,22 @@ align-items: center; flex-grow: 1; } -.header-main-page .title-link a { +.header-main-page .main-title .title-link a { color: #ffffff; font-family: var(--title-font); text-decoration: none; cursor: pointer; } -.header-main-page .konami-code { - color: #4c8ad5; -} -.header-main-page .buttons-container { +.header-main-page .main-title .buttons-container { display: flex; align-items: center; margin-top: auto; margin-bottom: auto; } -.header-main-page .buttons-container a, .header-main-page .buttons-container label { +.header-main-page .main-title .buttons-container a, .header-main-page .main-title .buttons-container label { margin-right: 1vw; } -.header-main-page .buttons-container button { +.header-main-page .main-title .buttons-container button { padding: 2vh 3vw; background-color: var(--second-color); font-size: 1.1em; @@ -49,12 +52,16 @@ color: #ffffff; border-radius: 5%; } +.header-main-page .konami-code { + color: #4c8ad5; +} .header-main-page .notification-select { width: 100%; + min-height: 36px; background-color: var(--second-color); display: flex; align-items: flex-end; - padding-left: 1vw; + padding: 2vh 0px 2vh 1.5vw; margin-top: auto; box-sizing: border-box; } @@ -70,8 +77,9 @@ .header-main-page .notification-select button { margin-top: 0.5vh; margin-right: 0.5vw; + padding: 1vh 1vw; border: none; - border-radius: 2px; + border-radius: 4px; align-self: center; color: #fff; font-weight: bold; @@ -85,11 +93,13 @@ } .header-main-page .banner-login { width: 100%; + height: 10vh; + max-height: 75px; background-color: #D17262; display: flex; align-items: center; justify-content: space-between; - padding: 0px 5vw; + padding: 0px 1.5vw; } .header-main-page .banner-login p { color: #fff; @@ -98,8 +108,11 @@ width: 20vw; display: flex; justify-content: space-around; + -moz-column-gap: 3vh; + column-gap: 3vh; } .header-main-page .banner-login .button-container button { + width: 100%; font-size: 12pt; font-weight: bold; color: #ffffff; @@ -129,7 +142,6 @@ .header-main-page h3 { font-size: 13pt; } - .notification-select { height: auto; flex-wrap: wrap; @@ -144,7 +156,6 @@ width: 20%; margin-bottom: 1vh; } - .banner-login { justify-content: initial; height: auto; diff --git a/src/components/Header/header-styles.css.map b/src/components/Header/header-styles.css.map index a647864..6824bcc 100644 --- a/src/components/Header/header-styles.css.map +++ b/src/components/Header/header-styles.css.map @@ -1 +1 @@ -{"version":3,"sources":["header-styles.scss","header-styles.css"],"names":[],"mappings":"AACA;EACI,mCAAA;EAEA,aAAA;EACA,8BAAA;EACA,eAAA;EAEA,YAAA;EAEA,sBAAA;ACHJ;ADKI;EACI,0BAAA;EAAA,uBAAA;EAAA,kBAAA;EAEA,cAAA;EAEA,gBAAA;EAEA,eAAA;EAEA,gBAAA;EACA,mBAAA;EACA,gBAAA;EAEA,aAAA;EACA,mBAAA;EACA,YAAA;ACRR;ADUQ;EACI,cAAA;EACA,8BAAA;EACA,qBAAA;EAEA,eAAA;ACTZ;ADaI;EACI,cAAA;ACXR;ADcI;EACI,aAAA;EACA,mBAAA;EAEA,gBAAA;EACA,mBAAA;ACbR;ADeQ;EACI,iBAAA;ACbZ;ADgBQ;EACI,gBAAA;EAEA,qCAAA;EAEA,gBAAA;EACA,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;EAEA,cAAA;EAEA,iBAAA;AClBZ;ADsBI;EAEI,WAAA;EAEA,qCAAA;EAEA,aAAA;EACA,qBAAA;EAEA,iBAAA;EACA,gBAAA;EAEA,sBAAA;ACzBR;AD2BQ;EACI,qBAAA;EAEA,kBAAA;EAEA,WAAA;EAEA,UAAA;EAEA,SAAA;EACA,eAAA;EACA,iBAAA;AC7BZ;ADgCQ;EACI,iBAAA;EACA,mBAAA;EAEA,YAAA;EACA,kBAAA;EAEA,kBAAA;EAEA,WAAA;EACA,iBAAA;EAEA,eAAA;AClCZ;ADqCQ;EACI,kCAAA;ACnCZ;ADsCQ;EACI,kCAAA;ACpCZ;ADwCI;EAEI,WAAA;EAEA,yBAAA;EAMA,aAAA;EACA,mBAAA;EACA,8BAAA;EAEA,gBAAA;AC9CR;ADsCQ;EACI,WAAA;ACpCZ;AD6CQ;EAEI,WAAA;EAEA,aAAA;EACA,6BAAA;AC7CZ;AD+CY;EACI,eAAA;EACA,iBAAA;EACA,cAAA;EAEA,WAAA;EACA,eAAA;AC9ChB;ADiDY;EACI,yBAAA;EACA,mBAAA;AC/ChB;ADkDY;EACI,6CAAA;EACA,mBAAA;AChDhB;ADqDI;EACI,WAAA;ACnDR;;ADwDA;EAGI;IAEI,YAAA;IACA,YAAA;ECxDN;ED0DM;IACI,eAAA;ECxDV;ED2DM;IACI,eAAA;ECzDV;;ED6DE;IACI,YAAA;IACA,eAAA;EC1DN;ED4DM;IACI,WAAA;IACA,eAAA;IACA,kBAAA;EC1DV;ED6DM;IACI,YAAA;IACA,UAAA;IACA,kBAAA;EC3DV;;EDgEE;IACI,wBAAA;IAEA,YAAA;IAEA,gBAAA;EC/DN;EDiEM;IACI,YAAA;EC/DV;EDkEM;IACI,YAAA;IAEA,6BAAA;ECjEV;EDmEU;IACI,UAAA;ECjEd;AACF;ADsEA;EAIQ;IACI,oBAAA;SAAA,eAAA;IAEA,gBAAA;ECxEV;EDyEU;IACI,YAAA;ECvEd;ED6EU;IACI,UAAA;EC3Ed;ED8EU;IACI,UAAA;IAEA,sBAAA;EC7Ed;ED+Ec;IACI,UAAA;IACA,YAAA;EC7ElB;AACF","file":"header-styles.css"} \ No newline at end of file +{"version":3,"sources":["header-styles.scss","header-styles.css"],"names":[],"mappings":"AACA;EACI,mCAAA;EAEA,aAAA;EACA,8BAAA;EACA,eAAA;EAEA,YAAA;EAEA,sBAAA;ACHJ;ADKI;EACI,WAAA;EAEA,aAAA;EACA,8BAAA;EAEA,gBAAA;ACLR;ADOQ;EACI,0BAAA;EAAA,uBAAA;EAAA,kBAAA;EAEA,cAAA;EAEA,gBAAA;EAEA,eAAA;EAEA,gBAAA;EACA,mBAAA;EACA,gBAAA;EAEA,aAAA;EACA,mBAAA;EACA,YAAA;ACVZ;ADYY;EACI,cAAA;EACA,8BAAA;EACA,qBAAA;EAEA,eAAA;ACXhB;ADcQ;EACI,aAAA;EACA,mBAAA;EAEA,gBAAA;EACA,mBAAA;ACbZ;ADeY;EACI,iBAAA;ACbhB;ADgBY;EACI,gBAAA;EAEA,qCAAA;EAEA,gBAAA;EACA,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;EAEA,cAAA;EAEA,iBAAA;AClBhB;ADuBI;EACI,cAAA;ACrBR;ADwBI;EAEI,WAAA;EACA,gBAAA;EAEA,qCAAA;EAEA,aAAA;EACA,qBAAA;EAEA,0BAAA;EACA,gBAAA;EAEA,sBAAA;AC3BR;AD6BQ;EACI,qBAAA;EAEA,kBAAA;EAEA,WAAA;EAEA,UAAA;EAEA,SAAA;EACA,eAAA;EACA,iBAAA;AC/BZ;ADkCQ;EACI,iBAAA;EACA,mBAAA;EAEA,gBAAA;EAEA,YAAA;EACA,kBAAA;EAEA,kBAAA;EAEA,WAAA;EACA,iBAAA;EAEA,eAAA;ACrCZ;ADuCY;EACI,kCAAA;ACrChB;ADwCY;EACI,kCAAA;ACtChB;AD4CI;EAEI,WAAA;EACA,YAAA;EACA,gBAAA;EAEA,yBAAA;EAMA,aAAA;EACA,mBAAA;EACA,8BAAA;EAEA,kBAAA;AClDR;AD0CQ;EACI,WAAA;ACxCZ;ADiDQ;EAEI,WAAA;EAEA,aAAA;EACA,6BAAA;EACA,oBAAA;OAAA,eAAA;ACjDZ;ADmDY;EACI,WAAA;EACA,eAAA;EACA,iBAAA;EACA,cAAA;EAEA,WAAA;EACA,eAAA;AClDhB;ADqDY;EACI,yBAAA;EACA,mBAAA;ACnDhB;ADsDY;EACI,6CAAA;EACA,mBAAA;ACpDhB;ADyDI;EACI,WAAA;ACvDR;;AD4DA;EAGI;IAEI,YAAA;IACA,YAAA;EC5DN;ED8DM;IACI,eAAA;EC5DV;ED+DM;IACI,eAAA;EC7DV;EDiEE;IACI,YAAA;IACA,eAAA;EC/DN;EDiEM;IACI,WAAA;IACA,eAAA;IACA,kBAAA;EC/DV;EDkEM;IACI,YAAA;IACA,UAAA;IACA,kBAAA;EChEV;EDqEE;IACI,wBAAA;IAEA,YAAA;IAEA,gBAAA;ECrEN;EDuEM;IACI,YAAA;ECrEV;EDwEM;IACI,YAAA;IAEA,6BAAA;ECvEV;EDyEU;IACI,UAAA;ECvEd;AACF;AD4EA;EAIQ;IACI,oBAAA;SAAA,eAAA;IAEA,gBAAA;EC9EV;ED+EU;IACI,YAAA;EC7Ed;EDmFU;IACI,UAAA;ECjFd;EDoFU;IACI,UAAA;IAEA,sBAAA;ECnFd;EDqFc;IACI,UAAA;IACA,YAAA;ECnFlB;AACF","file":"header-styles.css"} \ No newline at end of file diff --git a/src/components/Header/header-styles.scss b/src/components/Header/header-styles.scss index 97997be..c171b0f 100644 --- a/src/components/Header/header-styles.scss +++ b/src/components/Header/header-styles.scss @@ -9,30 +9,63 @@ height: calc(100vh - calc(68vh + 8vh)); // 100vh minus .main-pomodoro and .go-to-down-arrow box-sizing: border-box; - - .title-link { - width: fit-content; - - color: #ffffff; - font-size: 3.3em; - - display: inline; - - margin-top: auto; - margin-bottom: auto; - margin-left: 1vw; + .main-title { + width: 100%; display: flex; - align-items: center; - flex-grow: 1; + justify-content: space-between; + + padding: 1vh 0px; - a { - color: #ffffff; - font-family: var(--title-font); - text-decoration: none; + .title-link { + width: fit-content; - cursor: pointer; + color: #ffffff; + + font-size: 3.3em; + + display: inline; + + margin-top: auto; + margin-bottom: auto; + margin-left: 1vw; + + display: flex; + align-items: center; + flex-grow: 1; + + a { + color: #ffffff; + font-family: var(--title-font); + text-decoration: none; + + cursor: pointer; + } + } + .buttons-container { + display: flex; + align-items: center; + + margin-top: auto; + margin-bottom: auto; + + a, label { + margin-right: 1vw; + } + + button { + padding: 2vh 3vw; + + background-color: var(--second-color); + + font-size: 1.1em; + user-select: none; + + color: #ffffff; + + border-radius: 5%; + } } } @@ -40,41 +73,17 @@ color: #4c8ad5; } - .buttons-container { - display: flex; - align-items: center; - - margin-top: auto; - margin-bottom: auto; - - a, label { - margin-right: 1vw; - } - - button { - padding: 2vh 3vw; - - background-color: var(--second-color); - - font-size: 1.1em; - user-select: none; - - color: #ffffff; - - border-radius: 5%; - } - } - .notification-select { width: 100%; + min-height: 36px; background-color: var(--second-color); display: flex; align-items: flex-end; - padding-left: 1vw; + padding: 2vh 0px 2vh 1.5vw; margin-top: auto; box-sizing: border-box; @@ -96,9 +105,11 @@ button { margin-top: 0.5vh; margin-right: 0.5vw; + + padding: 1vh 1vw; border: none; - border-radius: 2px; + border-radius: 4px; align-self: center; @@ -106,20 +117,23 @@ font-weight: bold; cursor: pointer; + + &.yes { + background-color: rgb(76, 175, 80); + } + + &.no { + background-color: rgb(211, 47, 47); + } } - button.yes { - background-color: rgb(76, 175, 80); - } - - button.no { - background-color: rgb(211, 47, 47); - } } .banner-login { width: 100%; + height: 10vh; + max-height: 75px; background-color: #D17262; @@ -131,7 +145,7 @@ align-items: center; justify-content: space-between; - padding: 0px 5vw; + padding: 0px 1.5vw; .button-container { @@ -139,8 +153,10 @@ display: flex; justify-content: space-around; + column-gap: 3vh; button { + width: 100%; font-size: 12pt; font-weight: bold; color: #ffffff; diff --git a/src/pages/Main/Pomodoro/pomodoro-styles.css b/src/pages/Main/Pomodoro/pomodoro-styles.css index 02caa9f..1c20ecd 100644 --- a/src/pages/Main/Pomodoro/pomodoro-styles.css +++ b/src/pages/Main/Pomodoro/pomodoro-styles.css @@ -4,6 +4,7 @@ align-items: center; justify-content: center; height: 68vh; + min-height: 480px; background-color: var(--main-background-color); } .main-pomodoro .timer { diff --git a/src/pages/Main/Pomodoro/pomodoro-styles.css.map b/src/pages/Main/Pomodoro/pomodoro-styles.css.map index e97016d..c02bc96 100644 --- a/src/pages/Main/Pomodoro/pomodoro-styles.css.map +++ b/src/pages/Main/Pomodoro/pomodoro-styles.css.map @@ -1 +1 @@ -{"version":3,"sources":["pomodoro-styles.scss","pomodoro-styles.css"],"names":[],"mappings":"AAAA;EAEI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,uBAAA;EAEA,YAAA;EAEA,8CAAA;ACFJ;ADII;EAEI,aAAA;EACA,uBAAA;EAEA,iBAAA;EACA,gBAAA;EAEA,6BAAA;ACLR;ADQI;EAEI,aAAA;EACA,mBAAA;EACA,sBAAA;ACPR;ADSQ;EACI,eAAA;EAEA,6BAAA;EACA,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;ACRZ;ADWQ;EACI,eAAA;EAEA,6BAAA;EAEA,eAAA;EACA,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;ACXZ;ADeI;EACI,eAAA;EACA,WAAA;EACA,WAAA;EAEA,8BAAA;EACA,gBAAA;EAEA,+BAAA;EACA,mBAAA;EAEA,cAAA;EACA,YAAA;AChBR;;ADoBA;EACI,kBAAA;EACA,SAAA;EACA,yCAAA;ACjBJ;ADoBQ;EACI,aAAA;EAEA,qBAAA;EACA,eAAA;EAEA,eAAA;ACpBZ;ADsBY;EACI,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;EACA,iBAAA;ACpBhB;ADuBY;EAEI,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;EAEA,aAAA;EACA,uBAAA;EACA,mBAAA;EAEA,uCAAA;EAEA,YAAA;EACA,WAAA;EAEA,mBAAA;EAEA,8BAAA;EACA,gBAAA;EACA,6BAAA;AC3BhB;;ADiCA;EAEI;IAEI,iBAAA;IACA,mBAAA;EChCN;AACF;ADmCA;EAEI;IAEI,YAAA;IAEA,eAAA;ECpCN;EDsCM;IACI,eAAA;ECpCV;EDuCM;IACI,eAAA;ECrCV;AACF","file":"pomodoro-styles.css"} \ No newline at end of file +{"version":3,"sources":["pomodoro-styles.scss","pomodoro-styles.css"],"names":[],"mappings":"AAAA;EAEI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,uBAAA;EAEA,YAAA;EACA,iBAAA;EAEA,8CAAA;ACFJ;ADII;EAEI,aAAA;EACA,uBAAA;EAEA,iBAAA;EACA,gBAAA;EAEA,6BAAA;ACLR;ADQI;EAEI,aAAA;EACA,mBAAA;EACA,sBAAA;ACPR;ADSQ;EACI,eAAA;EAEA,6BAAA;EACA,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;ACRZ;ADWQ;EACI,eAAA;EAEA,6BAAA;EAEA,eAAA;EACA,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;ACXZ;ADeI;EACI,eAAA;EACA,WAAA;EACA,WAAA;EAEA,8BAAA;EACA,gBAAA;EAEA,+BAAA;EACA,mBAAA;EAEA,cAAA;EACA,YAAA;AChBR;;ADoBA;EACI,kBAAA;EACA,SAAA;EACA,yCAAA;ACjBJ;ADoBQ;EACI,aAAA;EAEA,qBAAA;EACA,eAAA;EAEA,eAAA;ACpBZ;ADsBY;EACI,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;EACA,iBAAA;ACpBhB;ADuBY;EAEI,yBAAA;KAAA,sBAAA;MAAA,qBAAA;UAAA,iBAAA;EAEA,aAAA;EACA,uBAAA;EACA,mBAAA;EAEA,uCAAA;EAEA,YAAA;EACA,WAAA;EAEA,mBAAA;EAEA,8BAAA;EACA,gBAAA;EACA,6BAAA;AC3BhB;;ADiCA;EAEI;IAEI,iBAAA;IACA,mBAAA;EChCN;AACF;ADmCA;EAEI;IAEI,YAAA;IAEA,eAAA;ECpCN;EDsCM;IACI,eAAA;ECpCV;EDuCM;IACI,eAAA;ECrCV;AACF","file":"pomodoro-styles.css"} \ No newline at end of file diff --git a/src/pages/Main/Pomodoro/pomodoro-styles.scss b/src/pages/Main/Pomodoro/pomodoro-styles.scss index cc91f34..00f5836 100644 --- a/src/pages/Main/Pomodoro/pomodoro-styles.scss +++ b/src/pages/Main/Pomodoro/pomodoro-styles.scss @@ -6,6 +6,7 @@ justify-content: center; height: 68vh; + min-height: 480px; background-color: var(--main-background-color);