From cc86307e8f5d0e04d0b84085b0efda4d9c1bafda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com>
Date: Sun, 7 Jul 2024 17:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=84=E8=AE=BA=E3=80=81?=
 =?UTF-8?q?=E6=8A=95=E7=A5=A8=E3=80=81=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AD=89UI=E5=92=8C=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=E6=B2=A1=E6=9C=89=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/appmanagement/images/main.css          | 23 +++++-----
 core/class/io/io_dzz.php                     |  4 +-
 core/template/default/common/showmessage.htm |  3 +-
 dzz/comment/images/comment.css               | 24 +++++-----
 dzz/comment/scripts/comment.js               |  7 ++-
 dzz/comment/template/list.htm                | 42 +++++++++--------
 dzz/comment/template/reply_item.htm          |  6 +--
 dzz/comment/template/thread_item.htm         |  4 +-
 dzz/dzzvote/template/vote_ajax.htm           | 48 ++++++++++----------
 dzz/shares/template/password.htm             |  2 +-
 static/bootstrap/css/bootstrap.min.css       | 11 +++--
 11 files changed, 89 insertions(+), 85 deletions(-)

diff --git a/admin/appmanagement/images/main.css b/admin/appmanagement/images/main.css
index 5cf7c2a..873b8b1 100644
--- a/admin/appmanagement/images/main.css
+++ b/admin/appmanagement/images/main.css
@@ -1,19 +1,18 @@
-ul,ul li,li{
-	list-style: none;
+.main-content {
 	padding: 0;
-	margin: 0;
-}
-a{
-	text-decoration: none;
+    height: 100%;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    align-items: center;
 }
 .main-content-ul{
-	overflow: hidden;
 	display: flex;
-  vertical-align: middle;
-  text-align: center;
-  flex-wrap: wrap;
-  align-content: space-around;
-  justify-content: space-around;
+    text-align: center;
+    flex-wrap: wrap;
+    justify-content: center;
+    align-items: center;
 }
 .main-content-ul .main-content-li{
 	float: left;
diff --git a/core/class/io/io_dzz.php b/core/class/io/io_dzz.php
index 1d31bbc..9ab4b49 100644
--- a/core/class/io/io_dzz.php
+++ b/core/class/io/io_dzz.php
@@ -1384,13 +1384,15 @@ class io_dzz extends io_api
                     $icoarr['apath'] = dzzencode('attach::' . $attach['aid']);
                     $event = 'creat_file';
                     $path = preg_replace('/dzz:(.+?):/', '', $path) ? preg_replace('/dzz:(.+?):/', '', $path) : '';
+                    $hash = C::t('resources_event')->get_showtpl_hash_by_gpfid($fid, $icoarr['gid']);
                     $eventdata = array(
                         'title' => $icoarr['name'],
                         'aid' => $icoarr['aid'],
                         'username' => $icoarr['username'],
                         'uid' => $icoarr['uid'],
                         'path' => $icoarr['path'],
-                        'position' => $path
+                        'position' => $path,
+                        'hash' => $hash
                     );
                     C::t('resources_event')->addevent_by_pfid($fid, $event, 'create', $eventdata, $icoarr['gid'], $icoarr['rid']);
                 } else {
diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm
index 76806d1..2d069f5 100644
--- a/core/template/default/common/showmessage.htm
+++ b/core/template/default/common/showmessage.htm
@@ -48,11 +48,10 @@
 				<!--{if $url_forward}-->
         <!--{if !$param[redirectmsg]}-->
           <button class="btn btn-primary" onclick="location.href='$url_forward';return false;" >立即跳转（<span class="num">3</span>s）</button>
-          <button class="btn btn-primary" onclick="location.href='$_G['siteurl']';return false;" >首页</button>
           <!--{else}-->
           <button class="btn btn-primary" onclick="location.href='$url_forward';return false;">{lang return_to_the_naxt_level}（<span class="num">3</span>s）</button>
-          <button class="btn btn-primary" onclick="location.href='$_G['siteurl']';return false;" >首页</button>
         <!--{/if}-->
+        <button class="btn btn-primary" onclick="location.href='$_G['siteurl']';return false;" >首页</button>
 				<!--{elseif $allowreturn}-->
 				<script type="text/javascript">
 					if(history.length > (BROWSER.ie ? 0 : 1)) {
diff --git a/dzz/comment/images/comment.css b/dzz/comment/images/comment.css
index e318323..6ae9462 100644
--- a/dzz/comment/images/comment.css
+++ b/dzz/comment/images/comment.css
@@ -207,6 +207,7 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
 	font-size: 12px;
 	line-height: 14px;
 	font-family: Verdana, Arial;
+	color: #6c757d;
 }
 .count_cpsw span {
 	margin: 0;
@@ -234,7 +235,7 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
 	display: inline-block;
 	text-align: left;
 	overflow: hidden;
-	color: #aaa;
+	color: #6c757d;
 	text-decoration: none;
 }
 .ament_lacpsw .item_lacpsw {
@@ -259,7 +260,7 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
 	display: inline-block;
 	text-align: left;
 	overflow: hidden;
-	color: #aaa;
+	color: #6c757d;
 	text-decoration: none;
 }
 .at_lacpsw .item_lacpsw {
@@ -397,14 +398,13 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
 	position: absolute;
 	z-index: 1
 }
-.source_fed {
-	padding-bottom: 2px;
-	font: 12px/20px Verdana, "\5B8B\4F53", "\65B0\5B8B\4F53", sans-serif
-}
-.source_fed a{
+.source_fed a,.right_icfed a{
 	text-decoration: none;
 	color: var(--bs-primary);
 }
+.toname_wcpsw {
+	color: var(--bs-primary);
+}
 .appuser_sfed {
 	vertical-align: middle;
 	margin-left: 5px;
@@ -434,7 +434,8 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
 	height: 26px;
 	padding: 10px 0 0;
 	position: relative;
-	z-index: 2
+	z-index: 2;
+	color: #6c757d;
 }
 .btn_amfed {
 	float: right;
@@ -449,11 +450,11 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
 	margin-left: 10px;
 	line-height: 0
 }
-.btn_amfed a {
+.btn_amfed a ,.more_bacfed a ,.reply_bacfed a{
 	line-height: 14px;
 	text-decoration: none;
 	color: #aaa;
-	font-size: 12px
+	font-size: 12px;
 }
 .btn_amfed a:hover{
 	color: #409eff;
@@ -583,7 +584,8 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
 }
 .action_cfed {
 	height: 18px;
-	padding-top: 5px
+	padding-top: 5px;
+	color: #6c757d;
 }
 .action_cfed .lock_fed {
 	margin-right: 2px
diff --git a/dzz/comment/scripts/comment.js b/dzz/comment/scripts/comment.js
index 7f9c684..4432994 100644
--- a/dzz/comment/scripts/comment.js
+++ b/dzz/comment/scripts/comment.js
@@ -6,7 +6,7 @@ var html=''
   	html+='	<div class="left_ifed"> <a href="user.php?uid='+arr['authorid']+'" title="'+arr['author']+'" hidefocus="true">'+arr['avatar']+'</a> </div>';
   	html+='	<div class="right_ifed">';
     html+=' 	<div class="main_fed">';
-    html+='  		 <div class="source_fed"> <a href="user.php?uid='+arr['authorid']+'" title="'+arr['author']+'" hidefocus="true" class="appuser_sfed">'+arr['author']+'</a><span class="text-muted">'+__lang.talk+'：</span> </div>';
+    html+='  		 <div class="source_fed"> <a href="user.php?uid='+arr['authorid']+'" title="'+arr['author']+'" hidefocus="true" class="appuser_sfed">'+arr['author']+'</a><span class="text-muted">'+__lang.reply+'</span> </div>';
     html+='  		<div class="card master_mfed"><span class="content_mmfed">'+arr['message']+'</span></div>';
 	html+='	   <div class="attachment_fed">';
 for(var i in arr['attachs']){
@@ -75,7 +75,6 @@ for(var i in arr['attachs']){
    html+='         				<li class="reply_bamfed"><a hidefocus="true" href="javascript:void(0);" onclick="getReplyForm(\''+arr['cid']+'\',\'0\',\''+arr['allowattach']+'\',\''+arr['allowat']+'\',\''+arr['allowsmiley']+'\');">'+__lang.reply+'</a></li>';
    html+='      	 		</ul>';
    html+='     			</div>';
-   html+='    		   '+arr['dateline'];
    html+='  		</div>';
    html+=' 		</div>';
    html+='		<div id="comment_reply_'+arr['cid']+'" class="comment_ifed" ></div>';
@@ -113,7 +112,7 @@ function feed_reply(arr){
      html+='   <div class="item_cfed">';
      html+='     <div class="left_icfed"> <a href="user.php?uid='+arr['authorid']+'" title="" hidefocus="true"> '+arr['avatar']+' </a> </div>';
      html+='     <div class="right_icfed">';
-     html+='     <a href="user.php?uid='+arr['authorid']+'" title="" class="avatar_mcfed skip_cmfed" hidefocus="true">'+arr['author']+'</a><span class="source_fed">说：</span><div class="card master_cfed">';
+     html+='     <a href="user.php?uid='+arr['authorid']+'" title="" class="avatar_mcfed skip_cmfed" hidefocus="true">'+arr['author']+'</a><span class="text-muted">'+' '+__lang.reply+' '+arr['dateline']+'</span><div class="card master_cfed">';
 	 if(arr['rpost']){
 		html+='<span class="amal_fed">对</span>  <a href="user.php?uid='+arr['rpost']['authorid']+'" title="" class="avatar_mcfed skip_cmfed" hidefocus="true" target="_blank">'+arr['rpost']['author']+'</a>'; 
 	 }
@@ -184,7 +183,7 @@ function feed_reply(arr){
      html+='             <li class="reply_bacfed"><a hidefocus="true" href="javascript:void(0);" onclick="getReplyForm(\''+arr['pcid']+'\',\''+arr['cid']+'\',\''+arr['allowattach']+'\',\''+arr['allowat']+'\',\''+arr['allowsmiley']+'\');">'+__lang.reply+'</a></li>';
      html+='           </ul>';
      html+='         </div>';
-	 html+='       <span class="time_acfed">'+arr['dateline']+'</span> </div>';
+	 html+='       </div>';
      html+='     </div>';
      html+='   </div>';
      html+=' </div>';
diff --git a/dzz/comment/template/list.htm b/dzz/comment/template/list.htm
index b67426b..806b1db 100644
--- a/dzz/comment/template/list.htm
+++ b/dzz/comment/template/list.htm
@@ -24,25 +24,26 @@
     </div>
   </div>
   <div class="bs-main-container">
-		<!--{if !$list}-->
-		<div style="text-align: center;">
-			<img src="static/image/common/no_list.png" /><br>
-			<span class="no-result-title">{lang no_relevant_content}</span>
-		  </div>
-		<!--{else}-->
-		<div class="main-header clearfix">
-			<form name="search" class="form-horizontal" action="{MOD_URL}" method="get">
-        <input type="hidden" name="mod" value="{MOD_NAME}" />
-        <ul class="nav nav-pills">
-          <li class="pull-left btn-secetlt" style="display: none;">
-            <button  class="btn btn-danger " type="submit" value="{lang delete}" onclick="delete_file();">{lang delete}</button>
-          </li>
-					<li class="pull-left btn-secetlt" style="display: none;">
-            <button  class="btn btn-primary col sharepame-selected" disabled>已选择<span class="ex-number"></span>项</button>
-          </li>
-        </ul>
-      </form>
-    </div>
+	<!--{if !$list}-->
+	<div style="text-align: center;">
+		<img src="static/image/common/no_list.png" /><br>
+		<span class="no-result-title">{lang no_relevant_content}</span>
+	</div>
+	<!--{else}-->
+	<div class="main-header clearfix">
+		<form name="search" class="form-horizontal" action="{MOD_URL}" method="get">
+			<input type="hidden" name="mod" value="{MOD_NAME}" />
+			<ul class="nav nav-pills">
+			<li class="pull-left btn-secetlt" style="display: none;">
+				<button  class="btn btn-danger " type="submit" value="{lang delete}" onclick="delete_file();">{lang delete}</button>
+			</li>
+			<li class="pull-left btn-secetlt" style="display: none;">
+				<button  class="btn btn-primary col sharepame-selected" disabled>已选择<span class="ex-number"></span>项</button>
+			</li>
+			</ul>
+		</form>
+	</div>
+	<div class="main-content clearfix">
       <form id="appform" name="appform" class="form-horizontal " action="{MOD_URL}" method="post" >
 				<input type="hidden" name="lpp" value="$lpp">
         <input type="hidden" name="formhash" value="{FORMHASH}" />
@@ -107,7 +108,8 @@
           </div>
         </div>
       </form>
-    $multi
+		$multi
+	</div>
 	<!--{/if}-->
   </div>
 </div>
diff --git a/dzz/comment/template/reply_item.htm b/dzz/comment/template/reply_item.htm
index bd70e04..9707390 100644
--- a/dzz/comment/template/reply_item.htm
+++ b/dzz/comment/template/reply_item.htm
@@ -2,14 +2,14 @@
 	<a name="comment_anchor_$value1[cid]"></a>
 	<div class="item_cfed">
 		<div class="left_icfed">
-			<a href="user.php?uid=$value1[authorid]" title="" hidefocus="true"> {eval echo avatar_block($value[authorid]);} </a>
+			<a href="user.php?uid=$value1[authorid]" title="" hidefocus="true"> {eval echo avatar_block($value1[authorid]);} </a>
 		</div>
 		<div class="right_icfed">
 			<a href="user.php?uid=$value1[authorid]" title="" class="avatar_mcfed skip_cmfed" hidefocus="true">$value1[author]</a>
 				<!--{if $value1['rpost']}-->
 				<span class="amal_fed">对</span>
 				<a href="user.php?uid=$value1[rpost][authorid]" title="" class="avatar_mcfed skip_cmfed" hidefocus="true" target="_blank">$value1[rpost][author]</a>
-				<!--{/if}--><span class="source_fed">说：</span>
+				<!--{/if}--><span class="text-muted">{lang reply} $value[dateline]</span>
 			<div class="card master_cfed">
 				<span>$value1[message]</span>
 			</div>
@@ -99,7 +99,7 @@
 						</li>
 					</ul>
 				</div>
-				<span class="time_acfed">$value1[dateline] $value1[xtllq] <!--{if $_G[adminid]==1}-->$value1[ip]<!--{/if}--></span> </div>
+				<span class="time_acfed">$value1[xtllq] <!--{if $_G[adminid]==1}-->$value1[ip]<!--{/if}--></span> </div>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/dzz/comment/template/thread_item.htm b/dzz/comment/template/thread_item.htm
index 3ab69a5..bea1920 100644
--- a/dzz/comment/template/thread_item.htm
+++ b/dzz/comment/template/thread_item.htm
@@ -6,7 +6,7 @@
 	<div class="right_ifed">
 		<div class="main_fed">
 			<div class="source_fed">
-				<a href="user.php?uid=$value[authorid]" title="$value[author]" hidefocus="true" class="appuser_sfed">$value[author]</a><span class="text-muted">{lang talk}：</span> </div>
+				<a href="user.php?uid=$value[authorid]" title="$value[author]" hidefocus="true" class="appuser_sfed">$value[author]</a><span class="text-muted">{lang reply} $value[dateline]</span> </div>
 			<div class="card master_mfed"><span class="content_mmfed">$value[message]</span></div>
 			<div class="attachment_fed">
 				<!--{loop $value[attachs] $attach}-->
@@ -91,7 +91,7 @@
 						</li>
 					</ul>
 				</div>
-				$value[dateline] $value[xtllq] <!--{if $_G[adminid]==1}-->$value[ip]<!--{/if}--></div>
+				$value[xtllq] <!--{if $_G[adminid]==1}-->$value[ip]<!--{/if}--></div>
 		</div>
 		<div id="comment_reply_{$value[cid]}" class="comment_ifed">
 			<!--{if $value[replies]>0}-->
diff --git a/dzz/dzzvote/template/vote_ajax.htm b/dzz/dzzvote/template/vote_ajax.htm
index f380c3c..14c8217 100644
--- a/dzz/dzzvote/template/vote_ajax.htm
+++ b/dzz/dzzvote/template/vote_ajax.htm
@@ -87,9 +87,9 @@
 			</div>
 		</div>
 		<div class="row mb-3">
-      <label class="col-sm-2">{lang vote_choose1}</label>
-      <div class="col-sm-10">
-        <select id="dzzvote_maxselect_num_$vote[voteid]" name="vote[maxselectnum]" class="form-control">
+     		<label class="col-sm-2">{lang vote_choose1}</label>
+			<div class="col-sm-10">
+				<select id="dzzvote_maxselect_num_$vote[voteid]" name="vote[maxselectnum]" class="form-control">
 					<!--{if $vote[voteid] && $vote['items']['type_'.$vote[type]]}-->
 					<!--{loop $vote['items']['type_'.$vote[type]] $key $value}-->
 					{eval $i=$key+1};
@@ -102,13 +102,13 @@
 					<option value="3">{lang most_can_choose} 3 {lang item}</option>
 					<!--{/if}-->
 				</select>
-        <div style="clear:both"></div>
-      </div>
-    </div>
+			<div style="clear:both"></div>
+			</div>
+		</div>
     <div class="row mb-3">
       <label class="col-sm-2">{lang deadline}</label>
       <div class="col-sm-10">
-				<div class="input-group">
+		<div class="input-group">
           <select class="form-control col-xs-10" onchange="if(this.value){jQuery('#dzzvote_endtime_$vote[voteid]').datepicker('setDate',this.value)}else{jQuery('#dzzvote_endtime_$vote[voteid]').val('')}">
             <option value="" selected="">{lang unlimited}</option>
             <option value="now" <!--{if $vote[endtime]}-->selected="selected"<!--{/if}-->>{lang custom}
@@ -295,12 +295,12 @@
 	<div class="dzzvote-body" id="vote_text_$vote[voteid]">
 		<!--{if $vote[type]==1}-->
 		<!--{loop $vote['items']['type_1'] $value}-->
-			<div class="row mb-3">
-        <label class="col-sm-2">$value[content]</label>
-        <div class="progress">
-          <div class="progress-bar  progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
-        </div>
-      </div>
+		<dl>
+			<label class="col-sm-2">$value[content]</label>
+			<div class="progress">
+				<div class="progress-bar  progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
+			</div>
+		</dl>
 		<!--{/loop}-->
 		<!--{else}-->
 		<div class="dzzvote-image-body clearfix">
@@ -339,14 +339,14 @@
 			<!--{loop $vote['items']['type_1'] $value}-->
 				<!--{if $vote['isvisible']>0}-->
 				<div class="form-check">
-          <input type="checkbox" class="form-check-input" id="item_$value[itemid]"  name="vote[]" value="$value[itemid]">
-          <label class="form-check-label" for="item_$value[itemid]">$value[content]</label>
-        </div>
+					<input type="checkbox" class="form-check-input" id="item_$value[itemid]"  name="vote[]" value="$value[itemid]">
+					<label class="form-check-label" for="item_$value[itemid]">$value[content]</label>
+				</div>
 				<!--{else}-->
 				<div class="form-check">
-          <input type="checkbox" class="form-check-input" id="item_$value[itemid]" name="vote[]" value="$value[itemid]">
-          <label class="form-check-label" for="item_$value[itemid]">$value[content]</label>
-        </div>
+					<input type="checkbox" class="form-check-input" id="item_$value[itemid]" name="vote[]" value="$value[itemid]">
+					<label class="form-check-label" for="item_$value[itemid]">$value[content]</label>
+				</div>
 				<div class="col-sm-4">
 					<div class="progress">
 						<div class="progress-bar  progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
@@ -476,12 +476,12 @@
 <div class="dzzvote-body" id="vote_text_$vote[voteid]">
 	<!--{if $vote[type]==1}-->
 	<!--{loop $vote['items']['type_1'] $value}-->
-		<div class="row mb-3">
-      <label for="colFormLabel" class="col-sm-2">$value[content]</label>
+		<dl>
+      		<label for="colFormLabel" class="col-sm-2">$value[content]</label>
 			<div class="progress">
-        <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
-      </div>
-    </div>
+       			 <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{eval echo floor(($value[number]/$votetotal)*100);}" aria-valuemin="0" aria-valuemax="100" style="width: {eval echo floor(($value[number]/$votetotal)*100);}%;min-width: 20px;"> {eval echo floor(($value[number]/$votetotal)*100);}% </div>
+			</div>
+		</dl>
 	<!--{/loop}-->
 	<!--{else}-->
 	<div class="dzzvote-image-body clearfix">
diff --git a/dzz/shares/template/password.htm b/dzz/shares/template/password.htm
index a291d2c..f6c7fa3 100644
--- a/dzz/shares/template/password.htm
+++ b/dzz/shares/template/password.htm
@@ -1,7 +1,7 @@
 <!--{template common/header_simple_start}-->
 <!--{template common/header_simple_end}-->
 <!--{template common/commer_header}-->
-    <!--面板开始-->
+<!--面板开始-->
 <div class="bs-container clearfix">
   <div class="bs-main-container clearfix">  
     <div class="main-content pace-done center-vh" >
diff --git a/static/bootstrap/css/bootstrap.min.css b/static/bootstrap/css/bootstrap.min.css
index 8f8d369..5ac456c 100644
--- a/static/bootstrap/css/bootstrap.min.css
+++ b/static/bootstrap/css/bootstrap.min.css
@@ -16243,36 +16243,37 @@ fieldset:disabled .btn {
 }
 
 @media (min-width:576px) {
-
     .main-content,.main-header{
         max-width: 540px
     }
 }
 
 @media (min-width:768px) {
-
     .main-content,.main-header{
         max-width: 720px
     }
 }
 
 @media (min-width:992px) {
-
     .main-content,.main-header{
         max-width: 960px
     }
 }
 
 @media (min-width:1200px) {
-
     .main-content,.main-header{
         max-width: 1140px
     }
 }
 
 @media (min-width:1400px) {
-
     .main-content,.main-header{
         max-width: 1320px
     }
+}
+
+@media (min-width:1500px) {
+    .main-content,.main-header{
+        max-width: 100%
+    }
 }
\ No newline at end of file