diff --git a/public/assets/index/css/style.css b/public/assets/index/css/style.css index 04a65f4..2ce2612 100644 --- a/public/assets/index/css/style.css +++ b/public/assets/index/css/style.css @@ -58,72 +58,72 @@ input { } /* - 侧边栏 + 侧边栏 */ .sidebar { - position:fixed; - right: 20px; - top: 500px; - z-index:9999; - font-size:0; - text-align:right; + position:fixed; + right: 20px; + top: 500px; + z-index:9999; + font-size:0; + text-align:right; } .sidebar .sidebar-item { - position:relative; - display:inline-block; - *display:inline; - *zoom:1; - border-radius: 4px; - height:50px; - line-height:50px; - margin-bottom: 5px; - transition:all .5s; - background:#004995; + position:relative; + display:inline-block; + *display:inline; + *zoom:1; + border-radius: 4px; + height:50px; + line-height:50px; + margin-bottom: 5px; + transition:all .5s; + background:#004995; } .sidebar .sidebar-item .sidebar-icon { - float:left; - width:50px; - height:50px; - background:no-repeat center center; + float:left; + width:50px; + height:50px; + background:no-repeat center center; } .sidebar .sidebar-item .sidebar-icon-wx { - background-image:url(../images/sidebar_icon_wx.png) !important; + background-image:url(../images/sidebar_icon_wx.png) !important; } .sidebar .sidebar-item .sidebar-icon-top { - background-image:url(../images/sidebar_icon_top.png) !important; + background-image:url(../images/sidebar_icon_top.png) !important; } .sidebar .sidebar-item:hover { - background:#004995; - transition:all .5s; - padding-right:15px; + background:#004995; + transition:all .5s; + padding-right:15px; } .sidebar .sidebar-item span { - float:left; - font-size:14px; - color:#fff; - display:none; - margin-left:-5px; + float:left; + font-size:14px; + color:#fff; + display:none; + margin-left:-5px; } .sidebar .sidebar-item:hover span { - display:block; + display:block; } .sidebar .sidebar-item img { - position:absolute; - left:0; - top:0; - display:none; - transition:all .5s; - max-width:150px; - height:150px; - z-index:1002; + position:absolute; + left:0; + top:0; + display:none; + transition:all .5s; + max-width:150px; + height:150px; + z-index:1002; } .sidebar .sidebar-item:hover img { - display:block; - left:-160px; - transition:all .5s; + display:block; + left:-160px; + transition:all .5s; } .sidebar .sidebar-item:last-child { - background-color:#1b5191; + background-color:#1b5191; } /* header */ @@ -397,7 +397,7 @@ input { } .newsLeft { width: 420px; - height: 280px; + height: 294px; position: relative; } .newsRight { @@ -526,6 +526,7 @@ input { padding-left: 20px; position: relative; box-sizing: border-box; + display: block; } .media-name::after { position: absolute; @@ -548,12 +549,14 @@ input { .media-button-next { background-image: url(../images/mediaArrow_next.png); right : 0; + z-index: 10000; top: 36%; } .media-button-prev { background-image: url(../images/mediaArrow_prev.png); left : 0; top: 36%; + z-index: 10000; } .media-button-next.swiper-button-disabled, .media-button-prev.swiper-button-disabled { opacity: .8; @@ -757,6 +760,7 @@ input { .TabCont { padding: 10px; box-sizing: border-box; + margin-bottom: 20px; } .TabCont-top { padding: 5px 0 25px; @@ -1326,13 +1330,13 @@ input { float: left; } .platformCont { - margin: 0 10px 20px; + margin: 0 10px 10px; background-color: #f5f8fc; border: 1px solid #bacef6; } .platformCont-text { display: flex; - padding: 25px 10px 25px 20px; + padding: 30px 10px 30px 20px; box-sizing: border-box; background-position: center right; background-size: 60px 80%; @@ -1471,6 +1475,29 @@ input { float: right; } +/* 创新平台最新-修改 */ +.innovateList { + padding: 0 10px; +} +.innovateList li { + height: 52px; + line-height: 52px; + box-sizing: border-box; + margin-bottom: 10px; + padding: 0 20px; + background: url(../images/idx_zwgk_icon.png) no-repeat 96% center; + background-color: #edf3fd; +} +.innovateList li>a { + display: flex; + font-size: 18px; +} +.innovateList-img { + width: 22px; + height: 22px; + margin: 15px 12px 0 0; +} + /* 科研成果 */ .gainList-img { position: relative; diff --git a/public/assets/index/images/idx_zwgk_icon.png b/public/assets/index/images/idx_zwgk_icon.png new file mode 100644 index 0000000..edfe562 Binary files /dev/null and b/public/assets/index/images/idx_zwgk_icon.png differ diff --git a/public/assets/index/images/indexTab.ico b/public/assets/index/images/indexTab.ico new file mode 100644 index 0000000..4ca57ee Binary files /dev/null and b/public/assets/index/images/indexTab.ico differ diff --git a/resources/views/category/cxpt.blade.php b/resources/views/category/cxpt.blade.php index 805b236..da99e1c 100644 --- a/resources/views/category/cxpt.blade.php +++ b/resources/views/category/cxpt.blade.php @@ -12,31 +12,29 @@ 当前位置： 首页 > {{ $category->title }} - -
-
- {{ $yjCate->title }} -
- @if ($yjArticles->isNotEmpty()) - - @endif -
- - +
- {{ $zdCate->title }} + {{ $yjCate->title }} +
+ @if ($yjArticles->isNotEmpty()) + + @endif +
+
+
+ {{ $zdCate->title }}
+
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index 583bc3c..beb8e3d 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -105,14 +105,12 @@ @if($mtbdArticles->isNotEmpty()) @foreach($mtbdArticles as $article)
- -
- -
-
-
{{ $article->title }}
- {{ $article->created_at->format('m-d')}} -
+
+ +
+ +
{{ $article->title }}
+ {{ $article->created_at->format('m-d')}}
@endforeach