mirror of
				https://github.com/flynx/PortableMag.git
				synced 2025-10-30 03:30:09 +00:00 
			
		
		
		
	added vertical page align to layout, minor tweeks to magazine.css...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									076d2a0228
								
							
						
					
					
						commit
						eed633a02a
					
				
							
								
								
									
										24
									
								
								layout.html
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								layout.html
									
									
									
									
									
								
							| @ -37,6 +37,18 @@ | ||||
| 	transition: none; | ||||
| } | ||||
| 
 | ||||
| /* vertical */ | ||||
| .vertical.magazine, | ||||
| .vertical.article, | ||||
| .vertical.group { | ||||
| 	vertical-align: top; | ||||
| } | ||||
| .vertical .article, | ||||
| .vertical .group, | ||||
| .vertical .page { | ||||
| 	display: block; | ||||
| } | ||||
| 
 | ||||
| </style> | ||||
| 
 | ||||
| <script src="ext-lib/jquery.js"></script> | ||||
| @ -389,7 +401,7 @@ $(document).ready(function(){ | ||||
| 				</div> | ||||
| 			</div> | ||||
| 		</div> | ||||
| 		<div class="article"> | ||||
| 		<div class="article vertical"> | ||||
| 			<div class="cover page"> | ||||
| 				<div class="content"> | ||||
| 					<h1>Article Cover</h1> | ||||
| @ -399,6 +411,14 @@ $(document).ready(function(){ | ||||
| 				</div> | ||||
| 			</div> | ||||
| 
 | ||||
| 			<div class="group"> | ||||
| 				<div class="page"> | ||||
| 					<div class="content"> | ||||
| 						Page | ||||
| 
 | ||||
| 						<div class="page-number-text">[PAGE NUMBER]</div> | ||||
| 					</div> | ||||
| 				</div> | ||||
| 				<div class="page"> | ||||
| 					<div class="content"> | ||||
| 						Page | ||||
| @ -415,6 +435,8 @@ $(document).ready(function(){ | ||||
| 					</div> | ||||
| 				</div> | ||||
| 			</div> | ||||
| 
 | ||||
| 		</div> | ||||
| 		<div class="article"> | ||||
| 			<!-- page set --> | ||||
| 			<div class="group" style="background: url(img.jpg) no-repeat right top; background-size: 100% auto; color: white;"> | ||||
|  | ||||
| @ -41,6 +41,7 @@ function getPageNumber(page){ | ||||
| 	if(!NAVIGATE_RELATIVE_TO_VISIBLE){ | ||||
| 		return $('.page').index($('.current.page')) | ||||
| 	} else { | ||||
| 		// XXX this gets crazy when magazine is scaled...
 | ||||
| 		var s = $('.viewer').scrollLeft() | ||||
| 		var W = $('.viewer').width() | ||||
| 		var scale = getMagazineScale() | ||||
| @ -56,6 +57,7 @@ function getPageNumber(page){ | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| function getMagazineScale(){ | ||||
| 	return getElementScale($('.magazine')) | ||||
| } | ||||
| @ -67,6 +69,7 @@ function setMagazineScale(scale){ | ||||
| 	mag.css({ | ||||
| 		'margin-left': m, | ||||
| 		'margin-right': m | ||||
| 		// XXX also add margins at top and bottom for vertical elements...
 | ||||
| 	}) | ||||
| 	setElementScale(mag, scale) | ||||
| 	setCurrentPage() | ||||
| @ -74,8 +77,6 @@ function setMagazineScale(scale){ | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| /********************************************************* actions ***/ | ||||
| 
 | ||||
| function setCurrentPage(n){ | ||||
| @ -104,6 +105,7 @@ function setCurrentPage(n){ | ||||
| 		var offset = $('.viewer').width()/2 - (cur.width()/2)*scale | ||||
| 	} | ||||
| 	cur.ScrollTo({ | ||||
| 		offsetTop: $('.viewer').height()/2 - (cur.height()/2)*scale, | ||||
| 		offsetLeft: offset | ||||
| 	}) | ||||
| } | ||||
|  | ||||
| @ -24,7 +24,7 @@ body { | ||||
| 	/* XXX make this browser-sized... */ | ||||
| 	position: relative; | ||||
| 	display: inline-block; | ||||
| 	vertical-align: bottom; | ||||
| 	vertical-align: middle; | ||||
| 	text-align: left; | ||||
| 	overflow: hidden; | ||||
| 
 | ||||
| @ -175,7 +175,7 @@ body { | ||||
| .magazine { | ||||
| 	position: relative; | ||||
| 	display: inline-block; | ||||
| 	vertical-align: bottom; | ||||
| 	vertical-align: middle; | ||||
| 	top: 50%; | ||||
| 
 | ||||
| 	min-width: 200px; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user