Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 1 commit
  • 1 file changed
  • 0 comments
  • 1 contributor

Showing 1 changed file with 2 additions and 10 deletions. Show diff stats Hide diff stats

  1. 12  style.css
12  style.css
@@ -40,12 +40,12 @@
40 40
 	#blue {height: 900px;}
41 41
 }
42 42
 
43  
-@media all and (min-device-height: 811px) and (max-device-height: 1224px)
  43
+@media all and (min-device-height: 811px) and (max-device-height: 1024px)
44 44
 {
45 45
 	#blue {height: 1200px;}
46 46
 }
47 47
 
48  
-@media all and (min-device-height: 1225px)
  48
+@media all and (min-device-height: 1025px)
49 49
 {
50 50
 	#blue {height: 1440px;}
51 51
 }
@@ -389,11 +389,7 @@ div
389 389
 .entry
390 390
 {
391 391
     height: auto;
392  
-<<<<<<< HEAD
393 392
     margin-top: -6px;
394  
-=======
395  
-    margin-top: -1px;
396  
->>>>>>> afe89e0868b77347ffc536ec1a7ef51ba3951eb1
397 393
     position: relative;
398 394
     width: 100%;
399 395
     z-index: 1;
@@ -835,11 +831,7 @@ li[id]:target
835 831
     -webkit-border-radius: 20px;
836 832
     -moz-border-radius: 20px;
837 833
     height: 75%;
838  
-<<<<<<< HEAD
839 834
     min-height: 300px;
840  
-=======
841  
-    min-height: 500px;
842  
->>>>>>> afe89e0868b77347ffc536ec1a7ef51ba3951eb1
843 835
     margin: 135px 7.5%;
844 836
     opacity: 1;
845 837
     overflow-y: auto;

No commit comments for this range

Something went wrong with that request. Please try again.