Inicio Explorar Axuda
Rexistro Iniciar sesión
zkx
/
lanhu-bootstrap
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

相关页面进行样式调整（引用公用头文件，调整css冲突），根据交互串联页面

chenwen %!s(int64=3) %!d(string=hai) anos
pai
1c73a909ea
achega
ada7451684
Modificáronse 8 ficheiros con 68 adicións e 84 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 17 26
      html/account/account.html
  2. 12 21
      html/account/changepwd.html
  3. 13 23
      html/company/company_contact.html
  4. 15 4
      html/company/company_main.html
  5. 1 2
      html/head.html
  6. 5 4
      html/landingpage/landingpage.html
  7. 4 3
      html/landingpage/landingpage_details.html
  8. 1 1
      html/moments/index.html

+ 17 - 26
html/account/account.html
Ver ficheiro 

@@ -87,7 +87,7 @@
 
 		   		padding: 25px 35px 20px 35px;
 
 		   }
 
 		   
-		   .thumbnail{
 
+		   .project-box .thumbnail{
 
 		   	border:0;
 
 		   }
 
 		   #project-photo-row{
 
@@ -116,17 +116,17 @@
 
 			   justify-content: space-between;
 
 			   align-items: flex-start;
 
 		   }
 
-		   .follow-btn{
 
+		   .follow-box .follow-item .follow-btn{
 
 			   width:100px;
 
 			   height:36px;
 
 			   padding:5px 16px;
 
 			   font-size: 14px;
 
 			}
 
-		   .follow-note-time{
 
+		   .follow-box .follow-item .follow-note-time{
 
 			   color:#999;
 
 			   font-size:14px;
 
 		   }
 
-		   .follow-note-con{
 
+		   .follow-box .follow-item .follow-note-con{
 
 			    font-size:14px;
 
 		   }
 
 		   .follow-box .follow-item .photos-9{
 
@@ -143,7 +143,7 @@
 
 			   width:255px;
 
 		   }
 
 		   
-		   .photos-9 img{
 
+		   .follow-box .follow-item .photos-9 img{
 
 			   width: 80px;
 
 			   height: 80px;
 
 			   border-radius: 10px;
 
@@ -153,28 +153,18 @@
 
 		</style>
 
 	</head>
 
 	<body>
 
+		<div id="head" ></div>
 
+		<script>
 
+			$(function() {
 
+				$("#head").load("../head.html",function(){
 
+					//$("#common-navbar-head .active").removeClass("active")
 
+					//$("#common-navbar-head .head_li_user").addClass("active")
 
+				});
 
+			})
 
+		</script>
 
+		<main class="jpmain" style="margin-top:85px;margin-bottom: 0px;">
 
 		<div class="container-fluid" style="padding:0;">
 
-			<div class="top">
 
-				<div class="top-item">
 
-					<img  src="../../assets/img/head_logo.png"/>
 
-				</div>
 
-				<div class="top-item">
 
-					<span>LIBRARY</span>
 
-				</div>
 
-				<div class="top-item">
 
-					<span>MOMENTS</span>
 
-				</div>
 
-				<div class="top-item" style="flex:1;"></div>
 
-				<div class="top-item">
 
-					<img src="../../assets/img/head_icon_language.png"><span>&nbsp;&nbsp;English</span>
 
-				</div>
 
-				<div class="top-item us-name-item  top-item-active">
 
-					<span>Sign in / Sign up</span>
 
-				</div>
 
-				<div class="top-item">
 
-					<img  src="../../assets/img/head_add.png" style="height: 40px;">
 
-				</div>
 
-			</div>
 
+			
 			
 			<div class="account-box">
 
 				<img src="../../assets/img/us_red_big.png" />
 
@@ -209,6 +199,7 @@
 
 			</div>
 
 			
 		</div>
 
+		</div>
 
 		
 		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 
 		<script src="https://fastly.jsdelivr.net/npm/@bootcss/v3.bootcss.com@1.0.35/assets/js/ie10-viewport-bug-workaround.js"></script>

+ 12 - 21
html/account/changepwd.html
Ver ficheiro 

@@ -84,28 +84,18 @@
 
 		</style>
 
 	</head>
 
 	<body>
 
+		<div id="head" ></div>
 
+		<script>
 
+			$(function() {
 
+				$("#head").load("../head.html",function(){
 
+					//$("#common-navbar-head .active").removeClass("active")
 
+					//$("#common-navbar-head .head_li_user").addClass("active")
 
+				});
 
+			})
 
+		</script>
 
+		<main class="jpmain" style="margin-top:85px;margin-bottom: 0px;">
 
 		<div class="container-fluid" style="padding:0;">
 
-			<div class="top">
 
-				<div class="top-item">
 
-					<img  src="../../assets/img/head_logo.png"/>
 
-				</div>
 
-				<div class="top-item">
 
-					<span>LIBRARY</span>
 
-				</div>
 
-				<div class="top-item">
 
-					<span>MOMENTS</span>
 
-				</div>
 
-				<div class="top-item" style="flex:1;"></div>
 
-				<div class="top-item">
 
-					<img src="../../assets/img/head_icon_language.png"><span>&nbsp;&nbsp;English</span>
 
-				</div>
 
-				<div class="top-item us-name-item  top-item-active">
 
-					<span>Sign in / Sign up</span>
 
-				</div>
 
-				<div class="top-item">
 
-					<img  src="../../assets/img/head_add.png" style="height: 40px;">
 
-				</div>
 
-			</div>
 
+			
 			
 			<div class="form-box">
 
 				<h4 style="margin-bottom: 50px;font-weight: bold;">Change password</h4>
 
@@ -132,6 +122,7 @@
 
 				</form>
 
 			</div>
 
 		</div>
 
+		</div>
 
 		
 		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 
 		<script src="https://fastly.jsdelivr.net/npm/@bootcss/v3.bootcss.com@1.0.35/assets/js/ie10-viewport-bug-workaround.js"></script>

+ 13 - 23
html/company/company_contact.html
Ver ficheiro 

@@ -56,31 +56,21 @@
 
 		</style>
 
 	</head>
 
 	<body>
 
+		<div id="head" ></div>
 
+		<script>
 
+			$(function() {
 
+				$("#head").load("../head.html",function(){
 
+					//$("#common-navbar-head .active").removeClass("active")
 
+					//$("#common-navbar-head .head_li_user").addClass("active")
 
+				});
 
+			})
 
+		</script>
 
+		<main class="jpmain" style="margin-top:85px;margin-bottom: 0px;">
 
 		<div class="container-fluid" style="padding:0;">
 
-			<div class="top">
 
-				<div class="top-item">
 
-					<img  src="../../assets/img/head_logo.png"/>
 
-				</div>
 
-				<div class="top-item">
 
-					<span>LIBRARY</span>
 
-				</div>
 
-				<div class="top-item">
 
-					<span>MOMENTS</span>
 
-				</div>
 
-				<div class="top-item" style="flex:1;"></div>
 
-				<div class="top-item">
 
-					<img src="../../assets/img/head_icon_language.png"><span>&nbsp;&nbsp;English</span>
 
-				</div>
 
-				<div class="top-item us-name-item  top-item-active">
 
-					<span>Sign in / Sign up</span>
 
-				</div>
 
-				<div class="top-item">
 
-					<img  src="../../assets/img/head_add.png" style="height: 40px;">
 
-				</div>
 
-			</div>
 
+			
 			<div class="row" style="margin:0px;">
 
 				<div class="col-md-5" style="padding: 0px;">
 
-					<img src="../../assets/img/signin_ad.png" style="width:100%;height:calc(100vh - 80px)">
 
+					<img src="../../assets/img/signin_ad.png" style="width:100%;height:calc(100vh - 85px)">
 
 				</div>
 
 				<div class="col-md-7" style="padding: 0px 60px;box-sizing: border-box;">
 
 					<img src="../../assets/img/contact_icon.png" style="margin-top:80px;">
 
@@ -108,7 +98,7 @@
 
 				</div>
 
 			</div>
 
 		</div>
 
+		</div>
 
 		<script src="../../js/bootstrap.min.js"></script>
 
-		<!-- <script src="../../assets/js/company_contace.js"></script> -->
 
 	</body>
 
 </html>

+ 15 - 4
html/company/company_main.html
Ver ficheiro 

@@ -69,7 +69,7 @@
 
 				padding: 25px 35px 20px 35px;
 
 			}
 
 			
-			.thumbnail{
 
+			.project-box .thumbnail{
 
 				border:0;
 
 			}
 
 			#project-photo-row{
 
@@ -86,8 +86,18 @@
 
 		</style>
 
 	</head>
 
 	<body>
 
+		<div id="head" ></div>
 
+		<script>
 
+			$(function() {
 
+				$("#head").load("../head.html",function(){
 
+					//$("#common-navbar-head .active").removeClass("active")
 
+					//$("#common-navbar-head .head_li_user").addClass("active")
 
+				});
 
+			})
 
+		</script>
 
+		<main class="jpmain">
 
 		<div class="container-fluid" style="padding:0;">
 
-			<div class="top">
 
+			<!-- <div class="top">
 
 				<div class="top-item">
 
 					<img  src="../../assets/img/head_logo.png"/>
 
 				</div>
 
@@ -107,7 +117,7 @@
 
 				<div class="top-item">
 
 					<img  src="../../assets/img/head_add.png" style="height: 40px;">
 
 				</div>
 
-			</div>
 
+			</div> -->
 
 			
 			<div class="contact-box">
 
 				<img src="../../assets/img/contact_icon.png">
 
@@ -118,7 +128,7 @@
 
 					</p>
 
 				
 				</div>
 
-				<button type="button" class="btn btn-default" style="height: 42px;background-color: #000000;color: #fff;padding:0px 20px;">Contact us</button>
 
+				<button type="button" class="btn btn-default contact-btn" style="height: 42px;background-color: #000000;color: #fff;padding:0px 20px;">Contact us</button>
 
 			</div>
 
 			
 			<div class="tool-box">
 
@@ -153,6 +163,7 @@
 
 				</div>
 
 			</div>
 
 			
+		</div>
 
 		</div>
 
 		<script src="../../js/bootstrap.min.js"></script>
 
 		<script src="../../assets/js/company_main.js"></script>

+ 1 - 2
html/head.html
Ver ficheiro 

@@ -7,8 +7,7 @@
 
 <script src="/lanhu-bootstrap/assets/js/head.js"></script>

 

 <link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">

-<link rel="stylesheet" href="/lanhu-bootstrap/css/bootstrap.min.css"

-	integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
 
+<link rel="stylesheet" href="/lanhu-bootstrap/css/bootstrap.min.css">
 
 	
 <link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/zeroModal.css">
 
 <link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />

+ 5 - 4
html/landingpage/landingpage.html
Ver ficheiro 

@@ -81,7 +81,7 @@
 
 			    padding-bottom: 10px;
 
 				padding-right: 32px;
 
 			}
 
-			.sel-icon{
 
+			.search-list .search-item .sel-icon{
 
 				position: absolute;
 
 				top: 50%;
 
 				right: 10px;
 
@@ -90,7 +90,7 @@
 
 			}
 
 			.my-select{width:280px !important;}
 
 			
-			.thumbnail{
 
+			.project-box .thumbnail{
 
 				border:0;
 
 			}
 
 			#project-photo-row{
 
@@ -175,7 +175,7 @@
 
 					
 					<div class="search-item">
 
 						 <label style="display: block;">&nbsp;</label>
 
-						 <button type="button" class="btn btn-default" style="height: 42px;background-color: #000000;color: #fff;padding:0px 20px;">Submit</button>
 
+						 <button type="button" class="btn btn-default" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
 
 					</div>
 
 					
 				</div>
 
@@ -203,6 +203,7 @@
 
 		<script src="../../js/bootstrap.min.js"></script>
 
 		<script src="../../assets/plugin/bootstrap-select/js/bootstrap-select.min.js"></script>
 
 		<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
 
+		<script src="../../assets/js/page.js"></script>
 
 		<script src="../../assets/js/landingpage.js"></script>
 
 		<script src="../../assets/plugin/template-web.js"></script>
 
 		<script id="flow-photos" type="text/html">
 
@@ -210,7 +211,7 @@
 
 				<div class="col-md-2">
 
 				    <div class="thumbnail">
 
 				        <a href="javascript:void(0);">
 
-							<img src="{{photo.url}}" class="img-responsive img-rounded">
 
+							<img src="{{photo.url}}" class="img-responsive img-rounded" data-imgname="{{photo.url}}">
 
 				        </a>
 
 				        <div class="caption">

+ 4 - 3
html/landingpage/landingpage_details.html
Ver ficheiro 

@@ -78,7 +78,7 @@
 
 			<div class="photo-show">
 
 				<div class="row">
 
 					<div class="col-md-10 col-md-offset-1" >
 
-						<img src="../../assets/img/landingpage/SketchPng13a31da85530705597336c246f381b04995b33daa653be0c982d5895c25fd786.png">
 
+						<img src="../../assets/img/landingpage/SketchPng13a31da85530705597336c246f381b04995b33daa653be0c982d5895c25fd786.png" style="width:1170px;height:728px;border-radius: 5px;text-align: center;">
 
 					</div>
 
 				</div>
 
 			</div>
 
@@ -105,7 +105,7 @@
 
 								<img src="../../assets/img/locate_black.png" style="margin-right: 20px;vertical-align: ceneter;"><span>Shanghai, Jingan district, Beijing west Road 888</span>
 
 							</p>
 
 						</div>
 
-						<button type="button" class="btn btn-default" style="height: 42px;background-color: #000000;color: #fff;padding:0px 20px;">Contact us</button>
 
+						<button type="button" class="btn btn-default contact-btn" style="height: 42px;background-color: #000000;color: #fff;padding:0px 20px;">Contact us</button>
 
 					</div>
 
 				
 				</div>
 
@@ -130,8 +130,9 @@
 
 			
 		</div>
 
 		<script src="../../js/bootstrap.min.js"></script>
 
-		<script src="../../assets/js/landingpage_details.js"></script>
 
+		<script src="../../assets/js/page.js"></script>
 
 		<script src="../../assets/plugin/template-web.js"></script>
 
+		<script src="../../assets/js/landingpage_details.js"></script>
 
 		<script id="flow-photos" type="text/html">
 
 			{{each  photos  photo index}}
 
 				<div class="col-md-2">

+ 1 - 1
html/moments/index.html
Ver ficheiro 

@@ -86,7 +86,7 @@
 
 				padding-right: 32px;

 			}

 

-			.sel-icon {

+			.search-list .search-item .sel-icon {

 				position: absolute;

 				top: 50%;

 				right: 10px;