zhengkaixin il y a 3 ans
Parent
commit
868e4b4f6c
2 fichiers modifiés avec 105 ajouts et 97 suppressions
  1. 15 5
      html/head.html
  2. 90 92
      html/moments/index.html

+ 15 - 5
html/head.html

@@ -44,7 +44,7 @@
 				<div class="navbar-inner">
 					<div class="container-fluid" style="margin: 25px 0 0 0;">
 
-						<a href="/lanhu-bootstrap/html/landingpage/landingpage.html" target="_self" class="brand" style="width: 77px;    margin-left: 85px;
+						<a href="../../html/landingpage/landingpage.html" target="_self" class="brand" style="width: 77px;    margin-left: 85px;
     height: 34px;background: url(../../assets/img/head_logo.png);100% no-repeat;"> </a>
 
 						<div class="nav-collapse collapse navbar-responsive-collapse" style="display: block;">
@@ -121,13 +121,23 @@
 									</ul>
 								</li>
 
-								<li  style="display: none;" class="loginUser" >
+								<li  style="display: none;" class="dropdown   loginUser" >
 									
-									<a href="#"  class="head_add" style="
-										margin-top: -8px;
+									<a href="#"  class="head_add" data-toggle="dropdown"  style="
+										margin-top: -8px;  
 									"> <img class="img1" referrerpolicy="no-referrer"
 											src="../../assets/img/head_add.png">
-									</a>
+									</a>
+									
+									<ul class="dropdown-menu" >
+										<li>
+											<a href="#" class="head_add">公司版本添加</a>
+										</li>
+										<li>
+											<a href="../moments/postmoment.html" >个人版本添加</a>
+										</li>
+									</ul>
+									
 								</li>
 							</ul>
 						</div>

+ 90 - 92
html/moments/index.html

@@ -142,107 +142,105 @@
 
 			<div class="tool-box">
 			
-				
-				<div class="search-list" >
-					<style>
-						.newest-list-pro {
-							    display: flex;
-							    overflow: hidden;
-						}
-						.newest-item-x {
-							/* display: none; */
-							position: relative;
-							top: -5px;
-							margin-left: 5px;
-							 font-size: 5px;
-						}
-						.newest-item:hover .newest-item-x{
-							display: inline-flex;
-						}
-					</style>
-					
-					<div class="newest-list" style="flex:1;">
-						<!-- <div class="newest-item i18n-text" i18n="landingpage_Newest"
-						 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
-						 -->
-						<div style="margin-right:15px;">
-							<select class="selectpicker filter-menu" data-width="100px" id="filter-select">
-							  <option class="i18n-text" i18n="landingpage_filter_newest">Newest</option>
-							  <option class="i18n-text" i18n="landingpage_filter_popular">Popular</option>
-							  <option class="i18n-text" i18n="landingpage_filter_clicked">Clicked</option>
-							</select>
-						</div>
-						
-						
-						<div class="newest-list-pro ">
-						
-						</div>
-						
-						
-						<!-- <div style="flex:1;"></div> -->
-						<div class="newest-item more-arrow" style=" margin: 0px 20px;width:20px;text-align: center;">
-							<img src="../../assets/img/landing_right_arrow.png" style="display:none;">
-						</div>
-					</div>
+				<style>
+					.newest-list-pro {
+						    display: flex;
+						    overflow: hidden;
+					}
+					.newest-item-x {
+						/* display: none; */
+						position: relative;
+						top: -5px;
+						margin-left: 5px;
+						 font-size: 5px;
+					}
+					.newest-item:hover .newest-item-x{
+						display: inline-flex;
+					}
+				</style>
+				<div class="newest-list" style="flex:1;">
+					<!-- <div class="newest-item i18n-text" i18n="landingpage_Newest"
+					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
+					 -->
+					<div style="margin-right:15px;">
+						<select class="selectpicker filter-menu" data-width="100px" id="filter-select">
+						  <option class="i18n-text" i18n="landingpage_filter_newest">Newest</option>
+						  <option class="i18n-text" i18n="landingpage_filter_popular">Popular</option>
+						  <option class="i18n-text" i18n="landingpage_filter_clicked">Clicked</option>
+						</select>
+					</div>
 					
 					
+					<div class="newest-list-pro ">
+					
+					</div>
+					
 					
-					<div class="search-item">
+					 <div style="flex:1;"></div> 
+					<div class="newest-item more-arrow" style=" margin: 0px 20px;width:280px;text-align: center;">
+ 					
+					<div class="search-list" >
 						
-						<div class="input-group">
-						  <input type="text" class="form-control i18n-placeholder landingpage_search"  data-toggle="dropdown"
-						  i18n="landingpage_search" placeholder="" aria-describedby="basic-addon2" style="height:42px;    width: 220px;">
-						  <span class="input-group-addon" style="
-									padding: 0px;
-								" id="basic-addon2">
-							  <button type="button" class="querybtn" style="    width: 50px;
-									height: 40px; border: 0;">
-								    <i class="glyphicon glyphicon-search query"></i>
-							  </button>
+						
+						<div class="search-item">
 							
-							  </span>
-							  <style>
-							  .filterstyle{
-								    padding: 20px;
-								      width: 460px;
-									
-							  }
-							  .filterstyle span{
-								    padding: 10px;
-							  		    display: block;
-							  		    overflow-wrap: break-word;
-							  		    color: rgba(24, 24, 24, 1);
-							  		    font-size: 14px;
-							  		    font-family: Avenir-Roman;
-							  		    white-space: nowrap;
-							  		    line-height: 19px;
-							  		    text-align: left;
-							  }
-							  .filterstyle button{
-								    margin: 5px;
-							  		         padding: 5px 16px;
-										       font-size: 14px;
-											       color: rgba(130, 130, 130, 1);
-							  }
-							  </style>
-							  
-							  <ul class="dropdown-menu dropdown-menu-right filter-menu filterstyle" aria-labelledby="dropdownMenu1">
-							       <li>
-									    <span  class="i18n-text" i18n="landingpage_Resent searches">Resent searches</span>
-										<div class="resentlist">
- 										</div>
+							<div class="input-group">
+							  <input type="text" class="form-control i18n-placeholder landingpage_search"  data-toggle="dropdown"
+							  i18n="landingpage_search" placeholder="" aria-describedby="basic-addon2" style="height:42px;    width: 220px;">
+							  <span class="input-group-addon" style="
+										padding: 0px;
+									" id="basic-addon2">
+								  <button type="button" class="querybtn" style="    width: 50px;
+										height: 40px; border: 0;">
+									    <i class="glyphicon glyphicon-search query"></i>
+								  </button>
+								
+								  </span>
+								  <style>
+								  .filterstyle{
+									    padding: 20px;
+									      width: 460px;
 										
-							  		 </li>
-							      <li>
-							      		 <span class="i18n-text" i18n="landingpage_Trending searches">Trending searches</span>
-							      			<div class="trendinglist">
- 							      			</div>
-							      	</li>
-							  </ul>
+								  }
+								  .filterstyle span{
+									    padding: 10px;
+								  		    display: block;
+								  		    overflow-wrap: break-word;
+								  		    color: rgba(24, 24, 24, 1);
+								  		    font-size: 14px;
+								  		    font-family: Avenir-Roman;
+								  		    white-space: nowrap;
+								  		    line-height: 19px;
+								  		    text-align: left;
+								  }
+								  .filterstyle button{
+									    margin: 5px;
+								  		         padding: 5px 16px;
+											       font-size: 14px;
+												       color: rgba(130, 130, 130, 1);
+								  }
+								  </style>
+								  
+								  <ul class="dropdown-menu dropdown-menu-right filter-menu filterstyle" aria-labelledby="dropdownMenu1">
+								       <li>
+										    <span  class="i18n-text" i18n="landingpage_Resent searches">Resent searches</span>
+											<div class="resentlist">
+											</div>
+											
+								  		 </li>
+								      <li>
+								      		 <span class="i18n-text" i18n="landingpage_Trending searches">Trending searches</span>
+								      			<div class="trendinglist">
+								      			</div>
+								      	</li>
+								  </ul>
+							</div>
 						</div>
+						
+					</div>
 					</div>
-					
 				</div>
+			
 				
 			</div>