hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

资源库 合并后css样式冲突

Browse Source
Branch_szzh
lizanle 10 years ago
parent 9138f46301
commit 11d6298efa
2 changed files with 96 additions and 90 deletions
Show Stats Download Patch File Download Diff File

8
db/schema.rb
Unescape View File

@ -474,6 +474,13 @@ ActiveRecord::Schema.define(:version => 20150815030833) do
add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
create_table "discuss_demos", :force => true do |t|
t.string "title"
t.text "body"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "documents", :force => true do |t| create_table "documents", :force => true do |t|
t.integer "project_id", :default => 0, :null => false t.integer "project_id", :default => 0, :null => false
t.integer "category_id", :default => 0, :null => false t.integer "category_id", :default => 0, :null => false
@ -896,7 +903,6 @@ ActiveRecord::Schema.define(:version => 20150815030833) do
t.datetime "created_on" t.datetime "created_on"
t.integer "comments_count", :default => 0, :null => false t.integer "comments_count", :default => 0, :null => false
t.integer "course_id" t.integer "course_id"
t.datetime "updated_on"
end end
add_index "news", ["author_id"], :name => "index_news_on_author_id" add_index "news", ["author_id"], :name => "index_news_on_author_id"

178
public/stylesheets/public_new.css
Unescape View File

@ -588,100 +588,100 @@ input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;}
/*资源库*/ /*资源库*/
.resources {width:730px; background-color:#ffffff;} /*.resources {width:730px; background-color:#ffffff;}*/
.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;} /*.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}*/
.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;} /*.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}*/
.resourcesSelect {width:40px; height:40px; float:right; position:relative;} /*.resourcesSelect {width:40px; height:40px; float:right; position:relative;}*/
.resourcesSelected {width:25px; height:20px;} /*.resourcesSelected {width:25px; height:20px;}*/
.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;} /*.resourcesIcon {margin-top:15px; display:block; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat; width:25px; height:20px;}*/
.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;} /*.resourcesIcon:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;} /*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
a.resourcesGrey {font-size:12px; color:#888888;} /*a.resourcesGrey {font-size:12px; color:#888888;}*/
a.resourcesGrey:hover {font-size:12px; color:#15bccf;} /*a.resourcesGrey:hover {font-size:12px; color:#15bccf;}*/
.resourcesBanner ul li:hover ul.resourcesType {display:block;} /*.resourcesBanner ul li:hover ul.resourcesType {display:block;}*/
ul li:hover ul {display:block;} /*ul li:hover ul {display:block;}*/
.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;} /*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;} /*.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}*/
a.uploadText {color:#ffffff; font-size:14px;} /*a.uploadText {color:#ffffff; font-size:14px;}*/
.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;} /*.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}*/
.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;} /*.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}*/
.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;} /*.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}*/
.resourcesSearchBanner {height:34px; margin-bottom:10px;} /*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;} /*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;} /*.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}*/
.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;} /*.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}*/
.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;} /*.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;}*/
.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;} /*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;} /*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;} /*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;} /*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;} /*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
a.resourcesBlack {font-size:12px; color:#4c4c4c;} /*a.resourcesBlack {font-size:12px; color:#4c4c4c;}*/
a.resourcesBlack:hover {font-size:12px; color:#000000;} /*a.resourcesBlack:hover {font-size:12px; color:#000000;}*/
.dropdown-menu { /*.dropdown-menu {*/
position: absolute; /*position: absolute;*/
top: 100%; /*top: 100%;*/
left: 0; /*left: 0;*/
z-index: 1000; /*z-index: 1000;*/
display: none; /*display: none;*/
float: left; /*float: left;*/
min-width: 80px; /*min-width: 80px;*/
padding: 5px 0; /*padding: 5px 0;*/
margin: 2px 0 0; /*margin: 2px 0 0;*/
font-size: 12px; /*font-size: 12px;*/
text-align: left; /*text-align: left;*/
background-color: #fff; /*background-color: #fff;*/
-webkit-background-clip: padding-box; /*-webkit-background-clip: padding-box;*/
background-clip: padding-box; /*background-clip: padding-box;*/
border: 1px solid #ccc; /*border: 1px solid #ccc;*/
border-radius: 4px; /*border-radius: 4px;*/
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); /*-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
box-shadow: 0 6px 12px rgba(0, 0, 0, .175); /*box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
} /*}*/
.dropdown-menu > li > a { /*.dropdown-menu > li > a {*/
display: block; /*display: block;*/
padding: 3px 20px; /*padding: 3px 20px;*/
clear: both; /*clear: both;*/
font-weight: normal; /*font-weight: normal;*/
line-height: 1.5; /*line-height: 1.5;*/
color:#616060; /*color:#616060;*/
white-space: nowrap; /*white-space: nowrap;*/
} /*}*/
.dropdown-menu > li > a:hover{ /*.dropdown-menu > li > a:hover{*/
color: #ffffff; /*color: #ffffff;*/
text-decoration: none; /*text-decoration: none;*/
background-color: #64bdd9; /*background-color: #64bdd9;*/
outline:none; /*outline:none;*/
} /*}*/
/*发送资源弹窗*/ /*发送资源弹窗*/
/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/ /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;} /*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;} /*.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;} /*.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}*/
.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;} /*.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}*/
.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;} /*.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}*/
.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;} /*.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}*/
.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;} /*.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}*/
.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;} /*.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}*/
.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;} /*.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}*/
.sendCourseName {font-size:12px; color:#5f6060;} /*.sendCourseName {font-size:12px; color:#5f6060;}*/
.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;} /*.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}*/
.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left} /*.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}*/
a.sendSourceText {font-size:14px; color:#ffffff;} /*a.sendSourceText {font-size:14px; color:#ffffff;}*/
/*上传资源弹窗*/ /*上传资源弹窗*/
.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} /*.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}*/
.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;} /*.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;} /*.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}*/
.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;} /*.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}*/
a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;} /*a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}*/
.chooseFile {color:#ffffff; display:block; margin-left:32px;} /*.chooseFile {color:#ffffff; display:block; margin-left:32px;}*/
.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;} /*.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}*/
.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;} /*.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}*/
.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;} /*.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}*/
.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;} /*.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}*/
.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;} /*.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}*/
/*新个人主页框架css*/ /*新个人主页框架css*/

Write Preview
Loading…
Cancel
Save