Merge pull request #19 from josemazo/master

Pull-request for start using the 'develop' branch in the original repo
CulturePlex · Mar 31, 2014 · 81bb026 · 81bb026
2 parents be79e79 + f17947d
commit 81bb026
Show file tree

Hide file tree

Showing 43 changed files with 4,460 additions and 29,589 deletions.
diff --git a/.travis.yml.orig b/.travis.yml.orig
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -31,11 +31,11 @@ git+git://github.com/ghewgill/pydkim.git
 python-dateutil==2.1
 python-rexster==0.1.1
 requests==2.0.1
-selenium==2.37.2
+selenium==2.40.0
 sh==1.09
 simplejson==2.6.2
 six==1.2.0
-splinter==0.5.4
+splinter==0.6.0
 stripe==1.7.8
 ujson==1.23
 wsgiref==0.1.2
diff --git a/requirements_test.txt.orig b/requirements_test.txt.orig
diff --git a/sylva/base/static/css/base.css b/sylva/base/static/css/base.css
@@ -1515,14 +1515,29 @@ table.content-table {
     height: 36px;
 }
 
-.sigma-checkbox {
-    display: inline-block;
-    position: relative;
+#sigma-graph-layout {
+    width: 125px;
+}
+
+#sigma-node-size {
+    width: 120px;
+}
+
+#sigma-edge-shape {
+    width: 115px;
+}
+
+.graph-controls select {
+    height: 34px;
+    margin-top: -5px;
     margin-left: 12px;
+    border: 3px solid #D8E8DE;
+    color: #555;
+    display: inline-block;
 }
 
-.sigma-checkbox input[type="checkbox"] {
-    margin-top: 6px;
+.sigma-checkbox {
+    margin-left: 12px;
 }
 
 .sigma-checkbox label {
@@ -1532,6 +1547,30 @@ table.content-table {
     margin-left: 2px;
 }
 
+.zoom {
+    margin-bottom: 5px;
+}
+
+.zoom-left {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    -moz-border-top-right-radius: 0;
+    -moz-border-bottom-right-radius: 0;
+    -webkit-border-top-right-radius: 0;
+    -webkit-border-bottom-right-radius: 0;
+    margin-left: -5px;
+}
+
+.zoom-right {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    -moz-border-top-left-radius: 0;
+    -moz-border-bottom-left-radius: 0;
+    -webkit-border-top-left-radius: 0;
+    -webkit-border-bottom-left-radius: 0;
+    margin-left: -14px;
+}
+
 #sigma-wrapper {
     display: block;
     float: right;

diff --git a/sylva/base/static/img/rarr2.gif b/sylva/base/static/img/rarr2.gif