PC / tmuch · 提交

转到一个项目

作者 朱振飞
提交 528983aaa63565ed02464d99df23eab3fc658324 2 个父辈 dc9d8d75 7d62852e

Merge branch 'master' of http://114.215.101.231:8099/PC/tmuch 

# Conflicts:
#	clinical/depart_detail.html
#	research/research2.html
内嵌 并排对比
正在显示 6 个修改的文件 包含 78 行增加 和 66 行删除
... ... @@ -305,7 +305,7 @@
<div class="swiper-wrapper">
<div class="swiper-slide swiper-slide-active" style="height:336px;background: #727171 ">
<a href="./person_detail.2.1.2.html">
<img src="../images/" alt="" />
<!-- <img src="../images/" alt="" /> -->
</a>
</div>
... ... @@ -316,7 +316,7 @@
</div>
<div class="swiper-slide" style="height:336px;background: #727171">
<a href="./person_detail.2.1.2.html">
<img src="../images/" alt="" />
<!-- <img src="../images/" alt="" /> -->
</a>
</div>
<div class="swiper-slide swiper-slide-next" style="height:336px;">
... ...
... ... @@ -371,11 +371,18 @@
<div class="swiper-wrapper main_slider_container">
<div class="swiper-slide content-four-img">
<img src="../images/news_1.png" width="100%" alt="">
</div>
<div class="swiper-slide content-four-img">
<img src="../images/news_2.png" width="100%" alt="">
</div>
<div class="swiper-slide content-four-img">
<img src="../images/news_3.png" width="100%" alt="">
</div>
<div class="swiper-slide content-four-img">
<img src="../images/news_1.png" width="100%" alt="">
</div>
<div class="swiper-slide content-four-img">
<img src="../images/news_2.png" width="100%" alt="">
</div>
<div class="swiper-slide content-four-img">
<img src="../images/news_3.png" width="100%" alt="">
... ...
... ... @@ -362,10 +362,10 @@
</div>
<div class="contant">
<div class="contant_left">
<div class="left_titles">Research Programs</div>
<div class="left_title">Achievements</div>
<div class="left_title">Key Labaratories</div>
<div class="left_title">Find a Researcher</div>
<div class="left_titles"><a href="./research1.html">Research Programs</a></div>
<div class="left_title"><a href="./research2.html">Achievements</a></div>
<div class="left_title"><a href="./research3.html">Key Labaratories</a></div>
<div class="left_title"><a href="./researcher.html">Find a Researcher</a></div>
</div>
<div class="wire">
<div class="contant_right">
... ...
... ... @@ -2,57 +2,64 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="../css/bootstrap.min.css">
<link rel="stylesheet" href="../css/swiper-3.4.2.min.css">
<link rel="stylesheet" href="../css/base.css">
<link rel="stylesheet" href="../css/index.css">
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<link rel="stylesheet" href="../css/bootstrap.min.css" />
<link rel="stylesheet" href="../css/swiper-3.4.2.min.css" />
<link rel="stylesheet" href="../css/base.css" />
<link rel="stylesheet" href="../css/index.css" />
<title>Tianjin Medical University Cancer Institute & Hospital</title>
<style>
.left_ship_box{
.left_ship_box {
width: 330px;
}
.header-title-right {
padding-left: 50px;
width: 300px;
margin-bottom: 80px;
}
.header-title-right h3{
color:#00A16C;
.header-title-right h3 {
color: #00a16c;
font-size: 21px;
}
.content{
.content {
min-height: 500px;
}
.content-word-left p{
.content-word-left p {
font-size: 14px;
line-height: 2;
}
.prof_item{
}
.prof_item {
width: 300px;
height: auto
height: auto;
}
.prof_img_box{
.prof_img_box {
height: auto;
}
.prof_desc{
.prof_desc {
font-size: 14px;
color: #232323;
font-weight: bold;
}
.content_model{
}
.content_model {
width: 1000px;
margin: 0 auto;
}
.search_part{
.search_part {
margin-bottom: 25px;
width: 100%;
}
.contant {
width: 100%;
display: -webkit-box;
... ... @@ -127,23 +134,22 @@
<nav class="navbar navbar-default bgf mb0">
<div class="container-fluid top_pc_brand">
<div class="navbar-header">
<button type="button" class="navbar-toggle mtperc10 menuPage" data-toggle="collapse" data-target="#bs-example-navbar-collapse-4"
aria-expanded="true">
<button type="button" class="navbar-toggle mtperc10 menuPage" data-toggle="collapse" data-target="#bs-example-navbar-collapse-4" aria-expanded="true">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand logo" href="../index.html">
<img class="brand-logo" src="../images/logo.png" alt="">
<img class="brand-logo" src="../images/logo.png" alt="" />
</a>
</div>
<div class="navbar-collapse collapse in" id="bs-example-navbar-collapse-4" aria-expanded="true">
<div class="search-group mt30 form-group navbar-text navbar-right">
<a href="http://www.tjmuch.com/" class="langue">中文</a>
<input type="text" class="form-control search-input" placeholder="Search">
<input type="text" class="form-control search-input" placeholder="Search" />
<div class="magnifier">
<img src="../images/search_btn.png" alt="">
<img src="../images/search_btn.png" alt="" />
</div>
</div>
</div>
... ... @@ -155,7 +161,7 @@
<ul class="nav_menu_items">
<li class="btn navbtn-a" role="button">
<a href="javascript:;">ABOUT US</a>
<div class='sec_menu_items'>
<div class="sec_menu_items">
<a href="../about/welcome.html" class="inner_item">
Welcome Message
</a>
... ... @@ -174,7 +180,7 @@
</li>
<li class="btn navbtn-a" role="button">
<a href="JavaScript:;">CLINICAL RESOURCES</a>
<div class='sec_menu_items'>
<div class="sec_menu_items">
<div class="inner_item">
Clinical Departments
<div class="third_menu_items">
... ... @@ -225,13 +231,11 @@
</li>
<li class="btn navbtnActive navbtn-a" role="button">
<a href="javascript:;">RESEARCH & EDUCATION</a>
<div class='sec_menu_items'>
<div class="sec_menu_items">
<a href="../research/nationalCancer.html" class="inner_item">
National Cancer Clinical Research Center
</a>
<div href="../research/research.html"
onclick="location.href='../research/research.html'" class="inner_item">
<div href="../research/research.html" onclick="location.href='../research/research.html'" class="inner_item">
Research
<div class="third_menu_items">
<a href="../research/research1.html" class="inner_item">
... ... @@ -248,8 +252,7 @@
</a>
</div>
</div>
<div
class="inner_item">
<div class="inner_item">
Education
<div class="third_menu_items">
<a href="../research/education.html" class="inner_item">
... ... @@ -270,7 +273,7 @@
</li>
<li class="btn navbtn-a" role="button">
<a href="javascript:;">TIANJIN CANCER INSTITUTE</a>
<div class='sec_menu_items'>
<div class="sec_menu_items">
<div href="javascript:;" class="inner_item">
About Us
<div class="third_menu_items">
... ... @@ -302,12 +305,11 @@
</a>
</div>
</div>
</div>
</li>
<li class="btn navbtn-a" role="button">
<a href="javascript:;">NURSING CARE</a>
<div class='sec_menu_items'>
<div class="sec_menu_items">
<a href="../care/history_time.html" class="inner_item">
About Us
</a>
... ... @@ -335,13 +337,11 @@
<a href="../care/cancer.html" class="inner_item">
Cancer Survivorship Support
</a>
</div>
</li>
<li class="btn navbtn-a" role="button">
<a href="javascript:;">INTERNATIONAL AFFAIRS</a>
<div class='sec_menu_items'>
<div class="sec_menu_items">
<a href="../international/conference.html" class="inner_item">
International Conferences
</a>
... ... @@ -375,10 +375,18 @@
</div>
<div class="contant">
<div class="contant_left">
<div class="left_title">Research Programs</div>
<div class="left_titles">Achievements</div>
<div class="left_title">Key Labaratories</div>
<div class="left_title">Find a Researcher</div>
<div class="left_title">
<a href="./research1.html">Research Programs</a>
</div>
<div class="left_titles">
<a href="./research2.html">Achievements</a>
</div>
<div class="left_title">
<a href="./research3.html">Key Labaratories</a>
</div>
<div class="left_title">
<a href="./researcher.html">Find a Researcher</a>
</div>
</div>
<div class="wire">
<div class="contant_right">
... ... @@ -394,7 +402,6 @@
</div>
<footer class="footer-content">
<div class="footer-main">
<ul class="list-unstyled third-ul">
<li>West Huan-Hu Rd, Ti Yuan Bei, Hexi District</li>
<li>Tianjin 300060</li>
... ... @@ -403,18 +410,16 @@
<li>Email: info@tjmuch.com</li>
</ul>
<ul class="list-unstyled first-ul">
<li><img src="../images/yikeda.png" width="160px" alt=""></li>
<li><img src="../images/tjuc.png" width="160px" alt=""></li>
<li><img src="../images/yikeda.png" width="160px" alt="" /></li>
<li><img src="../images/tjuc.png" width="160px" alt="" /></li>
</ul>
</div>
</footer>
</div>
<script src="../js/jquery-1.11.3.min.js"></script>
<script src="../js/bootstrap.min.js"></script>
<script src="../js/swiper-3.4.2.jquery.min.js"></script>
<script src="../js/common.js"></script>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -377,10 +377,10 @@
</div>
<div class="contant">
<div class="contant_left">
<div class="left_title">Research Programs</div>
<div class="left_title">Achievements</div>
<div class="left_titles">Key Labaratories</div>
<div class="left_title">Find a Researcher</div>
<div class="left_title"><a href="./research1.html">Research Programs</a></div>
<div class="left_title"><a href="./research2.html">Achievements</a></div>
<div class="left_titles"><a href="./research3.html">Key Labaratories</a></div>
<div class="left_title"><a href="./researcher.html">Find a Researcher</a></div>
</div>
<div class="wire">
<div class="contant_right">
... ...
... ... @@ -346,10 +346,10 @@
</div>
<div class="contant">
<div class="contant_left">
<div class="left_title">Research Programs</div>
<div class="left_title">Achievements</div>
<div class="left_title">Key Labaratories</div>
<div class="left_titles">Find a Researcher</div>
<div class="left_title"><a href="./research1.html">Research Programs</a></div>
<div class="left_title"><a href="./research2.html">Achievements</a></div>
<div class="left_title"><a href="./research3.html">Key Labaratories</a></div>
<div class="left_titles"><a href="./researcher.html">Find a Researcher</a></div>
</div>
<div class="wire">
<div class="contant_right">
... ...