diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb index 4963ea14f..fcbbd8bfe 100644 --- a/app/views/layouts/base_org_newstyle.html.erb +++ b/app/views/layouts/base_org_newstyle.html.erb @@ -88,86 +88,75 @@
<% if User.current.admin_of_org?(@organization) %> - + <% else %> - + <% end %> - - <%# 登录 %> <%= render :partial => 'organizations/org_logined_header' %>
+ -
- <% @subfield_content.each do |field| %> <% if is_default_field?(field) %> diff --git a/public/images/org_new_style/banner.jpg b/public/images/org_new_style/banner.jpg index 385b24c9e..3cf23c4e5 100644 Binary files a/public/images/org_new_style/banner.jpg and b/public/images/org_new_style/banner.jpg differ diff --git a/public/images/org_new_style/default-img.jpg b/public/images/org_new_style/default-img.jpg index e9aead6ed..e345ca3d7 100644 Binary files a/public/images/org_new_style/default-img.jpg and b/public/images/org_new_style/default-img.jpg differ diff --git a/public/images/org_new_style/default-img2.png b/public/images/org_new_style/default-img2.png new file mode 100644 index 000000000..3a824b1f6 Binary files /dev/null and b/public/images/org_new_style/default-img2.png differ diff --git a/public/images/org_new_style/icons.png b/public/images/org_new_style/icons.png index ab5d36b6f..d31d59a88 100644 Binary files a/public/images/org_new_style/icons.png and b/public/images/org_new_style/icons.png differ diff --git a/public/images/org_new_style/logo.jpg b/public/images/org_new_style/logo.jpg index 78e3918d4..689bd958a 100644 Binary files a/public/images/org_new_style/logo.jpg and b/public/images/org_new_style/logo.jpg differ diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css index 9155df3f1..5e73949a6 100644 --- a/public/stylesheets/org_new_style.css +++ b/public/stylesheets/org_new_style.css @@ -18,45 +18,69 @@ a:hover{color:#29156f;} .bg-grey{ background:#f2f2f2;} /** header **/ -.header{ width:100%; height:60px; background:#29146f; padding:5px 0 0px; } -.header-con{ width:1200px; margin:0 auto;} -.logo,.logo img{ display:block; height:52px; } -a.login{ background:url(../images/org_new_style/icons.png) -7px -11px no-repeat; width:146px; height:55px; margin-right:40px; margin-top:11px;} -a:hover.login{ background:url(../images/org_new_style/icons.png) -7px -88px no-repeat; } -a.register{ background:url(../images/org_new_style/icons.png) -190px -11px no-repeat; width:158px; height:55px; ;margin-top:11px;} -a:hover.register{ background:url(../images/org_new_style/icons.png) -190px -88px no-repeat; } +.header{ width:100%; height:60px; padding:5px 0 0px; } +.header-con{ width:1200px; margin:0 auto; } +.logo{ position:relative; } +.logo-img{ height:52px; } .login{ margin-top:15px;} -.login a{ color:#fff; font-size:14px; margin-top:10px; } +.login a{ color:#000; font-size:14px; margin-top:10px; } +.logo-add{ display:block; top:3px; left:0px; position:absolute; width:20px; height:20px;background:url(../images/org_new_style/icons.png) -7px -573px no-repeat;} + + +/*.header{ width:100%; height:60px; background:#29146f; padding:5px 0 0px; }*/ +/*.header-con{ width:1200px; margin:0 auto;}*/ +/*.logo,.logo img{ display:block; height:52px; }*/ +/*a.login{ background:url(../images/org_new_style/icons.png) -7px -11px no-repeat; width:146px; height:55px; margin-right:40px; margin-top:11px;}*/ +/*a:hover.login{ background:url(../images/org_new_style/icons.png) -7px -88px no-repeat; }*/ +/*a.register{ background:url(../images/org_new_style/icons.png) -190px -11px no-repeat; width:158px; height:55px; ;margin-top:11px;}*/ +/*a:hover.register{ background:url(../images/org_new_style/icons.png) -190px -88px no-repeat; }*/ +/*.login{ margin-top:15px;}*/ +/*.login a{ color:#fff; font-size:14px; margin-top:10px; }*/ /** nav **/ -.nav-box{ width:1200px; height:60px; margin:0 auto;} -.nav a{ display:block; padding:15px 10px; font-size:18px; color:#000; margin-right:20px; } -.navact{border-bottom:3px solid #ffbd18;} -.nav a:hover{border-bottom:3px solid #ffbd18;} -.searchbox{ width:338px; height:57px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px; margin:10px 0px 0 0;} -.search-input{width:270px; height:40px; color:#bebebe; font-size:18px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px;border:0px; background:none; margin:10px 0 0 20px;} -.search-input:hover{ border:none;color:#fff; } -a.search-icon{ background:url(../images/org_new_style/icons.png) -387px -11px no-repeat; width:40px; height:40px; margin-top:8px;} -a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -89px no-repeat;} -.searchbox:hover{ background:#999999; color:#fff;} +.nav-box{ width:100%; padding:0px 0 5px; background:#eeeeee;} +.nav-con{width:1200px; margin:0 auto; background:#eee;} +.nav{ } +.nav a{ display:block; padding:15px 10px; font-size:18px; color:#666666; background:#eee; border-top:3px solid #eee; margin-right:20px; } +a.navact{border-top:3px solid #ffbd18;} +.nav a:hover{border-top:3px solid #ffbd18;} + +/*.nav-box{ width:1200px; height:60px; margin:0 auto;}*/ +/*.nav a{ display:block; padding:15px 10px; font-size:18px; color:#000; margin-right:20px; }*/ +/*.navact{border-bottom:3px solid #ffbd18;}*/ +/*.nav a:hover{border-bottom:3px solid #ffbd18;}*/ +/*.searchbox{ width:338px; height:57px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px; margin:10px 0px 0 0;}*/ +/*.search-input{width:270px; height:40px; color:#bebebe; font-size:18px; border:1px solid #ccc; -webkit-border-radius: 3px;border-radius: 3px;border:0px; background:none; margin:10px 0 0 20px;}*/ +/*.search-input:hover{ border:none;color:#fff; }*/ +/*a.search-icon{ background:url(../images/org_new_style/icons.png) -387px -11px no-repeat; width:40px; height:40px; margin-top:8px;}*/ +/*a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -89px no-repeat;}*/ +/*.searchbox:hover{ background:#999999; color:#fff;}*/ /* banner */ -.banner{ width:100%; height:304px; background:#070317; color:#fff; text-align:center; line-height:2.4;} -.banner-inner{ width:1500px; margin:0 auto; position:relative; text-align:center;} -.banner-img{ height:304px;} -.banner-txt{position:absolute; top:30%; left:0%; width:1500px; margin:0 auto;} +.banner{ width:100%; height:304px; color:#fff; text-align:center; line-height:2.4;position:relative;} +.banner-inner{ width:100%; margin:0 auto; text-align:center;} +.banner-img{ height:313px;} +.banner-txt{position:absolute; top:25%; left:35%; width:500px; padding:30px 0; margin:0 auto; background-color:rgba(255,255,255,.3); } +.banner-add{ display:block; position:absolute; top:10%; left:20%;width:27px; height:27px; background:url(../images/org_new_style/icons.png) -39px -570px no-repeat;} .banner h1{ font-size:42px;} -.banner a{font-size:28px; color:#fff;} -.banner a:hover{ text-decoration:underline;} -.banner p{ font-size:18px;} -.banner span{ font-size:16px;} +.banner p{font-size:40px; color:#fff;} + +/*.banner{ width:100%; height:304px; background:#070317; color:#fff; text-align:center; line-height:2.4;}*/ +/*.banner-inner{ width:1500px; margin:0 auto; position:relative; text-align:center;}*/ +/*.banner-img{ height:304px;}*/ +/*.banner-txt{position:absolute; top:30%; left:0%; width:1500px; margin:0 auto;}*/ +/*.banner h1{ font-size:42px;}*/ +/*.banner a{font-size:28px; color:#fff;}*/ +/*.banner a:hover{ text-decoration:underline;}*/ +/*.banner p{ font-size:18px;}*/ +/*.banner span{ font-size:16px;}*/ /** box1 **/ .box1{ width:100%; padding:60px 0;} .content{ width:1200px; margin:0 auto;} .box-top{ margin:0 auto; text-align:center; margin-bottom:45px; } -.box-title{ width:355px; height:67px; margin:0 auto; background:#29156f; color:#fff; text-align:center; font-size:40px; font-weight: lighter; margin-bottom:2px;} +.box-title{ width:355px; height:67px; margin:0 auto; border-top:1px solid #ccc; border-bottom:1px solid #ccc; color:#000; text-align:center; font-size:40px; font-weight: lighter; margin-bottom:2px;} .box-title-p{ font-size:20px; color:#999999;} -.row{ width:1200px; margin: 0 auto; } +.row{ width:1200px; margin: 0 auto; } .row-box1{ width:365px;} .row-img{ margin-bottom:10px; width:365px; height:230px; display:block;} .row-time{ color:#ffbd18; font-size:14px; font-weight:bold; line-height:1.9;} @@ -66,8 +90,6 @@ a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -8 .row-txt{line-height:2.4; padding-bottom:10px; margin-bottom:10px; color:#888;} .row-txt:hover{color:#29156f;} .row-txt-line{border-bottom:1px solid #cccccc; width:365px;} -a.btn-more{ display:block; font-size:14px; width:110px; height:40px; -webkit-border-radius: 3px;border-radius: 3px;background:#ffbd18; color:#fff; text-align:center; line-height:3.0;} -a:hover.btn-more{ background:#29156f;} .row-box2{ width:388px; border:1px solid #ccc; border-bottom:none;} .row-con2 a{ display:block;padding:20px 10px; border-bottom:1px solid #ccc;} .row-con2 a:hover{ background:#29156f; color:#fff;} @@ -75,6 +97,30 @@ a:hover.btn-more{ background:#29156f;} .row-txt2{line-height:2.4; color:#888;} .row-txt2:hover{ color:#fff; } +/*.box1{ width:100%; padding:60px 0;}*/ +/*.content{ width:1200px; margin:0 auto;}*/ +/*.box-top{ margin:0 auto; text-align:center; margin-bottom:45px; }*/ +/*.box-title{ width:355px; height:67px; margin:0 auto; background:#29156f; color:#fff; text-align:center; font-size:40px; font-weight: lighter; margin-bottom:2px;}*/ +/*.box-title-p{ font-size:20px; color:#999999;}*/ +/*.row{ width:1200px; margin: 0 auto; }*/ +/*.row-box1{ width:365px;}*/ +/*.row-img{ margin-bottom:10px; width:365px; height:230px; display:block;}*/ +/*.row-time{ color:#ffbd18; font-size:14px; font-weight:bold; line-height:1.9;}*/ +/*.row-title{ font-size:16px; font-weight:bold; line-height:1.9;display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}*/ +/*.row-con { display:block; }*/ +/*.row-con:hover{ color:#29156f; }*/ +/*.row-txt{line-height:2.4; padding-bottom:10px; margin-bottom:10px; color:#888;}*/ +/*.row-txt:hover{color:#29156f;}*/ +/*.row-txt-line{border-bottom:1px solid #cccccc; width:365px;}*/ +/*a.btn-more{ display:block; font-size:14px; width:110px; height:40px; -webkit-border-radius: 3px;border-radius: 3px;background:#ffbd18; color:#fff; text-align:center; line-height:3.0;}*/ +/*a:hover.btn-more{ background:#29156f;}*/ +/*.row-box2{ width:388px; border:1px solid #ccc; border-bottom:none;}*/ +/*.row-con2 a{ display:block;padding:20px 10px; border-bottom:1px solid #ccc;}*/ +/*.row-con2 a:hover{ background:#29156f; color:#fff;}*/ +/*.row-con2 a:hover{ color:#fff;}*/ +/*.row-txt2{line-height:2.4; color:#888;}*/ +/*.row-txt2:hover{ color:#fff; }*/ + /** 活动专区 **/ .con-left{ width:618px;} .con-left-box{ margin-bottom:20px; height:96px; display:block;} @@ -95,7 +141,7 @@ a.con-arrow-btn{ display: block;width:25px;height:25px;background:url(../images/ a.pre-arrow,a.pre-back{ display:block; width:25px; height:10px; background:#29156f; margin-left:5px;} a.pre-back{ background:#888;} /** footer **/ -.footer{ height:150px; background:#29156f; width:100%;} +.footer{ height:150px; background:#bbb; width:100%;} .footer-con{ width:1200px; padding:30px 0 0 60px; margin:0 auto; text-align:center; font-size:14px; color:#fff;} .footer-con ul{ display:block; width:430px; height:50px; margin:0 auto; } .footer-con ul li a{font-size:18px; color:#fff; margin-right:35px; font-weight:bold;} @@ -180,14 +226,17 @@ a:hover.read-more{ text-decoration:underline;} opacity: 1; } - -a.more-btn{ display:block; background:#ccc; color:#fff; margin-top:10px; width:100px; height:38px;font-size:14px; -webkit-border-radius: 5px;border-radius:5px;text-align:center; line-height:38px;} -a.more-btn{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;} a.more-btn-center{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;} -a:hover.more-btn{ background:#29146f; color:#fff;} -a:hover.more-btn-center{ background:#29146f; color:#fff;} +a:hover.more-btn-center{ background:#aaa; color:#fff;} .mt30{ margin-top:30px;} +/*a.more-btn{ display:block; background:#ccc; color:#fff; margin-top:10px; width:100px; height:38px;font-size:14px; -webkit-border-radius: 5px;border-radius:5px;text-align:center; line-height:38px;}*/ +/*a.more-btn{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}*/ +/*a.more-btn-center{ display:block; border:1px solid #ccc; color:#000; margin-top:10px; width:120px; height:38px;font-size:14px; -webkit-border-radius: 25px;border-radius:25px;text-align:center; line-height:38px; margin:0 auto; margin-top:30px;}*/ +/*a:hover.more-btn{ background:#29146f; color:#fff;}*/ +/*a:hover.more-btn-center{ background:#29146f; color:#fff;}*/ +/*.mt30{ margin-top:30px;}*/ + .nocontent{ font-size:30px; color:#888; margin:150px auto; text-align:center;} /** 帖子列表模式 **/