From a28d775cb2fd7e42324285347b609793b4139885 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 24 Jun 2016 14:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=EF=BC=8C=E9=A2=98?= =?UTF-8?q?=E5=BA=93=E6=A0=B7=E5=BC=8F=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_resource_info.html.erb | 2 +- public/stylesheets/css/popup.css | 3 --- public/stylesheets/css/public.css | 18 ++++++++---------- public/stylesheets/css/structure.css | 2 +- public/stylesheets/nyan.css | 8 ++++---- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb index 58829386c..c0c2487a5 100644 --- a/app/views/users/_user_resource_info.html.erb +++ b/app/views/users/_user_resource_info.html.erb @@ -1,4 +1,4 @@ -
+
上传资源
<%= render :partial => 'users/resource_search_form',:locals => {:user => @user, :type => @type, :order => @order, :sort => @score, :status => @status} %> diff --git a/public/stylesheets/css/popup.css b/public/stylesheets/css/popup.css index 3f555fccf..25968fdf1 100644 --- a/public/stylesheets/css/popup.css +++ b/public/stylesheets/css/popup.css @@ -94,7 +94,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} .subject-pop-date {width:75px; text-align:center;} .subject-pop-row {width:685px; height:30px; color:#7a7a7a; font-size:12px;} .subject-pop-row li {height:30px; line-height:30px; vertical-align:middle;} -.subject-pop-search {border:1px solid #dddddd; height:32px; width:250px;} .subject-pop-info {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;} .subject-pop-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:265px; height:475px; overflow-y:auto;} .subject-pop-intro {color:#585858; line-height:18px; font-size:12px;} @@ -110,7 +109,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} /*导入资源样式*/ .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;} .resoure-list {width:705px;} -.subjectDetail {width:285px;} .resource-pop-banner {width:705px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;} .resource-pop-banner li {height:40px; line-height:40px; vertical-align:middle;} .resource-pop-name {width:270px; padding-left:10px; padding-right:10px;} @@ -119,7 +117,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} .resource-pop-row {width:705px; height:40px; color:#7a7a7a; font-size:12px;} .resource-pop-row li {height:40px; line-height:40px; vertical-align:middle;} .subjectSearch {border:1px solid #dddddd; height:32px; width:250px;} -.subjectInfo {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;} .subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;} .subjectIntro {color:#585858; line-height:18px; font-size:12px;} .subjectContent {color:#888888; line-height:18px; font-size:12px;} diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 76eb0feec..eef43e2b0 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -55,7 +55,7 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;} .resourcesListDashLine {width:710px;border-bottom:1px dashed #eaeaea !important; margin-left:auto; margin-right:auto; padding-bottom: 2px} /*border-bottom:1px dashed #eaeaea;*/ .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;} .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;} -.resourcesSelectSend {float:right;} +.resourcesSelectSend {vertical-align: middle; height: 28px; line-height: 28px;} /*.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}*/ .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; } a.sendButtonBlue {color:#269ac9;} @@ -357,6 +357,9 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s .subject-list-from {width:145px; text-align:center;} .subject-name-middle {display:inline-block; line-height:40px; vertical-align:middle;} .subject-name-hidden {max-width:134px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} +.subject-pop-search {border:1px solid #dddddd; height:32px; width:250px;} +.subjectDetail {width:285px;} +.subjectInfo {width:285px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;} /* @功能 定义 */ span.at {color:#269ac9;} @@ -393,12 +396,12 @@ a:hover.userCancel{border:1px solid #888888; } .userCardM {width:201px; height:20px; border:1px solid #dddddd; resize:none;} .resourceCopy {padding:0px; margin:0px; width:12px; height:12px; display:inline-block;} -a.group-btn{ background: url(../images/course/hwork_icon.png) -2px -58px no-repeat !important; height:20px; display:block; padding-left:23px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} +a.group-btn{ background: url(/images/course/hwork_icon.png) -2px -58px no-repeat !important; height:20px; display:block; padding-left:23px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repeat; width:30px; height:20px; display:block; padding-left:23px; color:#888888;} /*排序样式*/ -a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;} -a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;} +a.st_up{ display: block; width:8px; float:left; height:13px; background:url(/images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;} +a.st_down{ display: block; width:8px; float:left; height:13px; background:url(/images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;} .likeText{color: #7f7f7f} .likeNum{color: #7f7f7f} @@ -517,9 +520,8 @@ a.pages-big{ width:50px;} /*视频播放默认图标*/ .mediaIco{margin: 30px 0 30px 20px;width: 200px;} -a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;} -a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;} a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding:1px;} +a:hover.st_img { border:1px solid #1c9ec7; } .green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;} @@ -730,10 +732,6 @@ a.newbtn_t{ font-size:14px; font-weight:bold; color:#fff;} .st_box ul li{ float:left;} .st_box_top a{ font-weight:bold; color:#7a7a7a; float:left; margin-bottom:5px;} .st_box_top a:hover{ color:#1c9ec7;} -a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;} -a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;} -a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding:1px;} -a:hover.st_img { border:1px solid #1c9ec7; } .st_boxlist{ border-bottom:1px dashed #CCC; height:43px; margin-bottom:10px; } .st_boxlist a{ float:left;} .st_boxlist ul{ float:left; width:200px; margin-left:10px;} diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 82800f407..0ced00dbd 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -312,7 +312,7 @@ a:hover.qx_btn{color:#64bdd9;} .navHomepageMenu {margin-right:20px; display:inline-block; height:54px; line-height:54px; vertical-align:middle;} .navHomepageMenu:hover {background-color:#297fb8;} .navHomepageSearchBoxcontainer {margin-top:11px; } -.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;} +.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; background-color:#ffffff;} #navHomepageSearch{margin-top: 11px;background-color: white;} .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left; padding-left:5px !important; margin:0;} #navSearchAlert {display:none;} diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index e9fd46adf..75da9349d 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -97,9 +97,9 @@ span[id^=valid_user] { text-overflow: ellipsis; } -.hidden { - display: none; -} +/*.hidden {*/ + /*display: none;*/ +/*}*/ .font_color_orange { color: #E8770D; @@ -1189,7 +1189,7 @@ div.tags_area { border-bottom: 1px solid #d6dfff; } -ver-zebra .filename { +#ver-zebra .filename { overflow: hidden; white-space: nowrap; text-overflow: ellipsis;