From eb7d0761cb5c8b81be42296b762e15d7cd527c88 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 24 Dec 2015 10:37:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=8F=9C=E5=8D=95=E6=A0=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=92=8C=E4=B8=AA=E4=BA=BA=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 27 ++--- public/stylesheets/org.css | 175 ++++++++++++++-------------- 2 files changed, 99 insertions(+), 103 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 93af3fd29..e17562ecc 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -46,13 +46,13 @@ - + <% else %>
  • 登录
    • @@ -197,19 +197,14 @@ } } $(document).ready(function(){ - $("#orgUser,#orgSwitch").click(function(){ - $(".org_login_list").toggle(); - if($("#orgArrow").attr("class") == "orgMenuArrow"){ - $("#orgArrow").attr("class","orgMenuArrow2"); - } - else { - $("#orgArrow").attr("class","orgMenuArrow") ; - } - }); - if($(".org_login_list").children().click){ - $(".org_login_list").css("display","none"); - $("#orgArrow").attr("class","orgMenuArrow"); - }; + $("#orgUser,#orgSwitch,.org_login_list").mouseover(function () { + $(".org_login_list").css("display", "block"); + $("#orgArrow").attr("class", "orgMenuArrow2"); + }); + $("#orgUser,#orgSwitch,.org_login_list").mouseout(function () { + $(".org_login_list").css("display", "none"); + $("#orgArrow").attr("class", "orgMenuArrow"); + }); }); diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 44dcc70e3..e425d12c9 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -1,88 +1,89 @@ -@charset "utf-8"; -/* CSS Document */ - -.orgName {width:130px; color:#484848;} -.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} -.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} - -.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} -.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} -.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;} -.logoBorder {border:1px solid #eaeaea; padding:2px;} -.logoBorder:hover {border:1px solid #269ac9;} -.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;} -.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;} -.orgRow {font-size:14px; color:#484848;} -.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;} -.w607 {width:607px;} -.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} -a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} -a.saveBtn:hover {background-color:#297fb8;} -.orgMemberList {width:410px; float:left;} -.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} -.orgListUser {width:119px; float:left;} -.orgListRole {width:180px; float:left;} -.orgMemContainer {width:278px;} -.orgMemberAdd {float:right; width:240px;} -.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} -.undis {display:none;} -.dis {display:inline-block;} -.upbtn { margin: 40px 0px 0px 15px; - display: block; - padding: 2px 5px; - border: 1px solid #EAEAEA;} - -a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} - -/*项目关联css*/ -.relateOrg {width:335px;} -.relatedList {width:335px;} -.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;} -a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;} -a.cancelBtn:hover {background-color:#717171; color:#ffffff;} -.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} -.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} -.relatedListOption {width:80px; text-align:center;} -.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} -.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} - -/*组织列表*/ -.mt28 {margin-top:28px;} -.orgWrap {width:880px; float:left;} -.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } -.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;} - -/*关联项目弹窗*/ -.projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px; overflow:auto; overflow-x:hidden; width:288px;} -.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;} - -/*组织首页新151204Tim*/ -.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;} -.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;} -.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;} -.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;} -a.linkGrey8 {color:#888888;} -a.linkGrey8:hover {color:#585858;} -.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} -.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;} -.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} -.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} -.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;} -#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;} - -.orgListStatus {width:55px; float:left;} -.reCon{ margin:5px; width:710px;} -.retop{width:710px; height:40px; background:#eaeaea; padding:5px;} -.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right} -.re_search{ margin-top:7px; margin-left:5px;} -.re_search{ margin-top:7px; margin-left:5px;} -.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;} -.re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px;padding-left: 0px;} -.b_lblue{ background:#64bdd9;} -.c_grey{ color:#888888;} -.re_con{ margin:5px; width:665px;} -.re_con_top{color:#494949; } -.re_con_top span{ color:#999999; font-weight:bold;} -ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } - +@charset "utf-8"; +/* CSS Document */ + +.orgName {width:130px; color:#484848;} +.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} +.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} + +.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} +.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} +.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;} +.logoBorder {border:1px solid #eaeaea; padding:2px;} +.logoBorder:hover {border:1px solid #269ac9;} +.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;} +.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;} +.orgRow {font-size:14px; color:#484848;} +.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;} +.w607 {width:607px;} +.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} +a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} +a.saveBtn:hover {background-color:#297fb8;} +.orgMemberList {width:410px; float:left;} +.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} +.orgListUser {width:119px; float:left;} +.orgListRole {width:180px; float:left;} +.orgMemContainer {width:278px;} +.orgMemberAdd {float:right; width:240px;} +.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} +.undis {display:none;} +.dis {display:inline-block;} +.upbtn { margin: 40px 0px 0px 15px; + display: block; + padding: 2px 5px; + border: 1px solid #EAEAEA;} + +a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} + +/*项目关联css*/ +.relateOrg {width:335px;} +.relatedList {width:335px;} +.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;} +a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;} +a.cancelBtn:hover {background-color:#717171; color:#ffffff;} +.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} +.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} +.relatedListOption {width:80px; text-align:center;} +.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} +.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} + +/*组织列表*/ +.mt28 {margin-top:28px;} +.orgWrap {width:880px; float:left;} +.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } +.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;} + +/*关联项目弹窗*/ +.projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px; overflow:auto; overflow-x:hidden; width:288px;} +.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;} + +/*组织首页新151204Tim*/ +.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;} +.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;} +.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;} +.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;} +a.linkGrey8 {color:#888888;} +a.linkGrey8:hover {color:#585858;} +.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} +.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;} +.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} +.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} +.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;} +#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;} +.org_login_list a {color:#269ac9;} + +.orgListStatus {width:55px; float:left;} +.reCon{ margin:5px; width:710px;} +.retop{width:710px; height:40px; background:#eaeaea; padding:5px;} +.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right} +.re_search{ margin-top:7px; margin-left:5px;} +.re_search{ margin-top:7px; margin-left:5px;} +.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;} +.re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px;padding-left: 0px;} +.b_lblue{ background:#64bdd9;} +.c_grey{ color:#888888;} +.re_con{ margin:5px; width:665px;} +.re_con_top{color:#494949; } +.re_con_top span{ color:#999999; font-weight:bold;} +ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } + .popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} \ No newline at end of file