From 7f762717c4580a17377a33cf04351fa3abaea61d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 15:25:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.css | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/report/report.component.css b/src/app/routes/report/report.component.css
index ee4dc07..1bf9b73 100644
--- a/src/app/routes/report/report.component.css
+++ b/src/app/routes/report/report.component.css
@@ -9,11 +9,11 @@
.clear_fix:after{content:"";display: block;height:0;clear:both;visibility: hidden}
.bg{ margin: 0 0; width: 1000px;}
- .t_bg{height: 485.3px; background:url(./images/bg.png) no-repeat center top; background-size: 100% 100%; }
+ .t_bg{height: 485.35px; background:url(./images/bg.png) no-repeat center top; background-size: 100% 100%; }
.t_bg img{text-align: center; width:200px; display: block; margin: 0 auto; padding-top: 30px;}
- .t_bg h1{padding-top: 5px; text-align: center; font-size: 60px; font-weight: bold;}
+ .t_bg h1{padding-top: 5px; text-align: center; font-size: 54px; font-weight: bold;}
.container{padding-top:30px;text-align:center;}
.title{display:inline-block;}
@@ -23,17 +23,22 @@
.content{ text-align: center; margin: 10px; margin-left: 70px; margin-right: 70px;}
.content .left{ width: 48%; float: left; padding-right: 5px;}
- .content h2,.content .text1,.content .text2{ color: rgb(255, 254, 254);text-shadow: 4.243px 4.243px 5.64px rgba(0, 97, 207, 0.75); font-weight: 500;}
- .content h2{ font-size:20px;line-height: 40px; background:url(./images/bg_yuanjiao.png) no-repeat center center; background-size:80% 90%;}
- .content .text1{ font-size:18px;line-height: 30px;}
- .content .text2{ font-size:15px;line-height: 25px;}
+ .content .text_t,.content .text1,.content .text2{ color: rgb(255, 254, 254);text-shadow: 4.243px 4.243px 5.64px rgba(0, 97, 207, 0.75); font-weight: 500;}
+
+ .content .text_t{display:inline-block;}
+ .content .text_t_left{ width: 14px;height: 28px; float: left; background: url(./images/text_t_left.png) no-repeat;}
+ .content .text_t_bg{ background: url(./images/text_t_bg.png) repeat;height: 28px; float: left;font-size: 18px; line-height: 28px;}
+ .content .text_t_right{ width: 14px;height: 28px; float: left; background: url(./images/text_t_right.png) no-repeat;}
+
+ .content .text1{ font-size:16px;line-height: 30px;}
+ .content .text2{ font-size:14px;line-height: 25px;}
.content .text2 .text_l{ float: left;}
.content .text2 .text_r{ float: right;}
.content .right{ float: right; width: 48%;}
/*bottom*/
- .t_bg_b{width: 100%;height: 485.3px; background:url(./images/bg2.png) no-repeat center top;background-size: 100%;}
+ .t_bg_b{width: 100%;height: 485.35px; background:url(./images/bg2.png) no-repeat center top;background-size: 100%;}
.t_bg_b h1{padding-top: 25px; text-align: center; font-size: 16px; line-height: 34px; font-weight: 600;}
--
Gitblit v1.8.0