From 2ea99934d776658b767510092356d2b7b16f80d8 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 15 Nov 2018 11:25:14 -0500 Subject: [PATCH 1/7] css splash-panel --- static/css-custom/classic.css | 2 +- static/css-custom/grayscale.css | 2 +- static/css-custom/inverse.css | 2 +- static/css-source/source.css | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/static/css-custom/classic.css b/static/css-custom/classic.css index 1d891a32..26a67b50 100644 --- a/static/css-custom/classic.css +++ b/static/css-custom/classic.css @@ -42,5 +42,5 @@ select { /* modifies the border of the homepage buttons when hovering on */ .splash-panel:hover { - border: 0.5em solid rgb(98, 221, 115); + border-color: rgb(98, 221, 115); } diff --git a/static/css-custom/grayscale.css b/static/css-custom/grayscale.css index 68236ea8..e98bb94a 100644 --- a/static/css-custom/grayscale.css +++ b/static/css-custom/grayscale.css @@ -39,5 +39,5 @@ select { /* modifies the border of the homepage buttons when hovering on */ .splash-panel:hover { - border: 0.5em solid black; + border-color: black; } diff --git a/static/css-custom/inverse.css b/static/css-custom/inverse.css index e5b90120..51f48299 100644 --- a/static/css-custom/inverse.css +++ b/static/css-custom/inverse.css @@ -39,5 +39,5 @@ select { /* modifies the border of the homepage buttons when hovering on */ .splash-panel:hover { - border: 0.5em solid black; + border-color: black; } diff --git a/static/css-source/source.css b/static/css-source/source.css index 7784aa93..3b6a2a8b 100644 --- a/static/css-source/source.css +++ b/static/css-source/source.css @@ -175,6 +175,11 @@ min-height: 0; } +/* modifies the border of the homepage buttons when hovering on */ +.splash-panel:hover { + border: 0.5em solid; +} + .splash-panel-title { /*contains the about info on the home page (source)*/ font-family: estuaryFont; text-align: center; @@ -1006,7 +1011,6 @@ font-family: estuaryFont; .aboutTitle { /* font-variant:small-caps; */ color: rgb(98, 221, 115); - } .aboutButton button{ From a64b1a58f9c2dab3af09e1318cafc28e80ce03b5 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 15 Nov 2018 11:48:10 -0500 Subject: [PATCH 2/7] updates --- static/WebDirt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/WebDirt b/static/WebDirt index cfd869bf..59a7778a 160000 --- a/static/WebDirt +++ b/static/WebDirt @@ -1 +1 @@ -Subproject commit cfd869bf9c98922d437b57a85153cd8f4a5cdb98 +Subproject commit 59a7778a5a3de767d2334651a06ba450142c91de From 40a026c8d616425a0b9d34a74eb6b8e1bfb88f39 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 15 Nov 2018 12:41:43 -0500 Subject: [PATCH 3/7] updates --- Makefile | 3 +++ client/src/Estuary/Widgets/Estuary.hs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0e73a2a3..28284356 100644 --- a/Makefile +++ b/Makefile @@ -96,5 +96,8 @@ style: test: installClient installServer EstuaryServer/EstuaryServer test +buildTest: buildClient + EstuaryServer/EstuaryServer test + openClient: installClient open Estuary.jsexe/index.html diff --git a/client/src/Estuary/Widgets/Estuary.hs b/client/src/Estuary/Widgets/Estuary.hs index b3387a7f..735a7726 100644 --- a/client/src/Estuary/Widgets/Estuary.hs +++ b/client/src/Estuary/Widgets/Estuary.hs @@ -105,7 +105,7 @@ clientConfigurationWidgets ctx = divClass "webDirt" $ do divClass "webDirtMute" $ divClass "webDirtContent" $ do let styleMap = fromList [("../css-custom/classic.css", "Classic"),("../css-custom/inverse.css","Inverse"), ("../css-custom/grayscale.css","Grayscale")] translateDyn Term.Theme ctx >>= dynText - styleChange <- divClass "themeSelector" $ do _dropdown_change <$> dropdown "../css-custom/classic.css" (constDyn styleMap) def -- Event t String + styleChange <- divClass "themeSelector" $ do _dropdown_change <$> dropdown "classic.css" (constDyn styleMap) def -- Event t String let styleChange' = fmap (\x c -> c {theme = x}) styleChange -- Event t (Context -> Context) translateDyn Term.Language ctx >>= dynText let langMap = constDyn $ fromList $ zip languages (fmap show languages) From f5ce1a32cc6b0bce2316a026eb02809f2b5c6e47 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 15 Nov 2018 12:45:18 -0500 Subject: [PATCH 4/7] updates --- client/src/Estuary/Widgets/Estuary.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Estuary/Widgets/Estuary.hs b/client/src/Estuary/Widgets/Estuary.hs index 735a7726..7f000c43 100644 --- a/client/src/Estuary/Widgets/Estuary.hs +++ b/client/src/Estuary/Widgets/Estuary.hs @@ -105,7 +105,7 @@ clientConfigurationWidgets ctx = divClass "webDirt" $ do divClass "webDirtMute" $ divClass "webDirtContent" $ do let styleMap = fromList [("../css-custom/classic.css", "Classic"),("../css-custom/inverse.css","Inverse"), ("../css-custom/grayscale.css","Grayscale")] translateDyn Term.Theme ctx >>= dynText - styleChange <- divClass "themeSelector" $ do _dropdown_change <$> dropdown "classic.css" (constDyn styleMap) def -- Event t String + styleChange <- divClass "themeSelector" $ do _dropdown_change <$> dropdown "../css-custom/inverse.css" (constDyn styleMap) def -- Event t String let styleChange' = fmap (\x c -> c {theme = x}) styleChange -- Event t (Context -> Context) translateDyn Term.Language ctx >>= dynText let langMap = constDyn $ fromList $ zip languages (fmap show languages) From 04e51f486868aa97fd732576dadb15b6a0b35c2b Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 15 Nov 2018 12:57:43 -0500 Subject: [PATCH 5/7] updates --- Makefile | 6 ++++-- client/src/Estuary/Widgets/Estuary.hs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 28284356..10d02cee 100644 --- a/Makefile +++ b/Makefile @@ -91,12 +91,14 @@ prodClean: clean stack --work-dir .stack-work-production/ clean --stack-yaml=client.yaml style: - cp static/classic.css Estuary.jsexe + cp -r static/css-custom/ Estuary.jsexe + cp -r static/css-source/ Estuary.jsexe + test: installClient installServer EstuaryServer/EstuaryServer test -buildTest: buildClient +buildTest: buildClient installClient installServer EstuaryServer/EstuaryServer test openClient: installClient diff --git a/client/src/Estuary/Widgets/Estuary.hs b/client/src/Estuary/Widgets/Estuary.hs index 7f000c43..b3387a7f 100644 --- a/client/src/Estuary/Widgets/Estuary.hs +++ b/client/src/Estuary/Widgets/Estuary.hs @@ -105,7 +105,7 @@ clientConfigurationWidgets ctx = divClass "webDirt" $ do divClass "webDirtMute" $ divClass "webDirtContent" $ do let styleMap = fromList [("../css-custom/classic.css", "Classic"),("../css-custom/inverse.css","Inverse"), ("../css-custom/grayscale.css","Grayscale")] translateDyn Term.Theme ctx >>= dynText - styleChange <- divClass "themeSelector" $ do _dropdown_change <$> dropdown "../css-custom/inverse.css" (constDyn styleMap) def -- Event t String + styleChange <- divClass "themeSelector" $ do _dropdown_change <$> dropdown "../css-custom/classic.css" (constDyn styleMap) def -- Event t String let styleChange' = fmap (\x c -> c {theme = x}) styleChange -- Event t (Context -> Context) translateDyn Term.Language ctx >>= dynText let langMap = constDyn $ fromList $ zip languages (fmap show languages) From 83687163bc90bb858a132b236e56b4563b1f922f Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 15 Nov 2018 13:04:31 -0500 Subject: [PATCH 6/7] updates --- Makefile | 2 +- client/src/Estuary/Types/Context.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 10d02cee..023c812e 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ style: test: installClient installServer EstuaryServer/EstuaryServer test -buildTest: buildClient installClient installServer +buildTest: buildClient installClient EstuaryServer/EstuaryServer test openClient: installClient diff --git a/client/src/Estuary/Types/Context.hs b/client/src/Estuary/Types/Context.hs index 0ab964b1..651a961b 100644 --- a/client/src/Estuary/Types/Context.hs +++ b/client/src/Estuary/Types/Context.hs @@ -30,7 +30,7 @@ initialContext now wd sd = Context { webDirt = wd, superDirt = sd, language = English, - theme = "classic.css", + theme = "../css-custom/classic.css", tempo = Tempo { cps = 0.5, at = now, beat = 0.0 }, definitions = empty, webDirtOn = True, From 77fecb9ee0abbfd8daae8086f0a93ded84976e45 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 15 Nov 2018 13:44:12 -0500 Subject: [PATCH 7/7] updates --- static/css-custom/grayscale.css | 10 ++++++++++ static/css-custom/inverse.css | 5 +++++ static/css-source/source.css | 34 ++++++++++++++++++--------------- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/static/css-custom/grayscale.css b/static/css-custom/grayscale.css index e98bb94a..60a9e197 100644 --- a/static/css-custom/grayscale.css +++ b/static/css-custom/grayscale.css @@ -41,3 +41,13 @@ select { .splash-panel:hover { border-color: black; } + +.ensembleTempo textarea{ + color: black; +} + + +/*modifies the text from the structured-view dropdown menus */ +.atomPopup{ + color:whitesmoke; +} diff --git a/static/css-custom/inverse.css b/static/css-custom/inverse.css index 51f48299..b9f48eb2 100644 --- a/static/css-custom/inverse.css +++ b/static/css-custom/inverse.css @@ -41,3 +41,8 @@ select { .splash-panel:hover { border-color: black; } + +/*modifies the text from the structured-view dropdown menus */ +.atomPopup{ + color:rgb(98, 221, 115);; +} diff --git a/static/css-source/source.css b/static/css-source/source.css index 3b6a2a8b..9011314f 100644 --- a/static/css-source/source.css +++ b/static/css-source/source.css @@ -177,7 +177,7 @@ /* modifies the border of the homepage buttons when hovering on */ .splash-panel:hover { - border: 0.5em solid; + border: 0.5em solid; } .splash-panel-title { /*contains the about info on the home page (source)*/ @@ -390,7 +390,7 @@ font-size: 60%; /* background-color: yellow; */ flex:1; - color: hsl(120,0%,80%); +/* color: hsl(120,0%,80%); */ border: none; } @@ -428,7 +428,7 @@ .textInputToEndOfLine { font-size: 100%; font-weight: normal; - color: rgb(98, 221, 115); +/* color: rgb(98, 221, 115); */ border: none; padding: 0px; margin-top: 0.5em; @@ -584,8 +584,10 @@ ______________________________ display: inline-block; } + .atomPopupInput { border: none; + } .atomPopupInputMouseOver{ border:none; @@ -600,18 +602,20 @@ ______________________________ /*ex. hit [,,] on any widget in ICLC Fixed*/ .generalPattern-layer{ - /*border: 2pt solid blue;*/ +/* border: 2pt solid blue; */ display:inline-block } /*(ex. ICLCFixed, the sound widget (everything wrapped in red))*/ .generalPattern-atom{ - /*border: 1pt solid red;*/ +/* border: 1pt solid red; */ display:inline-block; } + + /* *************************************************************************************************** For aGLNumberWidget_____ see any pattern that takes a list of Numbers as input (for example 'speed' or 'crush') in iclcStackedPattern @@ -759,14 +763,14 @@ td { text-align:center } -/* The '▲' arrow td */ +/* The 'â–²' arrow td */ .countWidgetTable-upArrowtd{ text-align:center; background-color: hsl(0,0%,10%); color: lightgreen; } -/* The '▼' arrow td */ +/* The 'â–¼' arrow td */ .countWidgetTable-downArrowtd{ text-align:center; background-color: hsl(0,0%,10%); @@ -962,7 +966,7 @@ font-family: estuaryFont; } .refExampleButton button { - background-color: transparent; +/* background-color: transparent; */ width: 100%; font-size: 100%; font-variant:small-caps; @@ -970,7 +974,7 @@ font-family: estuaryFont; } .refExampleButton button:hover { - background-color: rgb(98, 221, 115); /* Green */ +/* background-color: rgb(98, 221, 115); /* Green */ */ color: black; cursor: help; } @@ -983,7 +987,7 @@ font-family: estuaryFont; .exampleText { display: flex; font-family: 'Inconsolata'; - color: rgb(98, 221, 115); +/* color: rgb(98, 221, 115); */ font-style: italic; /* margin-right: 5%; */ } @@ -994,7 +998,7 @@ font-family: estuaryFont; .about { /* font-variant:small-caps; */ - color: rgb(98, 221, 115); +/* color: rgb(98, 221, 115); */ text-align: center; border-radius: 3px; margin-bottom: 4px; @@ -1010,12 +1014,12 @@ font-family: estuaryFont; .aboutTitle { /* font-variant:small-caps; */ - color: rgb(98, 221, 115); +/* color: rgb(98, 221, 115); */ } .aboutButton button{ background-color: transparent; - color: black; +/* color: black; */ font-weight: bold; font-size: 115%; } @@ -1024,12 +1028,12 @@ font-family: estuaryFont; font-size: 95%; text-align: center; /* font-variant:small-caps; */ - color: rgb(98, 221, 115); +/* color: rgb(98, 221, 115); */ margin-bottom: 1%; } .samples { - color: hsl(120,100%,90%, 100%); +/* color: hsl(120,100%,90%, 100%); */ } .listenButton button {