From eacd3be6c62b93a069ac3ec072bd7d0e97db195d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 27 Jul 2019 16:10:14 +0800 Subject: [PATCH 1/2] Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder # Conflicts: # public/update.html --- public/images/educoder/headNavLogo.png | Bin 8980 -> 2816 bytes public/images/educoder/headNavLogo1.png | Bin 0 -> 8980 bytes public/react/src/modules/tpm/TPMIndex.css | 3 +++ public/stylesheets/educoder/edu-all.css | 6 +++++- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 public/images/educoder/headNavLogo1.png diff --git a/public/images/educoder/headNavLogo.png b/public/images/educoder/headNavLogo.png index 8df93d54db625930fb046fe95bf1a54fc5d8c613..436d23490404beedcf7cd776bbf8ed0282794ca4 100644 GIT binary patch literal 2816 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 SnFiSa0000PAbw}GyN9ouz~0;U0{kAXY64aW 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 kbMJ>xVB9eMsT7d{xq`|2G8@.-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} From 8604c1d9c68332785e2813ab6966cef1a97cd7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 27 Jul 2019 16:21:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/competitions/_header.html.erb | 2 +- app/views/layouts/_logined_header.html.erb | 2 +- app/views/layouts/_unlogin_header.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb index f26eb6ab..6111769a 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" %>
    diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 35e39ac6..5089fb28 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -50,7 +50,7 @@
-
+
<%= 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" %>
    <%= User.current.show_name %> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 11aabde9..17b5ea12 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -50,7 +50,7 @@
- + 登录 注册