From d2c5842a9bc937d1a7f5dc72cfa3a3796fca8ce6 Mon Sep 17 00:00:00 2001 From: Benjamin Kane Date: Mon, 14 Jun 2021 17:09:44 -0600 Subject: [PATCH 01/16] start release notes --- app/package.json | 2 +- docs/source/release-notes.rst | 31 +++++++++++++++++++++++++++++++ package/desktop/setup.py | 2 +- setup.py | 4 ++-- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/app/package.json b/app/package.json index a5d584c335..a8d72b6b65 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "fiftyone", "productName": "FiftyOne", - "version": "0.13.1", + "version": "0.14.0", "license": "Apache-2.0", "description": "FiftyOne by Voxel51", "main": "./dist/main.js", diff --git a/docs/source/release-notes.rst b/docs/source/release-notes.rst index 0da6e0facf..1820f3789f 100644 --- a/docs/source/release-notes.rst +++ b/docs/source/release-notes.rst @@ -3,6 +3,37 @@ FiftyOne Release Notes .. default-role:: code +.. _release-notes-v0.10.0: + +FiftyOne 0.10.0 +-------------- +*Released June 15, 2021* + +App +^^^ +- Fixed `Color by value` in the grid and expanded sample view +- Fixed loading datasets and views that contain vector or array data, + e.g. logits +- Fixed loading video datasets in Colab +- Fixed opening the web App on some Windows machines by ensuring the correct + MIME type is set for JavaScript files + +Core +^^^^ + +Utils +^^^^^ +- Fixed :meth:`import_from_labelbox() ` + to use the correct label ID, specifically the "DataRow ID" + +Zoo +^^^ +- Fixed an encoding issue when loading the + :ref:`Open Images V6 ` dataset on some Windows + machinesa + + + .. _release-notes-v0.9.0: FiftyOne 0.9.0 diff --git a/package/desktop/setup.py b/package/desktop/setup.py index 0a1f9ea2c1..28cd287dfa 100644 --- a/package/desktop/setup.py +++ b/package/desktop/setup.py @@ -17,7 +17,7 @@ import shutil -VERSION = "0.13.1" +VERSION = "0.14.0" def get_version(): diff --git a/setup.py b/setup.py index 9a02b2ba37..34d4a06766 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def finalize_options(self): ] -VERSION = "0.9.3" +VERSION = "0.10.0" def get_version(): @@ -38,7 +38,7 @@ def get_version(): return VERSION -EXTRAS_REQUIREMENTS = {"desktop": ["fiftyone-desktop>=0.13.1,<0.14.0"]} +EXTRAS_REQUIREMENTS = {"desktop": ["fiftyone-desktop>=0.14.0,<0.15.0"]} with open("README.md", "r") as fh: From bb7c01e05fc372e31ae24cb7a0cca0320ac717f6 Mon Sep 17 00:00:00 2001 From: Benjamin Kane Date: Mon, 14 Jun 2021 21:52:45 -0600 Subject: [PATCH 02/16] update app form --- app/src/components/Header.tsx | 167 ++++++++++++++++------------------ app/src/recoil/atoms.ts | 12 +-- app/src/recoil/selectors.ts | 24 ++--- 3 files changed, 96 insertions(+), 107 deletions(-) diff --git a/app/src/components/Header.tsx b/app/src/components/Header.tsx index f683e8504d..3135df307c 100644 --- a/app/src/components/Header.tsx +++ b/app/src/components/Header.tsx @@ -14,7 +14,7 @@ import { useMachine } from "@xstate/react"; import uuid from "uuid-v4"; import { animated, useSpring } from "react-spring"; import { ThemeContext } from "styled-components"; -import { Close } from "@material-ui/icons"; +import { Close, Group } from "@material-ui/icons"; import { GitHub, MenuBook } from "@material-ui/icons"; import { BestMatchDiv } from "./ViewBar/ViewStage/BestMatch"; @@ -335,20 +335,21 @@ const Input = styled.input` } `; -const TshirtForm = () => { +const TeamsForm = () => { const [formState, setFormState] = useState({ email: "", + firstname: "", + lastname: "", + company: "", + role: "", discover: "", - helping: "", - improve: "", - tshirt: false, }); const [submitText, setSubmitText] = useState("Submit"); - const [submitted, setSubmitted] = useRecoilState(atoms.feedbackSubmitted); + const [submitted, setSubmitted] = useRecoilState(atoms.teamsSubmitted); const portalId = 4972700; - const formId = "b56682f6-c297-4cea-95c4-9e05a00528af"; + const formId = "87aa5367-a8f1-4ed4-9e23-1fdf8448d807"; const postUrl = `https://api.hsforms.com/submissions/v3/integration/submit/${portalId}/${formId}`; - const closeFeedback = useRecoilValue(atoms.closeFeedback); + const closeTeams = useRecoilValue(atoms.closeTeams); const theme = useTheme(); const setFormValue = (name) => (e) => @@ -359,9 +360,8 @@ const TshirtForm = () => { const disabled = !( formState.email?.length && - formState.helping?.length && - formState.improve?.length && - formState.discover?.length + formState.firstname?.length && + formState.lastname?.length ) || submitted.submitted; const submit = () => { if (disabled) { @@ -373,8 +373,8 @@ const TshirtForm = () => { const finalize = () => { setSubmitText("Submitted. Thank you!"); setSubmitted({ ...submitted, submitted: true }); - fetch(`${http}/feedback?submitted=true`, { method: "post" }); - setTimeout(() => closeFeedback && closeFeedback.close(), 2000); + fetch(`${http}/teams?submitted=true`, { method: "post" }); + setTimeout(() => closeTeams && closeTeams.close(), 2000); }; fetch(postUrl, { @@ -385,28 +385,28 @@ const TshirtForm = () => { submittedAt: Date.now(), fields: [ { - name: "email", - value: formState.email, + name: "firstname", + value: formState.firstname, }, { - name: "is_fiftyone_helping_your_work_how_so_", - value: formState.helping, + name: "lastname", + value: formState.lastname, }, { - name: "how_could_we_improve_fiftyone_", - value: formState.improve, + name: "email", + value: formState.email, }, { - name: "app_how_did_you_hear_about_us", - value: formState.discover, + name: "company", + value: formState.company, }, { - name: "zoom_call_and_t_shirt", - value: formState.tshirt, + name: "role", + value: formState.role, }, { - name: "app_context", - value: appContext, + name: "app_how_did_you_hear_about_us", + value: formState.discover, }, ], context: { pageName: "FiftyOne App" }, @@ -427,6 +427,20 @@ const TshirtForm = () => { }; return ( <> + + { onChange={setFormValue("email")} /> -
- - setFormState({ ...formState, tshirt: !formState.tshirt }) - } - style={{ - color: theme.brand, - paddingLeft: 0, - paddingTop: 0, - }} - /> -

- I'm open to a Zoom call and a free t-shirt! -

-
- ) : showFeedbackButton === "minimized" ? ( - + ) : showTeamsButton === "minimized" ? ( + ) : null; }; @@ -684,7 +673,7 @@ const Header = ({ addNotification }) => { - + ({ default: 1, }); -export const appFeedbackIsOpen = atom({ - key: "appFeedbackIsOpen", +export const appTeamsIsOpen = atom({ + key: "appTeamsIsOpen", default: false, }); diff --git a/app/src/recoil/selectors.ts b/app/src/recoil/selectors.ts index 5cdd6184dc..23e9bb4d42 100644 --- a/app/src/recoil/selectors.ts +++ b/app/src/recoil/selectors.ts @@ -53,24 +53,24 @@ export const fiftyone = selector({ }, }); -export const showFeedbackButton = selector({ - key: "showFeedbackButton", +export const showTeamsButton = selector({ + key: "showTeamsButton", get: ({ get }) => { - const feedback = get(fiftyone).feedback; - const localFeedback = get(atoms.feedbackSubmitted); - const storedFeedback = window.localStorage.getItem("fiftyone-feedback"); - if (storedFeedback) { - window.localStorage.removeItem("fiftyone-feedback"); - fetch(`${http}/feedback?submitted=true`, { method: "post" }); + const teams = get(fiftyone).teams; + const localTeams = get(atoms.teamsSubmitted); + const storedTeams = window.localStorage.getItem("fiftyone-teams"); + if (storedTeams) { + window.localStorage.removeItem("fiftyone-teams"); + fetch(`${http}/teams?submitted=true`, { method: "post" }); } if ( - feedback.submitted || - localFeedback.submitted || - storedFeedback === "submitted" + teams.submitted || + localTeams.submitted || + storedTeams === "submitted" ) { return "hidden"; } - if (feedback.minimized || localFeedback.minimized) { + if (teams.minimized || localTeams.minimized) { return "minimized"; } return "shown"; From eb4e9652a015712fd69e7958bd0e5d4ee973b6db Mon Sep 17 00:00:00 2001 From: Benjamin Kane Date: Mon, 14 Jun 2021 21:58:08 -0600 Subject: [PATCH 03/16] teams form work --- app/src/recoil/selectors.ts | 2 - docs/source/_static/css/custom.css | 2 +- docs/source/_static/css/voxel51-website.css | 41 ++++ docs/source/_templates/layout.html | 244 +++++++++++++------- fiftyone/constants.py | 2 +- fiftyone/server/main.py | 14 +- 6 files changed, 209 insertions(+), 96 deletions(-) diff --git a/app/src/recoil/selectors.ts b/app/src/recoil/selectors.ts index 23e9bb4d42..bae8e759af 100644 --- a/app/src/recoil/selectors.ts +++ b/app/src/recoil/selectors.ts @@ -8,8 +8,6 @@ import { VALID_LABEL_TYPES, VALID_SCALAR_TYPES, makeLabelNameGroups, - labelTypeHasColor, - AGGS, VALID_LIST_TYPES, HIDDEN_LABEL_ATTRS, LABEL_LIST, diff --git a/docs/source/_static/css/custom.css b/docs/source/_static/css/custom.css index b314d1495a..03c2afa1e2 100644 --- a/docs/source/_static/css/custom.css +++ b/docs/source/_static/css/custom.css @@ -321,7 +321,7 @@ article.pytorch-article .reference.download.internal { } .nav__main__logo { - width: 300px; + width: 260px; margin-left: 30px; margin-right: 20px; } diff --git a/docs/source/_static/css/voxel51-website.css b/docs/source/_static/css/voxel51-website.css index 2f16ae8fc0..eec7470e51 100644 --- a/docs/source/_static/css/voxel51-website.css +++ b/docs/source/_static/css/voxel51-website.css @@ -484,3 +484,44 @@ .list-inline > li:not(:last-child) { padding-right: 2rem; } + +.button-primary { + background: var(--color-primary); + color: var(--text-primary-on-dark) !important; + border-color: var(--color-primary); + border-radius: 3px; + border-width: 2px; + border-style: solid; + cursor: pointer; + + font-weight: 600; + font-size: 14px; + + padding: 0.4rem 1.2em; +} + +.button-primary:hover { + background: var(--color-primary-muted); + border-color: var(--color-primary-muted); + text-decoration: none; +} + +.button-secondary { + color: var(--color-primary) !important; + border-color: var(--color-primary); + border-radius: 3px; + border-width: 2px; /* XXX ask */ + border-style: solid; + cursor: pointer; + padding: 0.4em 1.4em; + font-size: 14px; + + font-weight: 600; /* XXX ask */ +} + +.button-secondary:hover { + background: var(--color-primary); + border-color: var(--color-primary); + color: var(--text-primary-on-dark) !important; + text-decoration: none; +} diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html index 6a022c7c0d..7413b980af 100644 --- a/docs/source/_templates/layout.html +++ b/docs/source/_templates/layout.html @@ -1,11 +1,13 @@ -{% extends "!layout.html" %} - -{% block extrahead %} - - -{% endblock %} - -{% block custom_header %} +{% extends "!layout.html" %} {% block extrahead %} + + +{% endblock %} {% block custom_header %}
-   +   + +
+ +
+ +
+ Try FiftyOne!
+
+ Have a Team? +
-{% endblock %} - -{% block custom_mobile_menu %} -{# delete PyTorch's menu because our own is reused on mobile #} -{% endblock %} - -{% block menu %} -{{ toctree(maxdepth=10, collapse=True, includehidden=True, titles_only=True) }} -{% endblock %} - -{% block custom_footer %} +{% endblock %} {% block custom_mobile_menu %} {# delete PyTorch's menu because +our own is reused on mobile #} {% endblock %} {% block menu %} {{ +toctree(maxdepth=10, collapse=True, includehidden=True, titles_only=True) }} {% +endblock %} {% block custom_footer %} -
- + - - + + + {% endblock %} diff --git a/fiftyone/constants.py b/fiftyone/constants.py index 991a3491f4..aeeec533c5 100644 --- a/fiftyone/constants.py +++ b/fiftyone/constants.py @@ -19,7 +19,7 @@ FIFTYONE_CONFIG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "config.json") FIFTYONE_APP_CONFIG_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "app_config.json") BASE_DIR = os.path.dirname(FIFTYONE_DIR) -FEEDBACK_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "var", "feedback.json") +TEAMS_PATH = os.path.join(FIFTYONE_CONFIG_DIR, "var", "teams.json") RESOURCES_DIR = os.path.join(FIFTYONE_DIR, "resources") # Package metadata diff --git a/fiftyone/server/main.py b/fiftyone/server/main.py index b11b25df60..d36c9c5d0c 100644 --- a/fiftyone/server/main.py +++ b/fiftyone/server/main.py @@ -85,9 +85,9 @@ def get_response(): dict """ uid, _ = fou.get_user_id() - isfile = os.path.isfile(foc.FEEDBACK_PATH) + isfile = os.path.isfile(foc.TEAMS_PATH) if isfile: - submitted = etas.load_json(foc.FEEDBACK_PATH)["submitted"] + submitted = etas.load_json(foc.TEAMS_PATH)["submitted"] else: submitted = False @@ -95,7 +95,7 @@ def get_response(): "version": foc.VERSION, "user_id": uid, "do_not_track": fo.config.do_not_track, - "feedback": {"submitted": submitted, "minimized": isfile}, + "teams": {"submitted": submitted, "minimized": isfile}, "dev_install": foc.DEV_INSTALL or foc.RC_INSTALL, } @@ -165,12 +165,12 @@ def get_response(): } -class FeedbackHandler(RequestHandler): - """Returns whether the feedback button should be minimized""" +class TeamsHandler(RequestHandler): + """Returns whether the teams button should be minimized""" def post(self): submitted = self.get_argument("submitted", False) - etas.write_json({"submitted": submitted}, foc.FEEDBACK_PATH) + etas.write_json({"submitted": submitted}, foc.TEAMS_PATH) def _catch_errors(func): @@ -1440,7 +1440,7 @@ def __init__(self, **settings): handlers = [ (r"/fiftyone", FiftyOneHandler), (r"/polling", PollingHandler), - (r"/feedback", FeedbackHandler), + (r"/teams", TeamsHandler), (r"/filepath/(.*)", MediaHandler, {"path": ""},), (r"/notebook", NotebookHandler), (r"/stages", StagesHandler), From ad7dd1d08e1c4497f6d075f7464047e9491c1acb Mon Sep 17 00:00:00 2001 From: Benjamin Kane Date: Tue, 15 Jun 2021 08:43:11 -0600 Subject: [PATCH 04/16] app form tweaks, hide id from scalars in modal and fix id tag in grid --- app/src/components/FieldsSidebar.tsx | 2 +- app/src/components/Header.tsx | 34 +++++++++++++++++----------- app/src/components/Sample.tsx | 4 ++-- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/app/src/components/FieldsSidebar.tsx b/app/src/components/FieldsSidebar.tsx index 7fb72eeaf4..f47cf64374 100644 --- a/app/src/components/FieldsSidebar.tsx +++ b/app/src/components/FieldsSidebar.tsx @@ -611,7 +611,7 @@ const ScalarsCell = ({ modal }: ScalarsCellProps) => { filtering.filteredScalars(modal) )} entries={scalars - .filter((name) => !(name === "filepath" && modal)) + .filter((name) => !(["filepath", "id"].includes(name) && modal)) .map((name) => { return { name, diff --git a/app/src/components/Header.tsx b/app/src/components/Header.tsx index 3135df307c..fa5877ebef 100644 --- a/app/src/components/Header.tsx +++ b/app/src/components/Header.tsx @@ -6,7 +6,6 @@ import React, { useState, } from "react"; import styled from "styled-components"; -import { Checkbox } from "@material-ui/core"; import { useRecoilState, useRecoilValue, useResetRecoilState } from "recoil"; import AuosizeInput from "react-input-autosize"; import { Machine, assign } from "xstate"; @@ -25,7 +24,7 @@ import ExternalLink from "./ExternalLink"; import { Slack } from "../icons"; import * as atoms from "../recoil/atoms"; import * as selectors from "../recoil/selectors"; -import socket, { http, appContext } from "../shared/connection"; +import socket, { http } from "../shared/connection"; import { useTheme } from "../utils/hooks"; import { packageMessage } from "../utils/socket"; @@ -429,21 +428,21 @@ const TeamsForm = () => { <> { /> { const [closeTeams, setCloseTeams] = useRecoilState(atoms.closeTeams); const text = ( - FiftyOne will always be an open source tool free to all users, all 20,000 - and counting. But your team may need more. We have begun deploying a team - based version of FiftyOne to early adopters. Would you like to join us in - this next stage? + FiftyOne is and will always be open source software that is freely + available to individual users, all 20,000 and counting. However, if you’re + part of a team, you may need more. That’s why we’ve begun deploying + team-based versions of FiftyOne with multi-user collaboration features to + early adopters. +
+
+ Are you interested in a team-based deployment of FiftyOne for your team? + Let us know how to contact you and our founders will reach out to make it + happen! ); const theme = useContext(ThemeContext); @@ -617,7 +622,7 @@ const TeamsButton = ({ addNotification }) => { kind: "Get FiftyOne for your team!", message: text, children: [], - onClose: () => setTeamsIsOpen(false), + onClose: () => setAppTeamsIsOpen(false), }); setCloseTeams({ close: callback }); } @@ -628,7 +633,7 @@ const TeamsButton = ({ addNotification }) => { onClick={onClick} style={{ marginRight: "0.5rem", position: "relative" }} > - Have a Team? + Have a team?
{
) : showTeamsButton === "minimized" ? ( - + ) : null; }; diff --git a/app/src/components/Sample.tsx b/app/src/components/Sample.tsx index c86e23fc63..2ad8ffab0e 100644 --- a/app/src/components/Sample.tsx +++ b/app/src/components/Sample.tsx @@ -163,9 +163,9 @@ const SampleInfo = React.memo(({ id }) => { } } else if ( scalars.includes(cur) && - ![null, undefined].includes(sample[cur]) + ![null, undefined].includes(sample[cur === "id" ? "_id" : cur]) ) { - const value = prettify(sample[cur], false); + const value = prettify(sample[cur === "id" ? "_id" : cur], false); acc = [ ...acc, Date: Tue, 15 Jun 2021 10:44:55 -0400 Subject: [PATCH 05/16] improving migration --- fiftyone/migrations/revisions/v0_9_4.py | 84 +++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 4 deletions(-) diff --git a/fiftyone/migrations/revisions/v0_9_4.py b/fiftyone/migrations/revisions/v0_9_4.py index fc46e8537a..69cabf09c5 100644 --- a/fiftyone/migrations/revisions/v0_9_4.py +++ b/fiftyone/migrations/revisions/v0_9_4.py @@ -11,20 +11,76 @@ def up(db, dataset_name): match_d = {"name": dataset_name} dataset_dict = db.datasets.find_one(match_d) - for field in dataset_dict.get("sample_fields", []): + sample_fields = dataset_dict.get("sample_fields", []) + + for field in sample_fields: if "db_field" not in field: if field["name"] == "id": field["db_field"] = "_id" else: field["db_field"] = field["name"] - for field in dataset_dict.get("frame_fields", []): + if not _has_field("id", sample_fields): + sample_fields.insert( + 0, + { + "name": "id", + "ftype": "fiftyone.core.fields.ObjectIdField", + "subfield": None, + "embedded_doc_type": None, + "db_field": "_id", + }, + ) + + dataset_dict["sample_fields"] = sample_fields + + frame_fields = dataset_dict.get("frame_fields", []) + + for field in frame_fields: if "db_field" not in field: if field["name"] == "id": field["db_field"] = "_id" else: field["db_field"] = field["name"] + if not _has_field("id", frame_fields): + frame_fields.insert( + 0, + { + "name": "id", + "ftype": "fiftyone.core.fields.ObjectIdField", + "subfield": None, + "embedded_doc_type": None, + "db_field": "_id", + }, + ) + + if not _has_field("frame_number", frame_fields): + frame_fields.insert( + 1, + { + "name": "frame_number", + "ftype": "fiftyone.core.fields.FrameNumberField", + "subfield": None, + "embedded_doc_type": None, + "db_field": "frame_number", + }, + ) + + if not _has_field("_sample_id", frame_fields): + frame_fields.insert( + 2, + { + "name": "_sample_id", + "ftype": "fiftyone.core.fields.ObjectIdField", + "subfield": None, + "embedded_doc_type": None, + "db_field": "_sample_id", + }, + ) + + dataset_dict["frame_fields"] = frame_fields + db.datasets.replace_one(match_d, dataset_dict) @@ -32,10 +88,30 @@ def down(db, dataset_name): match_d = {"name": dataset_name} dataset_dict = db.datasets.find_one(match_d) - for field in dataset_dict.get("sample_fields", []): + sample_fields = dataset_dict.get("sample_fields", []) + + sample_fields = [f for f in sample_fields if f["name"] != "id"] + + for field in sample_fields: field.pop("db_field", None) - for field in dataset_dict.get("frame_fields", []): + dataset_dict["sample_fields"] = sample_fields + + frame_fields = dataset_dict.get("frame_fields", []) + + frame_fields = [ + f + for f in frame_fields + if f["name"] not in ("id", "frame_number", "_sample_id") + ] + + for field in frame_fields: field.pop("db_field", None) + dataset_dict["frame_fields"] = frame_fields + db.datasets.replace_one(match_d, dataset_dict) + + +def _has_field(name, fields): + return any(f["name"] == name for f in fields) From a248591b722eb8ae9564a1675a6fe8159cecd5a2 Mon Sep 17 00:00:00 2001 From: brimoor Date: Tue, 15 Jun 2021 10:45:09 -0400 Subject: [PATCH 06/16] reverting to v0.9.4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 34d4a06766..87351e8019 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def finalize_options(self): ] -VERSION = "0.10.0" +VERSION = "0.9.4" def get_version(): From 4250c02d30d837c23172ab6406dba7b34348a99d Mon Sep 17 00:00:00 2001 From: Benjamin Kane Date: Tue, 15 Jun 2021 09:12:11 -0600 Subject: [PATCH 07/16] docs teams form --- docs/source/_static/css/voxel51-website.css | 109 +++++++++++++++++++- docs/source/_templates/layout.html | 29 ++++-- docs/source/conf.py | 1 + 3 files changed, 126 insertions(+), 13 deletions(-) diff --git a/docs/source/_static/css/voxel51-website.css b/docs/source/_static/css/voxel51-website.css index eec7470e51..c5ec9e0fbd 100644 --- a/docs/source/_static/css/voxel51-website.css +++ b/docs/source/_static/css/voxel51-website.css @@ -43,6 +43,8 @@ --padding-x: 10rem; --padding-y: 10rem; + + --bg-modal: rgba(33, 37, 41, 0.75); } .banner { @@ -82,7 +84,7 @@ white-space: nowrap; } -@media screen and (max-device-width: 850px) { +@media screen and (max-width: 850px) { .banner > div > span { font-size: 15px; line-height: 18px; @@ -163,14 +165,80 @@ text-decoration: underline; } -@media only screen and (min-device-width: 850px) { +/* modal classes */ + +.modal { + display: none; /* Hidden by default */ + position: fixed; /* Stay in place */ + z-index: 1000; /* Sit on top */ + left: 0; + top: 0; + width: 100%; /* Full width */ + height: 100%; /* Full height */ + background-color: var(--bg-dark-primary); + background-color: var(--bg-modal); + justify-content: center; + flex-direction: column; +} + +/* Modal Content/Box */ +.modal-content { + background-color: var(--bg-light-primary); + padding: 3rem; + border: 2px solid var(--gray-light1); + border-radius: 3px; + width: auto; /* Could be more or less, depending on screen size */ + max-width: 80%; + width: 600px; + height: auto; + margin: auto; + max-height: 90%; + overflow-y: auto; +} + +/* The Close Button */ +.modal-close { + color: var(--text-primary-on-light); + float: right; + font-size: --fontsize-body; + font-weight: bold; +} + +.modal-close:hover, +.modal-close:focus { + text-decoration: none; + cursor: pointer; +} + +.modal p { + color: rgb(108, 117, 125); + font-size: 18px; +} + +.modal h2 { + color: var(--text-primary); + font-weight: 700; + font-size: 40px; + line-height: 52px; + margin-block-start: 0; + margin-block-end: 0rem; +} + +@media only screen and (min-width: 850px) { .mobile_only { display: none; } } +@media only screen and (min-width: 850px) and (max-width: 1240px) { + #try-fiftyone, + #octocat { + display: none; + } +} + /* mobile responsive nav elements all here */ -@media only screen and (min-device-width: 320px) and (max-device-width: 850px) { +@media only screen and (min-width: 320px) and (max-width: 850px) { /* navs do not stay at top in mobile mode */ .desktop_only { display: none; @@ -409,7 +477,7 @@ } /* Use Media Query for Mobile to Change Footer Completely */ -@media only screen and (min-device-width: 320px) and (max-device-width: 850px) { +@media only screen and (min-width: 320px) and (max-width: 850px) { .footer { display: grid; grid-template-columns: 100%; @@ -525,3 +593,36 @@ color: var(--text-primary-on-dark) !important; text-decoration: none; } + +.text-brand { + color: var(--color-primary); +} + +.text-primary { + color: var(--text-primary); +} + +.text-primary-on-light { + color: var(--text-primary); +} + +.text-primary-on-dark { + color: var(--text-primary-on-dark); + text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.6); +} + +.text-secondary-on-light { + color: var(--text-secondary-on-light); +} + +.text-secondary-on-dark { + color: var(--text-secondary-on-dark); +} + +.text-tertiary-on-light { + color: var(--text-tertiary-on-light); +} + +.text-tertiary-on-dark { + color: var(--text-tertiary-on-dark); +} diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html index 7413b980af..c6cc04116d 100644 --- a/docs/source/_templates/layout.html +++ b/docs/source/_templates/layout.html @@ -64,7 +64,7 @@ Press
-
+
 
-
+
Try FiftyOne! @@ -83,7 +83,7 @@ Have a Team?Have a team?
@@ -173,13 +173,19 @@

>FiftyOne - for your team! + for your team

-

- FiftyOne will always be an open source tool free to all users, all 20,000 - and counting. But your team may need more. We have begun deploying a team - based version of FiftyOne to early adopters. Would you like to join us in - this next stage? +

+ FiftyOne is and will always be open source software that is freely + available to individual users, all 20,000 and counting. However, if you’re + part of a team, you may need more. That’s why we’ve begun deploying + team-based versions of FiftyOne with multi-user collaboration features to + early adopters. +
+
+ Are you interested in a team-based deployment of FiftyOne for your team? + Let us know how to contact you and our founders will reach out to make it + happen!

@@ -199,6 +205,11 @@

gtag("config", "UA-141773487-1"); +