diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index aa73e4488..15131e13b 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -105,7 +105,9 @@ " id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索" style="width: 300px" /> - + + + <% end %> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 22b6fa4f3..6b6d448cd 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -73,7 +73,9 @@ " id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的班级、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/> - + + + <% end %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index e3459ca5a..9f49cf6f2 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -55,7 +55,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .f_14{ font-size:14px;} .f16{font-size:16px;} .f18{font-size:18px;} -.f20{font-size:20px;} +.f20{font-size:20px!important;} .f22{font-size:22px!important;} .f26{font-size:26px;} .f28{font-size:28px;} @@ -114,7 +114,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .mw15{margin:0 15px;}.mr90 {margin-right:90px;}.mr95{margin-right: 95px;}.mr140 {margin-right: 140px;}.mw20{ margin: 0 20px;} .mw380 {max-width: 380px !important;}.mw400 {max-width: 400px !important;}.mw450 {max-width: 450px !important;}.mw550 {max-width: 550px !important;} .mt-20 {margin-top:-20px;}.mt-10 {margin-top:-10px;}.mt-4 {margin-top:-4px;}.mt-5 {margin-top:-5px;}.mt-2 {margin-top:-2px;}.mt0 {margin-top: 0px !important;} -.mt1{margin-top: 1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt4{ margin-top:4px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7 {margin-top:7px!important;} +.mt1{margin-top: 1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px!important;}.mt4{ margin-top:4px!important;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7 {margin-top:7px!important;} .mt8{ margin-top:8px !important;}.mt9{ margin-top:9px !important;}.mt10{ margin-top:10px !important;}.mt12 { margin-top:12px !important;}.mt14 {margin-top:14px;} .mt15 {margin-top:15px;}.mt16{ margin-top:16px !important;}.mt19 {margin-top:19px !important;}.mt20{margin-top: 20px;}.mt28 {margin-top:28px;}.mt30{ margin-top: 30px;} .mt35 {margin-top:35px;}.mt40{ margin-top: 40px;}.mt45{ margin-top: 45px;}.mt50{ margin-top:50px;}.mt60{ margin-top:60px;}.mt100{ margin-top:100px;}.mb0 {margin-bottom: 0px !important;}.mb4{ margin-bottom:4px;} diff --git a/public/stylesheets/css/iconfont/demo_index.html b/public/stylesheets/css/iconfont/demo_index.html index e58b0af2f..945d3dbb7 100644 --- a/public/stylesheets/css/iconfont/demo_index.html +++ b/public/stylesheets/css/iconfont/demo_index.html @@ -558,6 +558,12 @@
&#xe685;
+
  • + +
    搜索
    +
    &#xe6bf;
    +
  • +
  • 分支
    @@ -2174,6 +2180,15 @@
  • +
  • + +
    + 搜索 +
    +
    .icon-sousuo_bold +
    +
  • +
  • @@ -4068,6 +4083,14 @@
    #icon-itsm-liuchengguanli
  • +
  • + +
    搜索
    +
    #icon-sousuo_bold
    +
  • +