Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize navbar style #4073

Merged
merged 1 commit into from
Oct 31, 2021
Merged

optimize navbar style #4073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Apollo 2.0.0
* [Bump version to 2.0.0 and drop java 1.7 support](https://github.com/apolloconfig/apollo/pull/4015)
* [Optimize home page style](https://github.com/apolloconfig/apollo/pull/4052)
* [Support Java 17](https://github.com/apolloconfig/apollo/pull/4060)
* [Optimize top navbar style](https://github.com/apolloconfig/apollo/pull/4073)

------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
16 changes: 16 additions & 0 deletions apollo-portal/src/main/resources/static/styles/common-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,10 @@ table th {
font-size: 14px;
}

#app-search-list {
width: 375px;
}

/*backTop component style*/
.back-top {
position: fixed;
Expand All @@ -1125,3 +1129,15 @@ table th {
.back-top:active {
opacity: .6;
}

.navbar-nav .nav-switch-lang {
width: 12px;
height: 12px;
margin-top: -4px;
margin-right: -5px;
}

.navbar-header .logo {
height: 35px;
margin-top: -4px
}
7 changes: 4 additions & 3 deletions apollo-portal/src/main/resources/static/views/common/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
ng-show="viewMode == 2 && showSideBar"
ng-click="showSideBar = !showSideBar">
<a class="navbar-brand logo" href="{{ '/' | prefixPath }}">
<img src="{{ '/img/logo-simple.png' | prefixPath }}" style="height:45px; margin-top: -13px">
<img class="logo" src="{{ '/img/logo-simple.png' | prefixPath }}">
</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<div class="collapse navbar-collapse">

<ul class="nav navbar-nav navbar-right">
<li>
Expand All @@ -43,6 +43,7 @@
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<img class="nav-switch-lang" style="" src="{{ '/img/language.png' | prefixPath }}">
<span class="glyphicon .glyphicon-glyphicon-font"></span>&nbsp;Language<span class="caret"></span></a>

<ul class="dropdown-menu">
Expand Down Expand Up @@ -90,7 +91,7 @@

<div class="navbar-form navbar-right form-inline" role="search">
<div class="form-group app-search-list">
<select id="app-search-list" style="width: 350px"></select>
<select id="app-search-list"></select>
</div>
</div>
</div>
Expand Down