From ec53fc767897ed00c70c8684eddebe7562638668 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 1 Dec 2018 15:47:14 -0700 Subject: [PATCH] Merging jooolas ui_details branch, making a few fixes to navbar, and other styling. --- server/ui/.gitignore | 1 - server/ui/package.json | 8 +- server/ui/src/Main.css | 60 +- server/ui/src/components/navbar.tsx | 8 +- server/ui/src/components/search.tsx | 67 +- server/ui/src/env.ts | 2 +- server/ui/src/index.tsx | 2 +- server/ui/yarn.lock | 3190 +++++++++++++++++++++++++++ 8 files changed, 3277 insertions(+), 61 deletions(-) create mode 100644 server/ui/yarn.lock diff --git a/server/ui/.gitignore b/server/ui/.gitignore index 6617c27..07d46bc 100644 --- a/server/ui/.gitignore +++ b/server/ui/.gitignore @@ -25,6 +25,5 @@ node_modules *~ test/data/result.json -yarn.lock package-lock.json *.orig diff --git a/server/ui/package.json b/server/ui/package.json index 9ecdff2..4d5ded9 100644 --- a/server/ui/package.json +++ b/server/ui/package.json @@ -8,8 +8,12 @@ "build": "node fuse prod" }, "keywords": [], - "author": "Dominic Gannaway", - "license": "MIT", + "author": "Dessalines", + "license": "GPL-2.0-or-later", + "engines": { + "node": ">=8.9.0" + }, + "engineStrict": true, "dependencies": { "classcat": "^1.1.3", "inferno": "^6.3.1", diff --git a/server/ui/src/Main.css b/server/ui/src/Main.css index ca460f1..85653a9 100644 --- a/server/ui/src/Main.css +++ b/server/ui/src/Main.css @@ -1,37 +1,59 @@ -html, -body { - /* assumes we won't target screens with a width smaller than 320px */ - min-width: 320px; +/* globally disable dotted outlines on anchors */ +a:focus { + outline: none; } -/* globally disable dotted outlines on anchors */ -a:focus { outline: none; } -a::-moz-focus-inner { border: 0; } +a::-moz-focus-inner { + border: 0; +} -.search-name-col { width: 50%; } -.search-name-cell { word-wrap: break-word; } +.search-name-col { + width: 50%; +} -.table-fixed { table-layout: fixed; } +.search-name-cell { + word-wrap: break-word; +} + +.table-fixed { + table-layout: fixed; +} /* add padding to first and last cell */ -.table-padding th:first-child, -.table-padding td:first-child { padding-left: 1em !important; } -.table-padding th:last-child, -.table-padding td:last-child { padding-right: 1em !important; } +.table-padding th:first-child, .table-padding td:first-child { + padding-left: 1em !important; +} + +.table-padding th:last-child, .table-padding td:last-child { + padding-right: 1em !important; +} + +.table thead th { + border: 0px; +} + +.table tr td { + vertical-align: middle !important; +} /* Colors */ -.navbar-purple { background-color: #673ab7; } -.table-hover-purple tbody tr:hover { background-color: rgba(103, 58, 183, 0.2) !important; } +.navbar-purple { + background-color: #673ab7; +} + +.table-hover-purple tbody tr:hover { + background-color: rgba(103, 58, 183, 0.2) !important; +} + +/* Bootstrap fixes */ -/* Boostrap fixes */ .rounded-right { /* disable radius on left when using on right side */ border-top-left-radius: 0; border-bottom-left-radius: 0; } -.no-outline, -.no-outline:focus { +.no-outline, .no-outline:focus { /* disable colored outline on btn or input */ box-shadow: none !important; outline: none !important; diff --git a/server/ui/src/components/navbar.tsx b/server/ui/src/components/navbar.tsx index 6f55bd0..6b9e0e0 100644 --- a/server/ui/src/components/navbar.tsx +++ b/server/ui/src/components/navbar.tsx @@ -29,9 +29,9 @@ export class Navbar extends Component { navbar() { return ( -