jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

样式调整

This commit is contained in:
huang 2017-01-24 10:46:41 +08:00
parent 45453a9857
commit a9429a81ef
9 changed files with 59 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/application_helper.rb
View File

@ -1338,15 +1338,15 @@ module ApplicationHelper
if args.empty?
title = @html_title || []
if @project
title << @project.name
title << (@project.name.nil? ? "让创新更美好" : @project.name)
elsif @welcome
title << "高校教育大数据服务平台"
elsif @course
title << @course.name
title << (@course.name.nil? ? "让创新更美好" : @course.name)
elsif @contest
title << @contest.name
title << (@contest.name.nil? ? "让创新更美好" : @contest.name)
elsif @organization
title << @organization.name
title << (@organization.name.nil? ? "让创新更美好" : @organization.name)
elsif @forum || params[:controller] == "forums"
title << "问吧"
elsif @user

2
app/views/layouts/_footer.html.erb
View File

@ -26,7 +26,7 @@
</ul>
</li>
</ul>
<a href="javascript:void(0);" class="fl "><img src="/images/bigdata/new-logo.png" width="50" height="50" alt="高校教育大数据服务平台"></a>
<%= link_to image_tag("/images/bigdata/new-logo.png",width:"50px", height: "50px", alt:"高校教育大数据服务平台", class:"fl"), home_path %>
<p class="inner-footer-p-big fr ml30">高校教育大数据服务平台</p>
</div>
<div class="cl"></div>

5
app/views/layouts/_unlogin_header.html.erb
View File

@ -1,6 +1,6 @@
<div class="header_con">
<div class="fl clearfix new-logo">
<a href="javascript:void(0);" class="fl "><img src="/images/bigdata/new-logo.png" width="45" height="45" alt="高校教育大数据服务平台"></a>
<%= link_to image_tag("/images/bigdata/new-logo.png",width:"45px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
</div>
<div id="navHomepageSearch">
<% name = name%>
@ -8,7 +8,6 @@
<input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="new-search fl ml10 mr10" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
<% end %>
</div>
<!--<input type="text" placeholder="请输入关键词进行搜索" class="new-search fl ml15 mr10">-->
@ -17,7 +16,7 @@
<%= link_to "问吧", forums_path, :class =>"new-nav-a", :target => "_blank" %>
</li>
</ul>
<a href="<%= user_join_path %>" class="fr new-btn mt10">注册</a>
<a href="<%= user_join_path %>" class="fr new-btn mt10">注册</a>
<a href="<%= signin_path %>" class="fr new-btn new-btn-green mr5 mt10">登录</a>
</div>

42
app/views/welcome/index.html.erb
View File

@ -3,23 +3,35 @@
<h2>最省心的高校教学实践助理平台</h2>
<h3 class="mt10 inner-banner-con-h3"><span class="inner-c_blue">智擎校园</span> 为您在教学、竞赛、开发、创新的各个环节提供帮助</h3>
<div class="inner-btnbox clearfix">
<a href="<%= signin_url %>" class=" btn-blue fl">创 建 账 户</a>
<a href="<%= user_join_path %>" class=" btn-blue fl">创 建 账 户</a>
<span class="fl h3 ml10 mr10 mt10">or</span>
<a href="<%= User.current.logged? ? user_url(User.current) : signin_url %>" class=" btn-blue-line fl">创 建 社 区</a>
</div>
<div class="innner-banner-bottom" style="margin-left:250px;">
<span class="inner-border"></span>
<h3 class="inner-banner-con-h3">课程社区></h3>
<h3 class="fl inner-banner-con-h3">
<%= link_to '课程社区', User.current.logged? ? user_course_community_path(User.current) : signin_url %>
</h3>
<span class="fl ml15 f12 fb" style="margin-top: 12px;">›</span>
<div class="cl"></div>
<p>帮助老师和学生<br/>提供全面的课堂教学所需的协同、<br/>共享和评估手段</p>
</div>
<div class="innner-banner-bottom">
<span class="inner-border"></span>
<h3 class="inner-banner-con-h3">项目社区></h3>
<h3 class="fl inner-banner-con-h3">
<%= link_to '项目社区', User.current.logged? ? user_project_community_path(User.current) : signin_url %>
</h3>
<span class="fl ml15 f12 fb" style="margin-top: 12px;">›</span>
<div class="cl"></div>
<p>为老师、企业和学生<br/>提供在线协同开发和创新<br/>所需的一切支持</p>
</div>
<div class="innner-banner-bottom">
<span class="inner-border"></span>
<h3 class="inner-banner-con-h3">竞赛社区></h3>
<h3 class="fl inner-banner-con-h3">
<%= link_to '竞赛社区', User.current.logged? ? user_contest_community_path(User.current) : signin_url %>
</h3>
<span class="fl ml15 f12 fb" style="margin-top: 12px;">›</span>
<div class="cl"></div>
<p>提供全新的创新大赛解决方案<br/>让竞赛过程的每一个细节都可以再现<br/>支持全生命期竞赛管理</p>
</div>
<div class="cl"></div>
@ -32,13 +44,16 @@
<div class="inner-img fr mr50"><img src="images/inner/inner-banner01.jpg" height="600" alt="高校教育大数据服务平台"></div>
<div class="inner-txtbox fl ml50 mt50">
<h3 class="innerbox-txt-h3">课程社区</h3>
<p class="innerbox-txt-p mb10">为老师和学生教学<br>提供丰富的交流与协作工具</p>
<p class="innerbox-txt-p">为老师和学生教学<br>提供丰富的交流与协作工具</p>
<div class="mb10" style="height: 10px; border-bottom: 1px solid #20BEFF;">&nbsp;</div>
<p class="innerbox-txt-p">
支持发布和复用<br>各种类型的教学资源
</p>
<div class="mb10" style="height: 10px; border-bottom: 1px solid #20BEFF;">&nbsp;</div>
<p class="innerbox-txt-p">
实时统计分析教学行为<br>为各种教学评估提供数据支撑
</p>
<div class="mb20" style="height: 10px; border-bottom: 1px solid #20BEFF;">&nbsp;</div>
<%= link_to "创建课程", new_syllabus_path, :class => "btn-blue" %>
</div>
</div>
@ -48,14 +63,17 @@
<div class="inner-img fl ml50"><img src="images/inner/inner-banner02.jpg" width="600" alt="高校教育大数据服务平台"></div>
<div class="inner-txtbox fr mr50 ">
<h3 class="innerbox-txt-h3">项目社区</h3>
<p class="innerbox-txt-p mb10">支持分组开发与实验<br>提供灵活的分布式协同手段</p>
<p class="innerbox-txt-p">支持分组开发与实验<br>提供灵活的分布式协同手段</p>
<div class="mb10" style="height: 10px; border-bottom: 1px solid #60B25E;">&nbsp;</div>
<p class="innerbox-txt-p">
支持Git和Pull Request协同<br>全面支持分布式软件开发
</p>
<div class="mb10" style="height: 10px; border-bottom: 1px solid #60B25E;">&nbsp;</div>
<p class="innerbox-txt-p">
与课程社区集成<br>实现了教学与工程实践一体化
</p>
<%= link_to "创建项目", new_project_path, :class => "new-bigbtn new-bigbtn-green" %>
<div class="mb20" style="height: 10px; border-bottom: 1px solid #60B25E;">&nbsp;</div>
<%= link_to "创建项目", new_project_path, :class => "new-bigbtn-green" %>
</div>
</div>
</div>
@ -64,10 +82,10 @@
<h3 class="new-container-inner-h3" style="margin-bottom:50px;" >自动化高校教学实践全生命期管理与助理平台</h3>
<div class="inner-img02 "><img src="images/inner/inner-banner03.jpg" width="1000" alt="高校教育大数据服务平台"></div>
<div class="inner-txtbox02 ">
<p class="">自动化作业与<br>代码查重></p>
<p class=" ">自动化试卷与<br>程序批改></p>
<p class=" ">自动化资源与<br>流程复用></p>
<p class="">自动化教学与<br>工程评估></p>
<p class="">自动化作业与<br>代码查重<span class="ml10 fb">›</span></p>
<p class=" ">自动化试卷与<br>程序批改<span class="ml10 fb">›</span></p>
<p class=" ">自动化资源与<br>流程复用<span class="ml10 fb">›</span></p>
<p class="">自动化教学与<br>工程评估<span class="ml10 fb">›</span></p>
</div>
</div>
</div>
@ -81,7 +99,7 @@
<div class="new-container-inner02 clearfix">
<h3 class="inner-banner-con-h3 inner-t-c">跑步进入基于数据智能的教学管理服务化时代</h3>
<div class="inner-btnbox02 ">
<a href="<%= signin_url %>" class=" btn-blue mb10 ">创 建 账 户</a>
<a href="<%= user_join_path %>" class=" btn-blue mb10 ">创 建 账 户</a>
<a href="<%= User.current.logged? ? user_url(User.current) : signin_url %>" class=" btn-blue-line ">创 建 社 区</a>
</div>
</div>

BIN
public/images/inner/banner-inner.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 60 KiB

BIN
public/images/inner/inner-banner01.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 183 KiB

11
public/stylesheets/css/login.css
View File

@ -11,6 +11,7 @@ a:hover,a:active{color:#026434;}
.fl{ float:left;}
.fr{ float:right;}
.cl{ clear:both; overflow:hidden;}
.fb{ font-weight: bold;}
.mt5{ margin-top:5px;}
.mt10{ margin-top:10px;}
.mt20{ margin-top:20px;}
@ -18,6 +19,7 @@ a:hover,a:active{color:#026434;}
.mt50{ margin-top:50px;}
.mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;}
.mb20{ margin-bottom:20px;}
.mb30{ margin-bottom:30px;}
.mb50{ margin-bottom:50px;}
.ml5{ margin-left:5px;}
@ -39,8 +41,8 @@ a.new-btn-green{background: #3b94d6; color: #fff;}
a.new-btn-green:hover{background: #2384cd; color: #fff;}
a.new-bigbtn{display: inline-block;border:none; padding:2px 30px;color: #666;background: #e1e1e1; text-align:center;font-size: 14px; height: 30px;line-height: 30px; border-radius: 3px;}
a:hover.new-bigbtn{background: #c3c3c3; color: #333;}
a.new-bigbtn-green{background: #3b94d6; color: #fff;}
a.new-bigbtn-green:hover{background: #2384cd; color: #fff;}
a.new-bigbtn-green{display: block; width:265px; height:40px; line-height: 40px; background:#60B25E; color:#fff; font-size:14px; border-radius:5px; text-align:center; font-weight: bold;}
a.new-bigbtn-green:hover{background: #51a74f; color: #fff;}
/* 头部 */
.header{ width:100%; height:51px;background:#46484c; }
.header_con{ width:1200px; height:50px; margin:0 auto; }
@ -100,6 +102,7 @@ a.new_login_submit:hover{background: #2384cd;}
.inner-banner-con{ width: 1200px; margin: 0px auto; color:#fff; text-align: center;}
.inner-banner-con h2{ font-size: 60px; font-weight: normal;}
.inner-banner-con-h3{font-size: 24px; font-weight: normal; color: #fff;}
.inner-banner-con-h3 a{color: #fff;}
.inner-c_blue{ color:#3b94d6;}
a.btn-blue{ display: block; width:265px; height:40px; line-height: 40px; background:#3b94d6; color:#fff; font-size:14px; border-radius:5px; text-align:center;border: 3px solid #3b94d6; font-weight: bold; }
a:hover.btn-blue{background: #2384cd; border: 3px solid #2384cd;}
@ -110,8 +113,6 @@ a:hover.btn-blue-line{background: #3b94d6; color:#fff;}
.inner-border{ display: block; width: 50px; border-top:3px solid #fff; margin-bottom: 15px;}
.new-container-inner-h3{ font-size:40px; font-weight: normal; color: #333; text-align: center; margin-bottom: 20px;}
.innerbox-txt{ width:300px;}
.innerbox-txt-h3{ font-size:24px; color: #333; margin-bottom:20px;}
.innerbox-txt-p{font-size: 16px; color: #666; margin-bottom:20px;}
.back-color-black{ background:#47494d;}
.inner-t-c{ text-align: center;}
.inner-footer{ width: 100%; background:#323232; padding-bottom:30px;}
@ -160,4 +161,4 @@ a.menuGreyNew:hover {color:#297fb8;}
.inner-txtbox02{width: 800px; margin:0 auto;}
.inner-txtbox02 p{ display: block; width: 200px; font-size: 20px; float: left; margin-top:30px; text-align: center; color:#666;}
.innerbox-txt-h3{ font-size:28px; color: #333; margin-bottom:20px;}
.innerbox-txt-p{font-size: 20px; color: #666; margin-bottom:20px;}
.innerbox-txt-p{font-size: 20px; color: #666;}

6
public/stylesheets/css/structure.css
View File

@ -542,4 +542,8 @@ input.new-search{border-radius:3px; width:300px; height:30px; margin-top: 10px;
.my_account_info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.my_account_info li{ padding-left: 5px;}
.li_bottom_border{ border-bottom:1px solid #eee;margin-top: 2px;margin-bottom: 2px;}
.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
a.new-btn{display: inline-block;border:none; padding:0 10px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px; height: 30px;border-radius: 3px; line-height: 30px;}
a.new-btn:hover{background: #c3c3c3; color: #333;}
a.new-btn-green{background: #3b94d6; color: #fff;}
a.new-btn-green:hover{background: #2384cd; color: #fff;}

22
public/stylesheets/nyan.css
View File

@ -85,17 +85,17 @@ span[id^=valid_user] {
opacity: 0.7;
}
.clearfix {
/*width: 100%;
height: 0px;
clear: both;
display: block;*/
display: inline-block;
width: 80px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
/*.clearfix {*/
/*width: 100%;*/
/*height: 0px;*/
/*clear: both;*/
/*display: block;*/
/*display: inline-block;*/
/*width: 80px;*/
/*overflow: hidden;*/
/*white-space: nowrap;*/
/*text-overflow: ellipsis;*/
/*}*/
/*.hidden {*/
/*display: none;*/