wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 52e09ea8bc7c4d7dc2182df6e27625add8f0ccd0
Former-commit-id: 42c3721f07306f426fb08d7af2f453dbfbd5f6d1
1.0
wanggang 5 years ago
parent 98c14989b3
commit 850f5b4f43
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
projects/Infrastructure/Views/Shared/_Layout.cshtml
Unescape View File

@ -33,7 +33,7 @@
<body class="hold-transition sidebar-mini layout-fixed">
<div id="app">
<div class="wrapper">
<nav class="main-header navbar navbar-expand navbar-white navbar-light">
<nav class="main-header navbar navbar-expand navbar-dark navbar-gray-dark">
@await Html.PartialAsync("_TopMenu")
<ul class="navbar-nav ml-auto">
@if (User.Identity.IsAuthenticated)
@ -59,7 +59,7 @@
</nav>
<aside class="main-sidebar sidebar-dark-primary elevation-4">
<a class="brand-link" href="@Url.Action("Index","Home",new { area=""})">
<img class="brand-image img-circle" src="@Url.Content2(logo)" style="height:100%;" />
<img class="logo" src="@Url.Content2(logo)" />
<span class="brand-text font-weight-light">@name</span>
</a>
<div class="sidebar">

17
projects/IoT.Shared/wwwroot/css/site.css
Unescape View File

@ -1,17 +1,18 @@
.main-header.navbar {
background-color: #343a40;
img.logo {
float: left;
margin-left: .8rem;
margin-right: .5rem;
max-height: 33px;
width: auto;
object-fit: contain;
}
.navbar-nav .nav-link {
.navbar-nav .nav-link.active {
color: #fff !important;
background-color: #007bff;
border-radius: 4px;
}
.navbar-nav .nav-link.active {
color: #fff !important;
background-color: #007bff;
}
.nav-treeview .nav-item {
padding-left: 2em;
}

6
projects/Platform/Views/Shared/_Layout.cshtml
Unescape View File

@ -36,7 +36,7 @@
<body class="hold-transition sidebar-mini layout-fixed">
<div id="app">
<div class="wrapper">
<nav class="main-header navbar navbar-expand navbar-white navbar-light">
<nav class="main-header navbar navbar-expand navbar-dark navbar-gray-dark">
@await Html.PartialAsync("_TopMenu")
<ul class="navbar-nav ml-auto">
@if (User.Identity.IsAuthenticated)
@ -70,7 +70,7 @@
var organs = organUserRepo.ReadOnlyTable().Where(o => o.User.UserName == userName).Select(o => new { o.Organ.Number, o.Organ.Name, o.Organ.Image });
var organImage = organs.FirstOrDefault(o => o.Number == organNumber)?.Image ?? logo;
var list = new SelectList(organs, "Number", "Name", organNumber);
<img class="brand-image img-circle" src="@Url.Content2(organImage)" style="display:inline-box;margin-top:0;height:32px;" />
<img class="logo" src="@Url.Content2(organImage)" />
<span class="brand-text font-weight-light">
<form method="get" action="@Url.Action("ChangeOrgan","Account",new{area=""})">
<input type="hidden" name="ReturnUrl" value="@ViewContext.HttpContext.Request.GetDisplayUrl()" />
@ -80,7 +80,7 @@
}
else
{
<img class="brand-image img-circle" src="@Url.Content2(logo)" style="display:inline-box;margin-top:0;height:32px;" />
<img class="logo" src="@Url.Content2(logo)" />
<span class="brand-text font-weight-light">@name</span>
}

5
projects/projects.sln
Unescape View File

@ -40,6 +40,7 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|iPhone.Build.0 = Debug|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -51,6 +52,7 @@ Global
{264A3E6B-80A1-488D-841D-930B810B85D2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{264A3E6B-80A1-488D-841D-930B810B85D2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|iPhone.Build.0 = Debug|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -62,6 +64,7 @@ Global
{216F0A25-9F20-4235-9316-632AB94E854A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{216F0A25-9F20-4235-9316-632AB94E854A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|iPhone.Build.0 = Debug|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -73,6 +76,7 @@ Global
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|iPhone.Build.0 = Debug|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@ -106,6 +110,7 @@ Global
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6F839910-580D-4CD1-A0C0-6FAF542B4480}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|iPhone.Build.0 = Debug|Any CPU
{60596088-3C4E-4EA2-933A-B66CD269845B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU

Write Preview
Loading…
Cancel
Save