diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb index ab03c203..ddd8fcad 100644 --- a/app/views/competitions/_header.html.erb +++ b/app/views/competitions/_header.html.erb @@ -68,7 +68,7 @@ -
+
<% if User.current.logged? %> <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fr mt15 ml40" %>
-
+
<%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
- + 登录 注册 diff --git a/public/images/educoder/headNavLogo.png b/public/images/educoder/headNavLogo.png index 8df93d54..436d2349 100644 Binary files a/public/images/educoder/headNavLogo.png and b/public/images/educoder/headNavLogo.png differ diff --git a/public/images/educoder/headNavLogo1.png b/public/images/educoder/headNavLogo1.png new file mode 100644 index 00000000..8df93d54 Binary files /dev/null and b/public/images/educoder/headNavLogo1.png differ diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css index d80ab3cb..2e533586 100644 --- a/public/react/src/modules/tpm/TPMIndex.css +++ b/public/react/src/modules/tpm/TPMIndex.css @@ -17,6 +17,9 @@ body>.-task-title { /*Header START*/ .newHeader .logoimg { + margin-top: 16px; + float: left; + width: 97px; max-height: 60px; } .head-right i { diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 7b4d9814..823d4a49 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -1,7 +1,11 @@ /*--------------------------首页*/ /*头部导航条样式---2018-03-19--by-cs*/ .newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);} -.newHeader .logoimg{margin-top:12px;float: left;width: 36px} +.newHeader .logoimg{ + margin-top: 16px; + float: left; + width: 97px; +} .head-nav{float: left;width: 920px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;} .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;} .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}