-
Notifications
You must be signed in to change notification settings - Fork 309
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #480 from camicroscope/develop
For 3.8.4
- Loading branch information
Showing
27 changed files
with
1,820 additions
and
232 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,5 +21,6 @@ module.exports = { | |
| "no-var" : 0, | ||
| "new-cap" : 0, | ||
| "prefer-const":0, | ||
| "linebreak-style": 0, | ||
| }, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| body { | ||
| font-size: 0.875rem; | ||
| } | ||
|
|
||
| .feather { | ||
| width: 16px; | ||
| height: 16px; | ||
| vertical-align: text-bottom; | ||
| } | ||
|
|
||
| /* | ||
| * Sidebar | ||
| */ | ||
|
|
||
| .sidebar { | ||
| position: fixed; | ||
| top: 0; | ||
| bottom: 0; | ||
| left: 0; | ||
| z-index: 100; /* Behind the navbar */ | ||
| padding: 48px 0 0; /* Height of navbar */ | ||
| box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1); | ||
| } | ||
|
|
||
| @media (max-width: 767.98px) { | ||
| .sidebar { | ||
| top: 2rem; | ||
| } | ||
| } | ||
|
|
||
| .sidebar-sticky { | ||
| position: relative; | ||
| top: 0; | ||
| height: calc(100vh - 48px); | ||
| padding-top: 0.5rem; | ||
| overflow-x: hidden; | ||
| overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ | ||
| } | ||
|
|
||
| iframe { | ||
| position: absolute; | ||
| top: 0; | ||
| left: 0; | ||
| bottom: 0; | ||
| right: 0; | ||
| width: 100%; | ||
| height: 100%; | ||
| } | ||
| .sidebar .nav-link { | ||
| font-weight: 500; | ||
| color: #5c5c5c; | ||
| } | ||
| .sidebar .nav-link.active { | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| #sidebarMenu.sidebar .nav-link div.title { | ||
| margin: 0 0.5rem; | ||
| } | ||
| .sidebar .nav-link .feather { | ||
| margin-right: 4px; | ||
| color: #727272; | ||
| } | ||
|
|
||
| .sidebar .nav-link.active { | ||
| color: #007bff; | ||
| } | ||
|
|
||
| .sidebar .nav-link:hover .feather, | ||
| .sidebar .nav-link.active .feather { | ||
| color: inherit; | ||
| } | ||
|
|
||
| .sidebar-heading { | ||
| font-size: 0.75rem; | ||
| text-transform: uppercase; | ||
| } | ||
|
|
||
| /* | ||
| * Navbar | ||
| */ | ||
|
|
||
| .navbar-brand { | ||
| padding-top: 0.75rem; | ||
| padding-bottom: 0.75rem; | ||
| font-size: 1rem; | ||
| background-color: rgba(0, 0, 0, 0.25); | ||
| box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25); | ||
| } | ||
|
|
||
| .navbar .navbar-toggler { | ||
| top: 0.25rem; | ||
| right: 1rem; | ||
| } | ||
|
|
||
| .navbar .form-control { | ||
| padding: 0.75rem 1rem; | ||
| border-width: 0; | ||
| border-radius: 0; | ||
| } | ||
|
|
||
| .form-control-dark { | ||
| color: #fff; | ||
| background-color: rgba(255, 255, 255, 0.1); | ||
| border-color: rgba(255, 255, 255, 0.1); | ||
| } | ||
|
|
||
| .form-control-dark:focus { | ||
| border-color: transparent; | ||
| box-shadow: 0 0 0 3px rgba(255, 255, 255, 0.25); | ||
| } | ||
|
|
||
| .title-icon { | ||
| background-image: url("../../favicon.ico"); | ||
| background-repeat: no-repeat; | ||
| background-size: 3rem 3rem; | ||
| } | ||
|
|
||
| .title-txt { | ||
| font-weight: bold; | ||
| margin-left: 3rem; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <meta author="JasoxNaN" /> | ||
| <!-- css files --> | ||
| <link rel="stylesheet" href="../common.css"/> | ||
| <link | ||
| rel="stylesheet" | ||
| href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" | ||
| /> | ||
|
|
||
| <link | ||
| rel="stylesheet" | ||
| href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" | ||
| integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" | ||
| crossorigin="anonymous" | ||
| /> | ||
|
|
||
| <link href="./admin.css" rel="stylesheet" /> | ||
| <link | ||
| rel="stylesheet" | ||
| href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" | ||
| /> | ||
|
|
||
| <script src="../../common/authChecker.js"></script> | ||
| <script> | ||
| __auth_check(2); | ||
| </script> | ||
| <!-- camic --> | ||
| <script src="../../core/Store.js"></script> | ||
| <script src="../../common/util.js"></script> | ||
| <script src="../../common/ajv.js"></script> | ||
| <script src="../../components/loading/loading.js"></script> | ||
|
|
||
| <meta name="theme-color" content="#7952b3" /> | ||
|
|
||
| <style></style> | ||
| <title>CaMicroScope Bashboard</title> | ||
| </head> | ||
| <body> | ||
| <header id="nav-bar" | ||
| class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow" | ||
| > | ||
| <a | ||
| class="navbar-brand col-md-3 col-lg-2 me-0 px-3 title-icon" | ||
| style="margin-right: 0" | ||
| href="#" | ||
| > | ||
| <div class="title-txt">CaMicroscope</div> | ||
| </a> | ||
| <button | ||
| class="navbar-toggler position-absolute d-md-none collapsed" | ||
| type="button" | ||
| data-toggle="collapse" | ||
| data-target="#sidebarMenu" | ||
| aria-controls="sidebarMenu" | ||
| aria-expanded="false" | ||
| aria-label="Toggle navigation" | ||
| > | ||
| <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"> | ||
| <li class="nav-item text-nowrap"> | ||
| <a class="nav-link" href="#">Sign out</a> | ||
| </li> | ||
| </ul> | ||
| </header> | ||
|
|
||
| <div class="container-fluid"> | ||
| <div class="row"> | ||
| <nav | ||
| id="sidebarMenu" | ||
| class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse" | ||
| style="" | ||
| > | ||
| <div class="position-sticky pt-3"> | ||
| <ul class="nav flex-column"> | ||
| <li class="nav-item"> | ||
| <div | ||
| class="nav-link active d-flex align-items-center" | ||
| aria-current="page" | ||
| > | ||
| <i class="fa fa-archive"></i> | ||
| <div class="title">Collection</div> | ||
| </div> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <div | ||
| class="nav-link d-flex align-items-center" | ||
| aria-current="page" | ||
| > | ||
| <i class="fas fa-tag"></i> | ||
| <div class="title">Preset Label</div> | ||
| </div> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <div | ||
| class="nav-link d-flex align-items-center" | ||
| aria-current="page" | ||
| > | ||
| <i class="fas fa-user"></i> | ||
| <div class="title">User</div> | ||
| </div> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </nav> | ||
| <main id="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4"> | ||
| <iframe src="../collection/collection.html" frameborder="0" ></iframe> | ||
| </main> | ||
| </div> | ||
| </div> | ||
| <!-- bootstrap --> | ||
| <script | ||
| src="https://code.jquery.com/jquery-3.5.1.slim.min.js" | ||
| integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" | ||
| crossorigin="anonymous" | ||
| ></script> | ||
| <script | ||
| src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" | ||
| integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" | ||
| crossorigin="anonymous" | ||
| ></script> | ||
| <script | ||
| src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.min.js" | ||
| integrity="sha384-w1Q4orYjBQndcko6MimVbzY0tgp4pWB4lZ7lr30WKz0vr/aWKhXdBNmNb5D92v7s" | ||
| crossorigin="anonymous" | ||
| ></script> | ||
| <script src="./admin.js"></script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| function calculateMainHeight() { | ||
| const height = $(window).height() - $('#nav-bar').height(); | ||
| $('#main').height(height); | ||
| } | ||
| calculateMainHeight(); | ||
| $(window).resize(function () { | ||
| calculateMainHeight(); | ||
| }); |
Oops, something went wrong.