kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

样式调整

This commit is contained in:
cxt 2017-04-21 22:51:57 +08:00
parent 9f1802b443
commit d2f659476e
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<div class="header_con clearfix">
<div class="fl clearfix new-logo">
<%= link_to image_tag("../images/bigdata/new-logo.png",width:"45px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
<%= link_to image_tag("../images/bigdata/bigdata-logo.png",width:"45px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
</div>
<div class="header-search fl mt10 ml15 mr15">
<dropdown class="fl">

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

@ -11,7 +11,7 @@
<%= heads_for_theme %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= stylesheet_link_tag 'css/common','css/structure','css/public','css/forum','css/popup', 'css/font-awesome','css/moduel', 'css/font-awesome', :media => 'all'%>
<%= stylesheet_link_tag 'css/bigdata-popup','css/bigdata-common', "css/bigdata-public",'css/common','css/structure','css/public','css/forum','css/popup', 'css/font-awesome','css/moduel', 'css/font-awesome', :media => 'all'%>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->
<%= yield :header_tags -%>

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/bigdata-popup','css/bigdata-common', "css/bigdata-public",'css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>

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

@ -9,7 +9,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/bigdata-popup','css/bigdata-common', "css/bigdata-public",'css/common','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->
<%= yield :header_tags -%>

2
public/javascripts/application.js
View File

@ -663,7 +663,7 @@ function set_footer(){
});
}
}
$(window).scroll(positionFooter).resize(positionFooter);
//$(window).scroll(positionFooter).resize(positionFooter);
}
function setupHeartBeat(){

2
public/stylesheets/css/bigdata-user.css
View File

@ -122,7 +122,7 @@
.-task-sidebar{position:fixed;width:35px;height:20%;right:5%;bottom:5%;z-index: 10;}
.-task-sidebar div{width:35px;height:28px;margin-bottom:3px;background:cornflowerblue;color:#fff;font-size:20px;text-align:center;padding-top:7px;}
.-task-sidebar div:hover {background:#ccc;}
.-task-desc{background:#494949;width:90px;height:35px;line-height: 35px;text-align: center;
.-task-desc{background:#494949;width:90px;line-height: 35px;text-align: center;
position: absolute;color: #fff;font-size: 13px;z-index: 10;opacity: 0;}
.-task-desc div{position: absolute;top: 10px;right: -7px;}