Merge branch 'layoutnovo' into 'master'

bug fix Collection page



See merge request !78

Gemfile.lock

@@ -215,6 +215,7 @@ GEM
       mimemagic (= 0.3.0)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
+    pg (0.18.3)
     procto (0.0.2)
     puma (2.14.0)
     rack (1.6.4)
@@ -392,6 +393,7 @@ DEPENDENCIES
   mina
   orientdb4r
   paperclip
+  pg
   puma
   rack-cors
   rack-mini-profiler
@@ -416,6 +418,3 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
   whenever
-
-BUNDLED WITH
-   1.10.6

app/assets/stylesheets/application.scss

@@ -444,10 +444,11 @@ table.tipo1 p {
 
 .left-edge {
   position:absolute;
+  left: -35px;
 }
 
 .set-align {
-	position: relative;
+  position: relative;
 	margin: 5px;
 	padding: 0px 35px;
 	}

config/orientdb.yml

@@ -10,4 +10,4 @@ test:
   database: PortalMEC
   username: admin
   password: admin
-  port: 2480
+  port: 2480
\ No newline at end of file