From d9da753cb8bf0d85926b6417a477d3e2bfcd75f8 Mon Sep 17 00:00:00 2001 From: Ling Date: Tue, 8 Aug 2023 14:54:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?return=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/china-trains.css | 13 ++++++++++--- css/images/train/return.png | Bin 0 -> 1645 bytes 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 css/images/train/return.png diff --git a/css/china-trains.css b/css/china-trains.css index 3680288..019b07e 100644 --- a/css/china-trains.css +++ b/css/china-trains.css @@ -4,8 +4,6 @@ h2{ padding: 50px 0 20px 0;} h3 { padding: 35px 0 20px 0;} h4{margin: 15px 0;} table.infotable th, table.monthWeather th {font-family: 'Calibri';font-size:18px;line-height:20px;} -.tripnotes {position: relative;} -.tripnotes .OpenIcon,.tripnotes .CloseIcon{position: absolute; top: 30px; right:0;} @media (max-width: 768px) { h2{ padding: 50px 15px 20px 15px;} h3 { padding: 50px 15px 20px 15px;} @@ -17,4 +15,13 @@ table.infotable th, table.monthWeather th {font-family: 'Calibri';font-size:18px .tripnotescontent p{padding: 0 0px 18px 0px} .table-responsive {padding-left: 15px;padding-right: 15px; } -} \ No newline at end of file +} +/*train index*/ +.tripnotes {font-size: 22px;margin: 15px 0;position: relative} +.tripnotes h4 {margin: 0px;font-weight: normal;} +.tripnotes .CloseIcon,.tripnotes .OpenIcon {top: calc(50% - 5px);right: 0;position: absolute;} +.whatsnewinfo {margin-bottom: 20px;} +.whatsnewinfo:last-child {margin-bottom: 0;} +ul.traintype{ display:block; margin-bottom:10px; min-height:38px; padding:0px;} +ul.traintype li{background: #fff; display: block; float: left; padding: 5px 15px; color: #000; border: 1px solid #d1d1d1; margin-right: 10px; border-radius: 5px;} +ul.traintype li.active {background: #ad1818; color: #fff;} \ No newline at end of file diff --git a/css/images/train/return.png b/css/images/train/return.png new file mode 100644 index 0000000000000000000000000000000000000000..54f45141585fd12bcd61e8934e15f60cc78dca1a GIT binary patch literal 1645 zcmbVNdr;GM94~UHhk$OP196%~MMc^qrL?5i%AjenLlCipZZ|p7G^G)m)FjY?j&mwH z@%EAl2PnRn44n)g94g3T=()-i6*f@x)Zt?uQx0V4;nbxFZhv_GvD_uU*Z1@JetzG_ zWlKVQjIZ|$Z;?pkt6zd83S)r#oj6|j-gKy+2ty#RHS#MM3-7>LQWRxoOeCPU;b~+d ziJP-myGWHt!sghu965MSgaoX$xS|n0MI_)@-PV#_>OrvNu*jLvG0+d+| zCWpttadr)9rIzHd~F`#lP1p*t%403Tl+gSV~9=o`Eq$rj4X|J*EbQ6N#BJD@hn3OazXK zQPeCGN02f?93ev$VudAK4x7!Ua8eOI#`8Kn7Om64Qk^0!9K{estBsPw2&Rih!!fB; zs?o^DuzH%~ahf28nqJ--BUvhoH0xN#28_g6Nxen`8V2JCVo`{Zh%iEoBQjDPfkX(kWkF4-Tq;K* zWF$C>H~-)GL4qjAT`d18p0O>VBHhzhtspF3H4{k-9mEQ)vTf!-nn*P63q2NPa9*u1 zj7^`q-2ZIb(qN?T{oswc>m(-&LNhySytW>vmrrpizUNmCPb&xKuB@Q*PfqzDdAs+a z!=(~`*M@R`DPg%>pC&DPVf56et(w*0Syb#g_1MwYTQ;@%NGMzI@u8vP*XfE08=~?f zd)5O>p6q-)_@qD9|IAuoO4k+)?7J4QzTG2#ugWGb?Vj~j8WP~M?MC1HU2QQw$L{&I zRL4}b?@2nS-A_HAm>2!yPq*xTs-)A;)~%`;E>YBfe#Qi*%a3&Fs~ay_zur%ICM{Uh zI>04QI(KKFVXl7B7HoZe3KTczS?+8}9@$smx_$2A+x4l2knOdq(3I5kAzhQk8|||< z`EG8D{chWp2U&-*y?m;hPJ3i^bZzdwWHn&G{BMS@1Xfm5e95J*^9pXz4t0k-{q!x5 zora~q{rTwXjGA-g+3f13+nOY8{L!Kvtu6jL3@7uWV|sf#I{ymdQr|n(T-aq>I1`pU zjg5U+NtFz(h>Wa&?#tBIuFq@k3H)e7-M-!&?^Uhw4Sne)y>M04re4WpzdyR~?k7T< z3cF^yTKiFKAoyQTfzt*7&Txp}!Msz?_+5EL{RR=P7lMk5^Jlkj1~U01*7L&moJ zsIk1Yr6satV~b*3cIjY_x{gjfZ2bG@+6(%LDcY*hM z{W{lnm#^;E?HdFN_N+Og+J2)sI&eaFl{PQ>)|yi(j$d^sdbne4uIWMZxJNIh)j3sV zJv+|tE-US<<)=5Nz)ipV71bTw^ysso3;P;<&(@H8Z|@CxesChV+gkjI}jiFkvnmfZH&v(9UY-H!<{!takqZ^xAl=Dmr!j EKL>VyvH$=8 literal 0 HcmV?d00001 From 7c9040533417a72ff564bca3cd1c192708f16953 Mon Sep 17 00:00:00 2001 From: Ling Date: Wed, 9 Aug 2023 09:51:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?china-trains.css=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/china-trains.css | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/css/china-trains.css b/css/china-trains.css index 019b07e..c8484aa 100644 --- a/css/china-trains.css +++ b/css/china-trains.css @@ -13,10 +13,16 @@ table.infotable th, table.monthWeather th {font-family: 'Calibri';font-size:18px .notescollapse{padding:0 15px;} .tripnotes {padding-left: 0;} .tripnotescontent p{padding: 0 0px 18px 0px} - .table-responsive {padding-left: 15px;padding-right: 15px; -} + .table-responsive {padding-left: 15px;padding-right: 15px;} } /*train index*/ +.flex-row {display:flex;flex-direction:row;flex-wrap:wrap; align-items:stretch;justify-content:flex-start;clear:both; margin-right:-10px} +.flex-col-3, +.flex-col-4 {margin-right:10px;margin-bottom:10px;display:flex;flex-flow:column; position:relative} +.flex-col-3 {width:calc((100% - 10px * 3)/3)} +.flex-col-4 {width:calc((100% - 10px * 4)/4)} +.red {color:#ad1818;} +.bg-grary{background: #f6f6f6} .tripnotes {font-size: 22px;margin: 15px 0;position: relative} .tripnotes h4 {margin: 0px;font-weight: normal;} .tripnotes .CloseIcon,.tripnotes .OpenIcon {top: calc(50% - 5px);right: 0;position: absolute;} @@ -24,4 +30,25 @@ table.infotable th, table.monthWeather th {font-family: 'Calibri';font-size:18px .whatsnewinfo:last-child {margin-bottom: 0;} ul.traintype{ display:block; margin-bottom:10px; min-height:38px; padding:0px;} ul.traintype li{background: #fff; display: block; float: left; padding: 5px 15px; color: #000; border: 1px solid #d1d1d1; margin-right: 10px; border-radius: 5px;} -ul.traintype li.active {background: #ad1818; color: #fff;} \ No newline at end of file +ul.traintype li.active {background: #ad1818; color: #fff;} +.traintype li {cursor: pointer;} +.returnbox {background: #f2f2f2; border-radius:5px; padding: 15px;cursor: pointer} +.returnbox a{text-decoration: none;} +.returnbox:hover .return-top{color:#ad1818;} +.return-top,.return-bottom {display:flex;flex-direction:row;flex-wrap:wrap;} +.return-top{border-bottom:solid 1px #e2e2e2; padding-bottom: 10px; margin-bottom: 10px; position: relative;} +.return-left,.return-right{width:50%;} +.return-right {text-align:right;} +.return-icon { position:absolute;width:24px; height:24px; bottom:-12px;left: calc(50% - 12px); background: url("file:///D:/website/data.chinahighlights.com/css/images/train/return.png")} +.caption {padding: 15px;} +.caption h3 {font-size: 24px; padding-top: 0;} +ul.infolist {padding-bottom:0;} +ul.infolist li {list-style: disc;color:#888;} +.caption h3 a,ul.infolist li a {text-decoration: none;} +.caption h3 a:hover,ul.infolist li a:hover {color:#ad1818;} +.hidden-xs ul.traintype{margin-top: 0;} +@media (max-width: 768px){ + .flex-col-3,.flex-col-4 { width: 100%; margin-right: 0} + .flex-row {margin-right: 0;} + .hidden-xs{display: none;} +} From 067f3f54f0bb2464192710b588ba8845eaa78361 Mon Sep 17 00:00:00 2001 From: Ling Date: Wed, 9 Aug 2023 10:18:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?china-trains.css=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/china-trains.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/china-trains.css b/css/china-trains.css index c8484aa..ab66ced 100644 --- a/css/china-trains.css +++ b/css/china-trains.css @@ -32,14 +32,14 @@ ul.traintype{ display:block; margin-bottom:10px; min-height:38px; padding:0px;} ul.traintype li{background: #fff; display: block; float: left; padding: 5px 15px; color: #000; border: 1px solid #d1d1d1; margin-right: 10px; border-radius: 5px;} ul.traintype li.active {background: #ad1818; color: #fff;} .traintype li {cursor: pointer;} -.returnbox {background: #f2f2f2; border-radius:5px; padding: 15px;cursor: pointer} +.returnbox {background: #fff; border-radius:5px; padding: 15px;cursor: pointer;box-shadow: 0 0 5px #ccc;} .returnbox a{text-decoration: none;} .returnbox:hover .return-top{color:#ad1818;} .return-top,.return-bottom {display:flex;flex-direction:row;flex-wrap:wrap;} .return-top{border-bottom:solid 1px #e2e2e2; padding-bottom: 10px; margin-bottom: 10px; position: relative;} .return-left,.return-right{width:50%;} .return-right {text-align:right;} -.return-icon { position:absolute;width:24px; height:24px; bottom:-12px;left: calc(50% - 12px); background: url("file:///D:/website/data.chinahighlights.com/css/images/train/return.png")} +.return-icon { position:absolute;width:24px; height:24px; bottom:-12px;left: calc(50% - 12px); background: url("https://data.chinahighlights.com/css/images/train/return.png")} .caption {padding: 15px;} .caption h3 {font-size: 24px; padding-top: 0;} ul.infolist {padding-bottom:0;}