Merge branch 'dev' into dev-ngrams-table-online

dist/styles/sass.css

@@ -362,6 +362,7 @@ body > .tree ul > li:first-child::before {
 li .leaf {
   display: flex;
   flex-direction: row;
+  color: #005a9aff;
 }
 li .leaf .folder-icon {
   padding: 0 2 0 2;
@@ -474,7 +475,6 @@ li .leaf:hover a.settings {
   margin-top: 1px;
 }
 .tree .node.node-type-valid .text {
-  color: blue;
   text-decoration: underline;
 }
 
@@ -690,6 +690,9 @@ li .leaf:hover a.settings {
   top: 50%;
 }
 
+.table tr td {
+  color: #005a9aff;
+}
 .table tr td .active {
   font-weight: bold;
   text-decoration: underline;
@@ -716,6 +719,10 @@ li .leaf:hover a.settings {
   margin: 10px;
 }
 
+.body ul li {
+  color: #005a9aff;
+}
+
 .range {
   width: 400px;
   /* some space for the right knob */

dist/styles/sass.css.map

-{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass"],"names":[],"mappings":"AAAA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;EACA;EACA;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAZA;EACA;EAEA;EAWE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EApCA;EACA;EAEA;EAmCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEJ;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACpFJ;EACE;;;AAOF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACvKF;EACE;;;AAGA;EACE;EACA;;AAEA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAER;EACE;;AAEE;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;EACA;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;AAGN;EACE;;AACF;EACE;;AACF;EACE;;;AC7IJ;EACE;;AAEA;EACE;;AACA;EACE;;AACJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EArDR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA2DM;EACE;EACA;EACA;EACA;EACA;EA7DR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAmEE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;ACtGV;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;EACA;EACA;;;AAKE;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;ACjDF;EACE;AACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA;;;AAGN;EACE","file":"sass.css"}
+{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass"],"names":[],"mappings":"AAAA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;EACA;EACA;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAZA;EACA;EAEA;EAWE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EApCA;EACA;EAEA;EAmCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEJ;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACpFJ;EACE;;;AAOF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACvKF;EACE;;;AAGA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAER;EACE;;AAEE;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;AAGN;EACE;;AACF;EACE;;AACF;EACE;;;AC7IJ;EACE;;AAEA;EACE;;AACA;EACE;;AACJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EArDR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA2DM;EACE;EACA;EACA;EACA;EACA;EA7DR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAmEE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;ACtGV;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;EACA;EACA;;;AAIA;EACE;;AACA;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAIE;EACE;;;ACvDN;EACE;AACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA;;;AAGN;EACE","file":"sass.css"}
\ No newline at end of file

package.json

 {
     "name": "Gargantext",
-    "version": "0.0.2.5",
+    "version": "0.0.2.6",
     "scripts": {
         "rebase-set": "spago package-set-upgrade && spago psc-package-insdhall",
         "rebuild-set": "spago psc-package-insdhall",

src/Gargantext/Components/Forest/Tree/Node/Settings.purs

@@ -132,6 +132,7 @@ settingsBox Team =
                                 , NodeFrameCalc
                                 , NodeFrameNotebook
                                 , Team
+                                , FolderShared
                                 ]
                           , Share
                           , Delete

src/Gargantext/Components/GraphExplorer/ToggleButton.purs

@@ -28,6 +28,7 @@ type Props = (
     state :: R.State Boolean
   , onMessage :: String
   , offMessage :: String
+  , style      :: String
   , onClick :: forall e. e -> Effect Unit
   )
 
@@ -37,10 +38,10 @@ toggleButton props = R.createElement toggleButtonCpt props []
 toggleButtonCpt :: R.Component Props
 toggleButtonCpt = R.hooksComponentWithModule thisModule "toggleButton" cpt
   where
-    cpt {state, onMessage, offMessage, onClick} _ = do
+    cpt {state, onMessage, offMessage, onClick, style} _ = do
       let (toggled /\ _) = state
 
-      pure $ H.button { className: "btn btn-outline-light " <> cls toggled
+      pure $ H.button { className: "btn btn-outline-" <> style <> " " <> cls toggled
                       , on: {click: onClick}
                       } [ R2.small {} [ H.text (text onMessage offMessage toggled) ] ]
 
@@ -56,6 +57,7 @@ controlsToggleButton state =
     , onMessage: "Hide Controls"
     , offMessage: "Show Controls"
     , onClick: \_ -> snd state not
+    , style: "light"
     }
 
 type EdgesButtonProps = (
@@ -69,14 +71,14 @@ edgesToggleButtonCpt :: R.Component EdgesButtonProps
 edgesToggleButtonCpt = R.hooksComponentWithModule thisModule "edgesToggleButton" cpt
   where
     cpt {state: (state /\ setState)} _ = do
-      pure $ H.button { className: "btn btn-outline-light " <> cls state
+      pure $ H.button { className: "btn btn-outline-primary " <> cls state
                       , on: { click: onClick setState }
                       } [ R2.small {} [ H.text (text state) ] ]
 
     text s = if SigmaxTypes.edgeStateHidden s then "Show edges" else "Hide edges"
 
-    cls SigmaxTypes.EShow = "active"
-    cls _ = ""
+    cls SigmaxTypes.EShow = ""
+    cls _ = "active"
 
     -- TODO: Move this to Graph.purs to the R.useEffect handler which renders nodes/edges
     onClick setState _ = setState SigmaxTypes.toggleShowEdgesState
@@ -88,6 +90,7 @@ louvainToggleButton state =
     , onMessage: "Louvain off"
     , offMessage: "Louvain on"
     , onClick: \_ -> snd state not
+    , style: "primary"
     }
 
 multiSelectEnabledButton :: R.State Boolean -> R.Element
@@ -97,6 +100,7 @@ multiSelectEnabledButton state =
     , onMessage: "Single-node"
     , offMessage: "Multi-node"
     , onClick: \_ -> snd state not
+    , style : "primary"
     }
 
 type ForceAtlasProps = (
@@ -110,7 +114,7 @@ pauseForceAtlasButtonCpt :: R.Component ForceAtlasProps
 pauseForceAtlasButtonCpt = R.hooksComponentWithModule thisModule "forceAtlasToggleButton" cpt
   where
     cpt {state: (state /\ setState)} _ = do
-      pure $ H.button { className: "btn btn-outline-light " <> cls state
+      pure $ H.button { className: "btn btn-outline-primary " <> cls state
                       , on: { click: onClick setState }
                       } [ R2.small {} [ H.text (text state) ] ]
 
@@ -132,6 +136,7 @@ treeToggleButton state =
     , onMessage: "Hide Tree"
     , offMessage: "Show Tree"
     , onClick: \_ -> snd state not
+    , style: "light"
     }
 
 sidebarToggleButton :: R.State GET.SidePanelState -> R.Element

src/Gargantext/Components/Nodes/Home.purs

@@ -84,7 +84,7 @@ homeLayoutCpt = R.hooksComponentWithModule thisModule "homeLayout" cpt
                                                                           }
                                                            ]
 
-           , H.div {className:"center"}
+           , H.div {className:"col-12 d-flex justify-content-center"}
                    [ H.h1 {} [ -- H.span {className: "fa fa-star-o"} []
                               H.text ""
                              ]
@@ -281,7 +281,7 @@ homeLayoutCpt = R.hooksComponentWithModule thisModule "homeLayout" cpt
                       --}
 
 
-        video fileDuration = H.div {className:"center"}
+        video fileDuration = H.div {className:"col-12 d-flex justify-content-center"}
                                    [ H.video { src: "http://dl.gargantext.org/" <> fileDuration
                                      , title: "tutorial video here"
                                      , id: "source_" <> fileDuration
@@ -292,7 +292,7 @@ homeLayoutCpt = R.hooksComponentWithModule thisModule "homeLayout" cpt
                                    } [H.text "Sorry your browser is not compatible: use Firefox or Chromium instead."]
                                    ]
 
-        joinButton = H.div { className:"flex-space-around center" 
+        joinButton = H.div { className:"flex-space-around d-flex justify-content-center" 
                        , paddingTop: "100px"
                        , paddingBottom: "100px"
                        }

src/Gargantext/Components/Nodes/Lists/Tabs.purs

@@ -156,7 +156,7 @@ ngramsViewCpt = R.hooksComponentWithModule thisModule "ngramsView" cpt
 
         charts params CTabTerms (chartType /\ setChartType) _ = [
           H.div {className: "row"}
-                [ H.div {className: "col-6 ml-auto mr-auto"}
+                [ H.div {className: "col-12 d-flex justify-content-center"}
                   [ H.img { src: "images/Gargantextuel-212x300.jpg"
                           , id: "funnyimg"
                         }

src/sass/_annotation.sass

+// $annotation-candidate-color: #aaa
+// $annotation-graph-color: #0f0
+// $annotation-stop-color: #f00
+
+// Copied from bootstrap's bg-warning, bg-success, bg-danger:
+$annotation-candidate-color: #FF9800
+$annotation-graph-color: #43A047
+$annotation-stop-color: #E53935
+
+@mixin lg2($color1, $color2)
+    background-image: linear-gradient(rgba($color1, 0.5), rgba($color1, 0.5)), linear-gradient(rgba($color2, 0.5), rgba($color2, 0.5))
+
+@mixin lg3($color1, $color2, $color3)
+    background-image: linear-gradient(rgba($color1, 0.34), rgba($color1, 0.34)), linear-gradient(rgba($color2, 0.33), rgba($color2, 0.33)), linear-gradient(rgba($color3, 0.33), rgba($color3, 0.33))
+
+.annotation-run
+  cursor: pointer
+
+  &.candidate-term.graph-term.stop-term
+    color: #000
+    @include lg3($annotation-candidate-color, $annotation-graph-color, $annotation-stop-color)
+
+  &.candidate-term.graph-term
+    color: #000
+    @include lg2($annotation-candidate-color, $annotation-graph-color)
+
+  &.candidate-term.stop-term
+    color: #000
+    @include lg2($annotation-candidate-color, $annotation-stop-color)
+
+  &.graph-term.stop-term
+    color: #000
+    @include lg2($annotation-graph-color, $annotation-stop-color)
+
+  &.candidate-term
+    color: #000
+    background-color: $annotation-candidate-color
+
+  &.graph-term
+    color: #000
+    background-color: $annotation-graph-color
+
+  &.stop-term
+    color: #000
+    background-color: $annotation-stop-color
+
+.context-menu
+  .candidate-term
+    color: #000
+    background-color: $annotation-candidate-color
+
+  .graph-term
+    color: #000
+    background-color: $annotation-graph-color
+
+  .stop-term
+    color: #000
+    background-color: $annotation-stop-color

src/sass/_styles.sass

@@ -30,6 +30,7 @@
 .table
   tr
     td
+      color: #005a9aff
       .active
         font-weight: bold
         text-decoration: underline
@@ -48,3 +49,8 @@
 
 .search-bar
   margin: 10px
+
+.body
+  ul
+    li
+      color: #005a9aff

src/sass/_tree.sass

@@ -5,6 +5,7 @@ li
   .leaf
     display: flex
     flex-direction: row
+    color: #005a9aff
 
     .folder-icon
       padding: 0 2 0 2
@@ -105,7 +106,6 @@ li
     margin-top: 1px
     &.node-type-valid
       .text
-        color: blue
         text-decoration: underline
 
 // based on https://codeburst.io/how-to-pure-css-pie-charts-w-css-variables-38287aea161e