accept incoming stylesheet changes

awalkaday · Jan 8, 2024 · 6e6fafc · 6e6fafc
1 parent 12670f8
commit 6e6fafc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 168 deletions.
diff --git a/assets/css/main.css b/assets/css/main.css
@@ -1451,174 +1451,10 @@
 		@media screen and (max-width: 1680px) {
 
 			#main .thumb {
-<<<<<<< HEAD
-			-moz-transition-delay: 0.3s; /* Adjust transition delay as needed */
-			-webkit-transition-delay: 0.3s;
-			-ms-transition-delay: 0.3s;
-			transition-delay: 0.3s;
-			width: 100%;
-			margin: 1em; /* Add margin for visual separation */
-			}
-		}
-
-		/* Media rules for screens between 480px and 767px (Small Tablets) */
-		@media screen and (min-width: 481px) and (max-width: 767px) {
-
-			#main .thumb {
-				-moz-transition-delay: 0.3s; /* Adjust transition delay as needed */
-				-webkit-transition-delay: 0.3s;
-				-ms-transition-delay: 0.3s;
-				transition-delay: 0.3s;
-				min-height: 10em; /* Adjust min-height as needed */
-				width: 100%;
-				margin: 1em; /* Add margin for visual separation */
-				}
-		}
-
-		/* Media rules for screens between 768px and 1023px (Large Tablets) */
-		@media screen and (min-width: 768px) and (max-width: 1023px) {
-
-			#main .thumb {
-				-moz-transition-delay: 0.3s; /* Adjust transition delay as needed */
-				-webkit-transition-delay: 0.3s;
-				-ms-transition-delay: 0.3s;
-				transition-delay: 0.3s;
-				min-height: 12em; /* Adjust min-height as needed */
-				width: 100%;
-				margin: 1em; /* Add margin for visual separation */
-				}
-		}
-
-		/* Media rules for screens between 1024px and 1679px (Small to Medium Desktops) */
-		@media screen and (min-width: 1024px) and (max-width: 1679px) {
-
-			#main .thumb {
-			/* Keep the existing styles for 980px screens */
-			-moz-transition-delay: 1.175s;
-			-webkit-transition-delay: 1.175s;
-			-ms-transition-delay: 1.175s;
-			transition-delay: 1.175s;
-			height: calc(40vh - 2em);
-			min-height: 18em;
-			width: 100%;
-			}
-
-			#main .thumb:nth-child(1) {
-				-moz-transition-delay: 0.65s;
-				-webkit-transition-delay: 0.65s;
-				-ms-transition-delay: 0.65s;
-				transition-delay: 0.65s;
-			}
-
-			#main .thumb:nth-child(2) {
-				-moz-transition-delay: 0.8s;
-				-webkit-transition-delay: 0.8s;
-				-ms-transition-delay: 0.8s;
-				transition-delay: 0.8s;
-			}
-
-			#main .thumb:nth-child(3) {
-				-moz-transition-delay: 0.95s;
-				-webkit-transition-delay: 0.95s;
-				-ms-transition-delay: 0.95s;
-				transition-delay: 0.95s;
-			}
-
-			/* ... Add styles for individual thumbnails as needed */
-		}
-
-		/* Media rules for screens 1680px and larger (Large Desktops) */
-		@media screen and (min-width: 1680px) {
-
-			#main .thumb {
-			/* Keep the existing styles for 1680px screens */
-			-moz-transition-delay: 1.625s;
-			-webkit-transition-delay: 1.625s;
-			-ms-transition-delay: 1.625s;
-			transition-delay: 1.625s;
-			height: calc(28.57143vh - 1.33333em);
-			min-height: 20em;
-			width: 20%;
-			}
-
-			#main .thumb:nth-child(1) {
-				-moz-transition-delay: 0.65s;
-				-webkit-transition-delay: 0.65s;
-				-ms-transition-delay: 0.65s;
-				transition-delay: 0.65s;
-			}
-
-			#main .thumb:nth-child(2) {
-				-moz-transition-delay: 0.8s;
-				-webkit-transition-delay: 0.8s;
-				-ms-transition-delay: 0.8s;
-				transition-delay: 0.8s;
-			}
-
-			#main .thumb:nth-child(3) {
-				-moz-transition-delay: 0.95s;
-				-webkit-transition-delay: 0.95s;
-				-ms-transition-delay: 0.95s;
-				transition-delay: 0.95s;
-			}
-
-			#main .thumb:nth-child(4) {
-				-moz-transition-delay: 1.1s;
-				-webkit-transition-delay: 1.1s;
-				-ms-transition-delay: 1.1s;
-				transition-delay: 1.1s;
-			}
-
-			#main .thumb:nth-child(5) {
-				-moz-transition-delay: 1.25s;
-				-webkit-transition-delay: 1.25s;
-				-ms-transition-delay: 1.25s;
-				transition-delay: 1.25s;
-			}
-
-			#main .thumb:nth-child(6) {
-				-moz-transition-delay: 1.4s;
-				-webkit-transition-delay: 1.4s;
-				-ms-transition-delay: 1.4s;
-				transition-delay: 1.4s;
-			}
-
-			#main .thumb:nth-child(7) {
-				-moz-transition-delay: 1.55s;
-				-webkit-transition-delay: 1.55s;
-				-ms-transition-delay: 1.55s;
-				transition-delay: 1.55s;
-			}
-
-			#main .thumb:nth-child(8) {
-				-moz-transition-delay: 1.7s;
-				-webkit-transition-delay: 1.7s;
-				-ms-transition-delay: 1.7s;
-				transition-delay: 1.7s;
-			}
-
-			#main .thumb:nth-child(9) {
-				-moz-transition-delay: 1.85s;
-				-webkit-transition-delay: 1.85s;
-				-ms-transition-delay: 1.85s;
-				transition-delay: 1.85s;
-			}
-		}
-
-		/* Media rules for screens 1680px and larger (TVs or 3K/4K screens) */
-		@media screen and (min-width: 2560px) {
-
-			#main .thumb {
-				-moz-transition-delay: 1.825s;
-				-webkit-transition-delay: 1.825s;
-				-ms-transition-delay: 1.825s;
-				transition-delay: 1.825s;
-=======
 				-moz-transition-delay: 1.625s;
 				-webkit-transition-delay: 1.625s;
 				-ms-transition-delay: 1.625s;
 				transition-delay: 1.625s;
->>>>>>> parent of c7f0870 (media rules for mobile-first styles (480, 768, 1024) and TVs (2560))
 				height: calc(28.57143vh - 1.33333em);
 				min-height: 18em;
 				width: 20%;