Merge pull request #37 from luisnavarrodelangel/master

CSS init loading, structure editor and help screen fixes

Makefile

@@ -91,10 +91,15 @@ 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 installClient
+		EstuaryServer/EstuaryServer test
+
 openClient: installClient
 	open Estuary.jsexe/index.html

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,

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);
 }

static/css-custom/grayscale.css

@@ -39,5 +39,15 @@ select {
 
 /* modifies the border of the homepage buttons when hovering on */
 .splash-panel:hover {
-	border: 0.5em solid black;
+	border-color: black;
+}
+
+.ensembleTempo textarea{
+ color: black;
+}
+
+
+/*modifies the text from the structured-view dropdown menus  */
+.atomPopup{
+	color:whitesmoke;
 }

static/css-custom/inverse.css

@@ -39,5 +39,10 @@ select {
 
 /* modifies the border of the homepage buttons when hovering on */
 .splash-panel:hover {
-	border: 0.5em solid black;
+	border-color: black;
+}
+
+/*modifies the text from the structured-view dropdown menus  */
+.atomPopup{
+	color:rgb(98, 221, 115);;
 }

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;
@@ -385,7 +390,7 @@
 	font-size: 60%;
 /* 	background-color: yellow; */
 	flex:1;
-	color: hsl(120,0%,80%);
+/* 	color: hsl(120,0%,80%); */
 	border: none;
 }
 
@@ -423,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;
@@ -579,8 +584,10 @@ ______________________________
 	display: inline-block;
 }
 
+
 .atomPopupInput {
 	border: none;
+
 }
 .atomPopupInputMouseOver{
 	border:none;
@@ -595,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
@@ -754,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%);
@@ -957,15 +966,15 @@ font-family: estuaryFont;
 }
 
 .refExampleButton button {
-	background-color: transparent;
+/* 	background-color: transparent; */
 	width: 100%;
 	font-size: 100%;
 	font-variant:small-caps;
 	margin-bottom: 7%;
 }
 
 .refExampleButton button:hover {
-    background-color: rgb(98, 221, 115); /* Green */
+/*     background-color: rgb(98, 221, 115); /* Green */ */
     color: black;
 	cursor: help;
 }
@@ -978,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%; */
 }
@@ -989,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;
@@ -1005,13 +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%;
 }
@@ -1020,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 {