Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

navbar: Use feathericon close icon. 

This uses the new close icon which we prefer over the one made available
from bootstrap. It also adds a reference to the icon in THIRDPARTY.
This commit is contained in:
YashRE42 2022-05-30 06:12:28 +05:30 committed by Tim Abbott
parent e3ad9c10bb
commit 4853a9a736
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/THIRDPARTY
View File

@ -118,6 +118,10 @@ Files: web/images/icons/search.svg
Copyright: 2015-present Ionic (http://ionic.io/) Copyright: 2015-present Ionic (http://ionic.io/)
License: Expat License: Expat
Files: web/images/icons/close.svg
Copyright: 2013-2017 Cole Bemis (https://feathericons.com)
License: Expat
Files: tools/check-thirdparty Files: tools/check-thirdparty
Copyright: 2020 Kandra Labs, Inc. Copyright: 2020 Kandra Labs, Inc.
License: GPL-2.0+ License: GPL-2.0+

8
web/styles/search.css
View File

@ -27,7 +27,11 @@
.search_close_button { .search_close_button {
display: inline; display: inline;
margin-right: 15px; margin-right: 5px;
}
.zulip-icon-close {
font-size: 15px;
} }
} }
@ -176,7 +180,7 @@
.navbar-search.expanded { .navbar-search.expanded {
.search_close_button { .search_close_button {
margin-right: 14px; margin-right: 5px;
} }
} }
} }

4
web/templates/navbar.hbs
View File

@ -24,7 +24,7 @@
autocomplete="off" aria-label="{{t 'Search' }}" title="{{t 'Search' }} (/)"> autocomplete="off" aria-label="{{t 'Search' }}" title="{{t 'Search' }} (/)">
</div> </div>
<button class="btn search_close_button" type="button" id="search_exit" aria-label="{{t 'Exit search' }}"> <button class="btn search_close_button" type="button" id="search_exit" aria-label="{{t 'Exit search' }}">
<i class="fa fa-remove" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-close" aria-hidden="true"></i>
</button> </button>
</div> </div>
</form> </form>
@ -36,7 +36,7 @@
<span class="search_icon search_open" ><i class="zulip-icon zulip-icon-search"></i></span> <span class="search_icon search_open" ><i class="zulip-icon zulip-icon-search"></i></span>
<input class="search-query input-block-level home-page-input" id="search_query" type="text" placeholder="{{t 'Search' }}" <input class="search-query input-block-level home-page-input" id="search_query" type="text" placeholder="{{t 'Search' }}"
autocomplete="off" aria-label="{{t 'Search' }}" title="{{t 'Search' }} (/)"/> autocomplete="off" aria-label="{{t 'Search' }}" title="{{t 'Search' }} (/)"/>
<button class="btn search_close_button" type="button" id="search_exit" aria-label="{{t 'Exit search' }}"><i class="fa fa-remove" aria-hidden="true"></i></button> <button class="btn search_close_button" type="button" id="search_exit" aria-label="{{t 'Exit search' }}"><i class="zulip-icon zulip-icon-close" aria-hidden="true"></i></button>
</div> </div>
</form> </form>
</div> </div>