Merge pull request #41 from HojouFotytu/develop

global setting always visible
This commit is contained in:
HojouFotytu 2019-01-16 03:30:03 +09:00 committed by GitHub
commit 99456669cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions

View File

@ -39,11 +39,18 @@
</span>
</div>
<!-- End Logo container-->
<div class="menu-extras topbar-custom">
<ul class="list-inline float-left mb-0">
<br>&nbsp;&nbsp;&nbsp;&nbsp;
<span class="card-box card-box-mini card-box-ptmagic-outlined" data-toggle="tooltip" data-placement="bottom" title="Active global setting">
<b>GS:</b> @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName)
</span>
</ul>
</div>
<div class="menu-extras topbar-custom">
<ul class="list-inline float-right mb-0">
<li class="menu-item list-inline-item">
<!-- Mobile menu toggle-->
<a class="navbar-toggle nav-link">
@ -57,7 +64,6 @@
</li>
<li id="ticker-widgets" class="list-inline-item ticker-widgets"></li>
</ul>
</div>
<!-- end menu-extras -->

View File

@ -39,10 +39,6 @@
<b>TV:</b> @currentBalanceString @Model.Summary.MainMarket
</div>
<div class="card-box card-box-mini card-box-ptmagic-outlined" data-toggle="tooltip" data-placement="bottom" title="Active global setting">
<b>GS:</b> @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName)
</div>
<div class="card-box card-box-mini card-box-ptmagic-outlined" data-toggle="tooltip" data-placement="bottom" title="Active single market settings">
<b>SMS:</b> <a href="ManageSMS">@Html.Raw(singleSettingInfoIcon)</a> @activeSingleSettings
</div>