From e172d00b751d55cd8630efc7c5530a8bbfb97c97 Mon Sep 17 00:00:00 2001 From: Sawyer Bergeron Date: Fri, 15 Oct 2021 14:07:11 -0400 Subject: Pull master (fake rebase) Signed-off-by: Sawyer Bergeron Change-Id: I12450c4bd70050c0bbf555b140aa3243c2837a9a --- src/static/css/anuket.css | 115 +++++++++++++++++++++ src/static/css/lfedge.css | 14 +++ src/static/img/Anuket-logo-reverse.png | Bin 0 -> 8612 bytes src/static/img/Anuket-logo.svg | 1 + src/static/img/opnfv-logo.png | Bin 2829 -> 0 bytes src/static/package-lock.json | 91 +--------------- src/templates/base/base.html | 55 +++++----- src/templates/base/booking/booking_table.html | 4 +- src/templates/base/booking/quick_deploy.html | 2 +- src/templates/base/dashboard/landing.html | 21 ++-- src/templates/base/dashboard/resource_detail.html | 34 +++--- .../base/dashboard/searchable_select_multiple.html | 2 +- src/templates/base/dashboard/server_table.html | 2 +- src/templates/base/dashboard/table.html | 2 +- src/templates/base/layout.html | 2 +- src/templates/laas/base.html | 11 +- src/templates/laas/dashboard/landing.html | 4 +- src/templates/lfedge/base.html | 18 +--- 18 files changed, 203 insertions(+), 175 deletions(-) create mode 100644 src/static/css/anuket.css create mode 100644 src/static/css/lfedge.css create mode 100644 src/static/img/Anuket-logo-reverse.png create mode 100644 src/static/img/Anuket-logo.svg delete mode 100644 src/static/img/opnfv-logo.png diff --git a/src/static/css/anuket.css b/src/static/css/anuket.css new file mode 100644 index 0000000..6bbdb3f --- /dev/null +++ b/src/static/css/anuket.css @@ -0,0 +1,115 @@ +nav ,body{ + background-color:#fff !important; + color:#343a40 !important; + } + + header{ + background-color:#f8f9fa !important; + color:#343a40 !important; + } + + p, h1, h2, h3, h4, h5{ + color:#343a40 !important; + } + + a, .page-link { + color: #007473 !important; + } + + .page-item.active .page-link{ + color: #f8f9fa !important; + background-color: #007473 !important; + } + + .topcrumb.active > span { + background: #007473 !important; + } + + .nav-bg{ + background-color:#fff !important; + color:#343a40 !important; + } + + .nav-bg:hover{ + background-color:#f8f9fa !important; + transition-duration:0.2s; + } + + .dropDown-bg{ + background-color:#d6d8db !important; + color:#343a40 !important; + } + + .btn-primary{ + color: #f8f9fa !important; + background-color: #007473 !important; + border:0px !important; + transition-duration:0.2s !important; + } + + .btn-primary:hover{ + color: #343a40 !important; + background-color: #6BDAD5 !important; + border:0px !important; + } + + .btn-primary:focus{ + color: #343a40 !important; + background-color: #6BDAD5 !important; + border:0px !important; + } + + .btn-success{ + color: #f8f9fa; + background-color: #008852; + border:0px !important; + } + + .btn-success:hover{ + color: #343a40; + background-color: #00CE7C; + border:0px !important; + } + + .btn-success:focus{ + color: #343a40; + background-color: #00CE7C; + border:0px !important; + } + + .btn-danger { + color: #f8f9fa; + background-color: #af2b38; + border:0px !important; + } + + .btn-danger:hover { + color: #f8f9fa; + background-color: #dc3545; + border:0px !important; + } + + .alert-danger{ + background-color: #e6b3c1 !important; + color:#820c2c !important; + border:0px !important; + } + + .Anuket-Text{ + color:#343a40 !important; + } + + .selected_node { + border-color: #008852; + box-shadow: 0 1px 1px rgb(0 0 0 / 8%), 0 0 8px rgb(109 243 76 / 60%); + transition: border-color ease-in-out .1s,box-shadow ease-in-out .1s; + } + + ::selection { + background: #BCE194; + color:#343a40; + } + ::-moz-selection { + background: #BCE194; + color:#343a40; + } \ No newline at end of file diff --git a/src/static/css/lfedge.css b/src/static/css/lfedge.css new file mode 100644 index 0000000..328d71a --- /dev/null +++ b/src/static/css/lfedge.css @@ -0,0 +1,14 @@ +.LFEdge { + background: #0049b0; + margin-left: -25px; +} + +.wtext { + font-size: 18px; + color: #FFFFFF; +} + +.wtext:hover { + color: #FFFFFF; + text-decoration: none; +} \ No newline at end of file diff --git a/src/static/img/Anuket-logo-reverse.png b/src/static/img/Anuket-logo-reverse.png new file mode 100644 index 0000000..fe256a6 Binary files /dev/null and b/src/static/img/Anuket-logo-reverse.png differ diff --git a/src/static/img/Anuket-logo.svg b/src/static/img/Anuket-logo.svg new file mode 100644 index 0000000..6db4c9b --- /dev/null +++ b/src/static/img/Anuket-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/static/img/opnfv-logo.png b/src/static/img/opnfv-logo.png deleted file mode 100644 index 1519503..0000000 Binary files a/src/static/img/opnfv-logo.png and /dev/null differ diff --git a/src/static/package-lock.json b/src/static/package-lock.json index 89a26db..f8eabe4 100644 --- a/src/static/package-lock.json +++ b/src/static/package-lock.json @@ -1,97 +1,8 @@ { "name": "laas", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "laas", - "version": "1.0.0", - "license": "Apache-2.0", - "dependencies": { - "@fortawesome/fontawesome-free": "^5.12.0", - "bootstrap": "^4.4.1", - "datatables.net-bs4": "^1.10.20", - "datatables.net-responsive-bs4": "^2.2.3", - "jquery": "^3.4.1", - "mxgraph": "^4.0.6", - "plotly.js-dist": "^1.51.3", - "popper.js": "^1.16.0" - } - }, - "node_modules/@fortawesome/fontawesome-free": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz", - "integrity": "sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ==", - "engines": { - "node": ">=6" - } - }, - "node_modules/bootstrap": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", - "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/datatables.net": { - "version": "1.10.20", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.20.tgz", - "integrity": "sha512-4E4S7tTU607N3h0fZPkGmAtr9mwy462u+VJ6gxYZ8MxcRIjZqHy3Dv1GNry7i3zQCktTdWbULVKBbkAJkuHEnQ==", - "dependencies": { - "jquery": "3.4.1" - } - }, - "node_modules/datatables.net-bs4": { - "version": "1.10.20", - "resolved": "https://registry.npmjs.org/datatables.net-bs4/-/datatables.net-bs4-1.10.20.tgz", - "integrity": "sha512-kQmMUMsHMOlAW96ztdoFqjSbLnlGZQ63iIM82kHbmldsfYdzuyhbb4hTx6YNBi481WCO3iPSvI6YodNec46ZAw==", - "dependencies": { - "datatables.net": "1.10.20", - "jquery": "3.4.1" - } - }, - "node_modules/datatables.net-responsive": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/datatables.net-responsive/-/datatables.net-responsive-2.2.3.tgz", - "integrity": "sha512-8D6VtZcyuH3FG0Hn5A4LPZQEOX3+HrRFM7HjpmsQc/nQDBbdeBLkJX4Sh/o1nzFTSneuT1Wh/lYZHVPpjcN+Sw==", - "dependencies": { - "datatables.net": "1.10.20", - "jquery": "3.4.1" - } - }, - "node_modules/datatables.net-responsive-bs4": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.2.3.tgz", - "integrity": "sha512-SQaWI0uLuPcaiBBin9zX+MuQfTSIkK1bYxbXqUV6NLkHCVa6PMQK7Rvftj0ywG4R7uOtjbzY8nSVqxEKvQI0Vg==", - "dependencies": { - "datatables.net-bs4": "1.10.20", - "datatables.net-responsive": "2.2.3", - "jquery": "3.4.1" - } - }, - "node_modules/jquery": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", - "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" - }, - "node_modules/mxgraph": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/mxgraph/-/mxgraph-4.0.6.tgz", - "integrity": "sha512-5XZXeAkA4k6n4BS05Fxd2cNhMw+3dnlRqAaLtsuXdT0g8BvvEa1VT4jjuGtUW4QTt38Q+I2Dr/3EWiAaGRfAXw==" - }, - "node_modules/plotly.js-dist": { - "version": "1.51.3", - "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.51.3.tgz", - "integrity": "sha512-Bxz0XBg963gpnbt7FVPEhYvT33JsaKa0hEozXBnQZkiKtsiM2M1lZN6tkEHmq6o1N2K6qJXFtdzCXbZ/hLGV0Q==" - }, - "node_modules/popper.js": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz", - "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==" - } - }, "dependencies": { "@fortawesome/fontawesome-free": { "version": "5.12.0", diff --git a/src/templates/base/base.html b/src/templates/base/base.html index f334a63..704bc3b 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -20,7 +20,7 @@ {% block logo %}

Logo Here

- + Laas Dashboard
@@ -37,7 +37,7 @@