浏览代码

我的瞬间

zhengkaixin 3 年之前
父节点
当前提交
408d4c2f6c
共有 6 个文件被更改,包括 311 次插入6 次删除
  1. 二进制
      assets/img/moments_add.png
  2. 8 0
      assets/js/moments.js
  3. 1 3
      css/head.css
  4. 8 0
      css/viewer.min.css
  5. 285 3
      html/moments/index.html
  6. 9 0
      js/viewer-jquery.min.js

二进制
assets/img/moments_add.png


+ 8 - 0
assets/js/moments.js

@@ -0,0 +1,8 @@
+$(function(){
+	
+	$('.imguploadspan').viewer({
+						url: 'data-original'
+					});
+					
+
+})

+ 1 - 3
css/head.css

@@ -877,9 +877,7 @@ ol ul {
 	margin-bottom: 0;
 }
 
-li {
-	line-height: 20px;
-}
+
 
 ul.unstyled,
 ol.unstyled {

文件差异内容过多而无法显示
+ 8 - 0
css/viewer.min.css


+ 285 - 3
html/moments/index.html

@@ -1,3 +1,285 @@
-<script>
-window.location.href="../landingpage/landingpage.html"
-</script>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title></title>
+		<script src="../../js/jquery-1.9.1.min.js"></script>
+		<script src="../../js/jquery.i18n.properties.js"></script>
+		<script src="../../assets/js/language.js"></script>
+		<link rel="stylesheet" type="text/css" href="../../css/viewer.min.css" rel="stylesheet">
+		<link rel="stylesheet" type="text/css" href="../../css/bootstrap.min.css" rel="stylesheet">
+
+		<link rel="stylesheet" type="text/css" href="../../assets/plugin/bootstrap-select/css/bootstrap-select.css" />
+		<style>
+			.top {
+				padding: 10px 50px 0px 50px;
+				border-bottom: 1px solid #e8e8e8;
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+				align-items: center;
+				height: 80px;
+				box-sizing: border-box;
+				font-family: Avenir-Black;
+			}
+
+			.top-item {
+				padding: 0px 20px;
+				line-height: 70px;
+				font-weight: bold;
+				cursor: pointer;
+			}
+
+			.top-item-active {
+				border-bottom: 3px solid #f83d5a;
+				color: #f83d5a;
+			}
+
+			.us-name-item {
+				width: 160px;
+			}
+
+			.tool-box {
+				padding: 25px 50px 20px 50px;
+				border-bottom: 1px solid #f2f2f2;
+			}
+
+			.newest-list,
+			.search-list {
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: flex-start;
+				align-items: center;
+				/* height: 40px; */
+				box-sizing: border-box;
+				font-family: Arial;
+			}
+
+			.newest-list .newest-item {
+				margin: 0px 40px 0px 0px;
+				color: #999;
+				cursor: pointer;
+			}
+
+			.search-list .search-item {
+				margin-right: 10px;
+			}
+
+			.search-list .search-item label {
+				display: block;
+			}
+
+			.dropdown button {
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: flex-start;
+				align-items: center;
+			}
+
+			.project-box {
+				padding: 25px 35px 20px 35px;
+			}
+
+			.bootstrap-select>.dropdown-toggle {
+				padding-top: 10px;
+				padding-bottom: 10px;
+				padding-right: 32px;
+			}
+
+			.sel-icon {
+				position: absolute;
+				top: 50%;
+				right: 10px;
+				margin-top: -7px;
+				vertical-align: middle;
+			}
+
+			.my-select {
+				width: 280px !important;
+			}
+
+			.thumbnail {
+				border: 0;
+			}
+
+			#project-photo-row {
+				-webkit-column-width: 242px;
+				/*Safari and Chrome*/
+				-moz-column-width: 242px;
+				/*Firefox*/
+				-o-column-width: 242px;
+				/*Opera*/
+				-ms-column-width: 242px;
+				/*IE*/
+				column-width: 242px;
+			}
+
+			#project-photo-row>div {
+				width: 242px;
+				/*宽度根据实际情况调节,应与上面一致*/
+				overflow: auto;
+				/*防止内容溢出导致布局错位*/
+			}
+		</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_Moments").addClass("active")
+				});
+			})
+		</script>
+		<main class="jpmain">
+			<div class="container-fluid" style="padding:0;">
+
+
+				<div class="tool-box">
+					<div class="newest-list">
+						<div class="newest-item" style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
+						<div class="newest-item">All</div>
+						<div class="newest-item">x &nbsp;Masterplanning</div>
+						<div class="newest-item">Architecture</div>
+						<div class="newest-item">Interiors</div>
+						<div class="newest-item">Lighting</div>
+						<div class="newest-item">Landscape</div>
+						<div class="newest-item">AV&nbsp;&amp;&nbsp;Acoustics</div>
+						<div class="newest-item">MEP</div>
+						<div class="newest-item">Landscape</div>
+						<div class="newest-item">Landscape</div>
+						<div style="flex:1;"></div>
+						<div class="newest-item"><img src="../../assets/img/landing_right_arrow.png"></div>
+					</div>
+
+					<div class="search-list" style="margin-top:30px;">
+						<div class="search-item">
+							<label>Location</label>
+							<select class="selectpicker">
+								<option>By project</option>
+								<option>By company</option>
+							</select>
+
+						</div>
+
+						<div class="search-item">
+							<label>&nbsp;</label>
+							<select class="selectpicker" multiple>
+								<option>Canada</option>
+								<option>China</option>
+								<option>France</option>
+								<option>Germany</option>
+							</select>
+
+						</div>
+
+
+
+						<div class="search-item">
+							<label>Disciplines</label>
+							<select class="selectpicker my-select" multiple>
+								<option>Architecture</option>
+								<option>Landscape</option>
+								<option>AV</option>
+								<option>Mustard</option>
+								<option>Landscape</option>
+							</select>
+						</div>
+
+
+						<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>
+						</div>
+
+					</div>
+
+
+				</div>
+
+				<div class="row-fluid  jpcontainer">
+					<div class="span12">
+						<style>
+							.red {
+								color: rgba(248, 61, 90, 1);
+							}
+						</style>
+
+						<dt onclick="window.location='postmoment.html'"
+							style=" text-align: center;height: 208px;border-radius: 8px;border: 1px dashed rgba(151, 151, 151, 1);">
+
+							<p class="jph2 i18n-text" style="      display: block;
+								    overflow-wrap: break-word;
+								    color: rgba(24, 24, 24, 1);
+								    font-size: 22px;
+								    font-family: Avenir-Black;
+								    white-space: nowrap;
+								    line-height: 30px;
+								    text-align: center;
+								    padding-top: 30px;" i18n="company_postproject_What are you working on">Show the world of your createvity
+							</p>
+							<p style="
+								overflow-wrap: break-word;
+								color: rgba(130, 130, 130, 1);
+								font-size: 16px;
+								font-family: Avenir-Roman;
+								white-space: nowrap;
+								line-height: 22px;
+								text-align: center;
+								" class=" i18n-text" i18n="company_postproject_What are you working on">
+
+								Here post your daily designs</p>
+							<img src="/lanhu-bootstrap/assets/img/moments_add.png" style="
+								    padding: 20px;
+								">
+
+
+						</dt>
+						<style>
+						.imguploadspan img{
+							width: 32%;
+								max-width: 260px;
+								max-height: 170px;
+							    border: 0px;
+								    border-radius: 5px;
+							     margin-top: 3px;
+								min-width: 50px;
+						}
+						</style>
+						
+						<dd class="imguploadlist">
+							<div class="span12 imguploadspan" style="margin-left: 0;">
+
+								<img data-original="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png"
+									src="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png" >
+<img data-original="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png"
+									src="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png">
+<img data-original="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png"
+									src="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png" >
+<img data-original="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png"
+									src="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png" >
+<img data-original="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png"
+									src="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png">
+<img data-original="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png"
+									src="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png" >
+<img data-original="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png"
+									src="/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png">
+
+							</div>
+						</dd>
+					</div>
+				</div>
+
+
+			</div>
+			<script src="../../js/bootstrap.min.js"></script>
+			<script src="/lanhu-bootstrap/assets/js/moments.js"></script>
+
+			<script src="../../assets/plugin/bootstrap-select/js/bootstrap-select.min.js"></script>
+			<script src="../../js/viewer-jquery.min.js"></script>
+		</main>
+	</body>
+</html>

文件差异内容过多而无法显示
+ 9 - 0
js/viewer-jquery.min.js


部分文件因为文件数量过多而无法显示