Skip to content

Commit ca94cc0

Browse files
authored
Merge pull request #66 from medyo/develop
Version 1.10.0
2 parents 8aec919 + 4c34b10 commit ca94cc0

16 files changed

Lines changed: 483 additions & 268 deletions

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@
2323
"react-pro-sidebar": "^0.6.0",
2424
"react-scripts": "4.0.1",
2525
"react-select": "^4.0.2",
26-
"react-sortablejs": "^6.0.0",
2726
"react-spinners": "^0.10.4",
28-
"react-styled-flexboxgrid": "^3.2.1",
29-
"react-toastify": "^7.0.3",
3027
"react-toggle": "^4.1.1",
3128
"react-tooltip": "^4.2.21",
32-
"sortablejs": "^1.13.0",
3329
"styled-components": "2",
3430
"timeago.js": "^4.0.2",
3531
"web-vitals": "^0.2.4"

src/App.css

Lines changed: 155 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ body {
2121
}
2222

2323
a {
24-
2524
color: var(--primary-text-color);
2625
}
26+
2727
.App {
2828
flex-direction: row;
2929
color: var(--primary-text-color);
30-
padding: 1%;
3130
display: flex;
3231
flex-direction: column;
3332
}
@@ -57,7 +56,7 @@ a {
5756
align-content: center;
5857
flex-wrap: wrap;
5958
height:86px;
60-
margin-bottom: 12px;
59+
margin: 0 1% 12px 1%;
6160
}
6261

6362
.AppFooter {
@@ -85,11 +84,16 @@ a {
8584

8685
.AppContent {
8786
flex: 1 1 auto;
87+
display: flex;
88+
gap: 12px;
89+
padding: 1%;
90+
position: relative;
91+
overflow:hidden;
92+
padding-bottom: 12px;
8893
}
8994
.extras {
9095

9196
flex-direction: row;
92-
margin-left: auto;
9397
margin-right: 16px;
9498
align-content: center;
9599

@@ -177,28 +181,38 @@ a {
177181
overflow: hidden;
178182
flex-direction: column;
179183
height: 80vh;
184+
width: 10vw;
185+
flex: 0 0 auto;
180186
}
181187
.blockContent {
182188
flex-grow: 1;
183189
overflow-y: auto;
184-
scrollbar-color: var(--scrollbar-accent-color) var(--scrollbar-background-color);
185-
scrollbar-width: thin;
186190
height: calc(80vh - 1% - 16px - 30px);
187191
display: flex;
188192
flex-direction: column;
189193
overflow-x: hidden;
190194
}
191195

196+
.scrollable {
197+
scrollbar-color: var(--scrollbar-accent-color) var(--scrollbar-background-color);
198+
scrollbar-width: thin;
199+
}
192200

193-
.blockContent::-webkit-scrollbar {
201+
.scrollable::-webkit-scrollbar {
194202
width: 6px;
203+
height: 6px;
195204
}
196205

197-
.blockContent::-webkit-scrollbar-track-piece {
206+
.scrollable::-webkit-scrollbar-track-piece {
198207
background-color: var(--scrollbar-background-color);
199208
}
200209

201-
.blockContent::-webkit-scrollbar-thumb:vertical {
210+
.scrollable::-webkit-scrollbar-thumb:vertical {
211+
border-radius: 6px;
212+
background-color: var(--scrollbar-accent-color);
213+
}
214+
215+
.scrollable::-webkit-scrollbar-thumb:horizontal {
202216
border-radius: 6px;
203217
background-color: var(--scrollbar-accent-color);
204218
}
@@ -403,7 +417,6 @@ a {
403417
align-self: flex-start;
404418
display: flex;
405419
flex-direction: row;
406-
margin-top: 6px;
407420
flex-wrap: wrap;
408421
gap: 4px;
409422
}
@@ -436,28 +449,7 @@ a {
436449
margin-top: 8px;
437450
}
438451

439-
@media (max-width: 800px) {
440-
.AppHeader{
441-
padding: 20px 0;
442-
}
443-
.slogan {
444-
display: none;
445-
}
446-
.tags {
447-
/*display: none;*/
448-
}
449-
.marketingBanner {
450-
width: 80%
451-
}
452-
}
453452

454-
@media(min-width: 1800px) {
455-
.App {
456-
width: 1800px;
457-
margin: 0 auto;
458-
padding: 0;
459-
}
460-
}
461453

462454
.rowLanguage {
463455
font-size: 12px;
@@ -626,12 +618,6 @@ Producthunt item
626618
margin-bottom: 16px;
627619
}
628620

629-
@media (max-width: 768px) {
630-
.marketingBanner {
631-
width: 100%
632-
}
633-
}
634-
635621
.counterWrapper {
636622
display: flex;
637623
flex-direction: column;
@@ -652,18 +638,19 @@ Producthunt item
652638
}
653639

654640
.bottomNavigation {
655-
display: flex;
641+
display: none;
656642
flex-grow: 1;
657643
width: 100%;
658644
flex-direction: row;
659645
align-items: center;
660646
text-align: center;
661-
height: 50px;
647+
height: 54px;
662648
background-color: var(--card-background-color);
663649
box-shadow: 0 0 20px var(--card-border-color);
664650
position: fixed;
665651
bottom: 0;
666652
left:0;
653+
667654
}
668655

669656
.navigationItem {
@@ -705,6 +692,27 @@ Producthunt item
705692
background-color: var(--tooltip-accent-color);
706693
}
707694

695+
.searchBar {
696+
position: relative;
697+
margin: 0 auto;
698+
margin-top: 6px;
699+
}
700+
.searchBarIcon {
701+
position: absolute;
702+
height: 46px;
703+
margin: 0 16px;
704+
}
705+
.searchBarInput {
706+
border-radius: 50px;
707+
color: var(--primary-text-color);
708+
border:1px solid var(--card-border-color);
709+
box-shadow: 0 0 20px var(--card-border-color);
710+
height: 42px;
711+
padding:0 32px 0 48px;
712+
width:580px;
713+
background-color: var(--card-header-background-color);
714+
}
715+
708716
.tooltipLoading {
709717
display: flex;
710718
justify-content: center;
@@ -764,15 +772,62 @@ Producthunt item
764772
.__react_component_tooltip.show {
765773
opacity: 1 !important;
766774
}
767-
@media (max-width: 768px) {
768775

776+
.scrollButton {
777+
border:none;
778+
position: fixed;
779+
top: 45%;
780+
margin: 0 1%;
781+
background-color: var(--card-action-button-background);
782+
color: var(--card-action-button-color);
783+
opacity: .8;
784+
border-radius: 48px;
785+
width: 48px;
786+
height: 48px;
787+
box-shadow: 0 0 20px var(--card-border-color);
788+
z-index: 2;
789+
cursor: pointer;
790+
align-items: center;
791+
justify-content: center;
792+
display: flex;
793+
}
794+
795+
.scrollButton:hover {
796+
opacity:1
797+
}
798+
799+
/*****************
800+
*** BREAKPOINTS
801+
*******************/
802+
/* Extra small devices (phones, 600px and down) */
803+
@media (max-width: 600px) {
804+
.bottomNavigation {
805+
display: flex;
806+
}
807+
.block {
808+
margin-top: 8px;
809+
height: 100%;
810+
width: 100%;
811+
padding-bottom: 56px;
812+
border-radius: 0;
813+
box-shadow: none !important;
814+
}
815+
.AppContent .block:nth-child(n+2) {
816+
display:none;
817+
}
769818
::-webkit-scrollbar {
770819
width: 0px;
771820
background: transparent;
772821
}
822+
.searchBar {
823+
display: none;
824+
}
773825
.slogan {
774826
display: none;
775827
}
828+
.tags {
829+
margin-top: 6px;
830+
}
776831
.changelogButton {
777832
display: none;
778833
}
@@ -782,26 +837,79 @@ Producthunt item
782837
display: none;
783838
}
784839
.App {
785-
padding: 0
840+
padding: 0;
786841
}
787842
.AppHeader {
788843
padding: 0;
789844
margin: 0 12px;
790845
}
846+
.AppFooter {
847+
display: none;
848+
}
791849
.blockHeader{
792850
display: none;
793851
}
794852
.blockContent{
795853
height: 100%;
854+
overflow: hidden;
796855
}
797-
.blockContent::-webkit-scrollbar {
856+
.scrollable::-webkit-scrollbar {
798857
width: 0;
799858
}
859+
.scrollButton {
860+
display: none;
861+
}
862+
}
863+
864+
/* Small devices (portrait tablets and large phones, 600px and up) */
865+
@media only screen and (min-width: 600px) {
800866
.block {
801-
margin-top: 8px;
802-
height: 100vh;
803-
padding-bottom: 56px;
804-
border-radius: 0;
805-
box-shadow: none !important;
867+
width: calc(96vw/2);
868+
}
869+
}
870+
871+
/* Medium devices (landscape tablets, 768px and up) */
872+
@media only screen and (min-width: 768px) {
873+
.block {
874+
width: calc(96vw/3);
875+
}
876+
.searchBarInput {
877+
width: 200px;
878+
}
879+
}
880+
881+
/* Large devices (desktops, 992px and up)*/
882+
@media only screen and (min-width: 992px) {
883+
.block {
884+
width: calc(96vw/3);
885+
}
886+
887+
.searchBarInput {
888+
width: 480px;
889+
}
890+
}
891+
892+
/* X-Large devices (large desktops, 1200px and up)*/
893+
@media only screen and (min-width: 1200px) {
894+
.block {
895+
width: calc(96vw/4);
896+
}
897+
}
898+
899+
/* XX-Large devices (larger desktops, 1400px and up)*/
900+
@media only screen and (min-width: 1400px) {
901+
.block {
902+
width: calc(96vw/4);
903+
}
904+
}
905+
906+
@media(min-width: 1800px) {
907+
.App {
908+
width: 1800px;
909+
margin: 0 auto;
910+
padding: 0;
911+
}
912+
.block {
913+
width: calc((1800px - 12px * 4)/4);
806914
}
807915
}

0 commit comments

Comments
 (0)