diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 57c816bf..f88931d3 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -18,7 +18,10 @@ <% end %> -
  • "><%= link_to "在线竞赛", competitions_path %>
  • +
  • "> + <%= link_to "在线竞赛", competitions_path %> + +
  • "><%= link_to "教学案例", libraries_path %>
  • "><%= link_to "交流问答", forums_path %>
  • <% if User.current.ec_school.present? %> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 1e5ed6f5..f6d5150a 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -19,7 +19,10 @@ <% end %> -
  • "><%= link_to "在线竞赛", competitions_path %>
  • +
  • "> + <%= link_to "在线竞赛", competitions_path %> + +
  • "><%= link_to "教学案例", libraries_path %>
  • "><%= link_to "交流问答", forums_path %>
  • diff --git a/app/views/users/_returnTop_btn.html.erb b/app/views/users/_returnTop_btn.html.erb index 621c9467..9bdc31d6 100644 --- a/app/views/users/_returnTop_btn.html.erb +++ b/app/views/users/_returnTop_btn.html.erb @@ -31,5 +31,8 @@
    - + + + +
    \ No newline at end of file diff --git a/public/images/educoder/roundedRectangle.png b/public/images/educoder/roundedRectangle.png new file mode 100755 index 00000000..0d2d0b0d Binary files /dev/null and b/public/images/educoder/roundedRectangle.png differ diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 4aa4aaa0..42dcaf78 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -301,7 +301,10 @@ class NewHeader extends Component { {/*
  • 教学案例
  • */} -
  • 在线竞赛
  • +
  • + 在线竞赛 + +
  • {project_packages_url===null||project_packages_url===undefined||project_packages_url===""?'':'众包'} diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js index 71e33695..a2172e48 100644 --- a/public/react/src/modules/tpm/SiderBar.js +++ b/public/react/src/modules/tpm/SiderBar.js @@ -52,7 +52,9 @@ class SiderBar extends Component {
    - + + +
    diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 05cea010..a716e275 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -1219,4 +1219,10 @@ html>body #ajax-indicator { position: fixed; } .marginuploading{ margin: 27px 42px; +} + +.roundedRectangles{ + position: absolute; + top: 10px; + right: -22px; } \ No newline at end of file