Skip to content

Commit

Permalink
Merge pull request #620 from psankhe28/admin-pg
Browse files Browse the repository at this point in the history
Fixed the UI of admin page: Solved issue #621
  • Loading branch information
birm authored Mar 31, 2023
2 parents daea60b + 3730e7c commit 4b04ec5
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 6 deletions.
48 changes: 45 additions & 3 deletions apps/admin/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ iframe {
.sidebar .nav-link {
font-weight: 500;
color: #5c5c5c;
font-size: 15px;
margin-bottom:5px
}
.sidebar .nav-link.active {
font-weight: bold;
Expand Down Expand Up @@ -86,6 +88,9 @@ iframe {
font-size: 1rem;
background-color: rgba(0, 0, 0, 0.25);
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
height: 60px;
background-color: #007bff;

}

.navbar .navbar-toggler {
Expand All @@ -111,18 +116,55 @@ iframe {
}

.title-icon {
background-image: url("../../favicon.ico");
background-image: url("./favicon_without_bg.png");
background-repeat: no-repeat;
background-size: 3rem 3rem;
background-size: 4rem 3.8rem;
padding-bottom: 2px;
}

.title-txt {
font-weight: bold;
margin-left: 3rem;
font-size: 1.5rem;
padding-left: 12px;
}
.nav-link {
cursor: pointer;
}

.nav-link:hover{
background-color: #dfdfdf;
background-color: transparent;
border:2px solid #fff;
width: 100%;
opacity: 1;
padding: 10px;
border-radius: 5px;
font-weight: bold;
}

@media (max-width: 767.98px) {
.sidebar {
top: 2rem;
}
.sign{
text-align: center;
margin: auto;
padding: auto;
}
.nav-link:hover{
padding: 5px;
margin-top: 3px;
margin-bottom: 3px;
border:2px solid #fff;

}
}

.sign-text{
color: #fff !important;
font-weight: 500px;
}
.sign-text:hover{
color: #000 !important;
background-color: #fff
}
6 changes: 3 additions & 3 deletions apps/admin/admin.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<meta name="theme-color" content="#7952b3" />

<style></style>
<title>CaMicroScope Bashboard</title>
<title>caMicroScope Dashboard</title>
</head>
<body>
<header
Expand All @@ -63,9 +63,9 @@
<span class="navbar-toggler-icon"></span>
</button>
<!-- <input class="form-control form-control-primary w-100" type="text" placeholder="Search" aria-label="Search"> -->
<ul class="navbar-nav px-3">
<ul class="navbar-nav px-3 sign">
<li class="nav-item text-nowrap">
<a class="nav-link" href="#">Sign out</a>
<a class="nav-link sign-text" href="#">Sign out</a>
</li>
</ul>
</header>
Expand Down
Binary file added apps/admin/favicon_without_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4b04ec5

Please sign in to comment.