From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 13 Nov 2013 05:29:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~113^2~9
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=e6184193b74ac6d5c52289546dae9121bdd99008

Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
	unfold/page.py
	unfold/static/css/onelab_marko.css
---

e6184193b74ac6d5c52289546dae9121bdd99008
diff --cc unfold/page.py
index 024bd449,bc44cd1a..7c6d60bd
--- a/unfold/page.py
+++ b/unfold/page.py
@@@ -33,9 -33,8 +33,10 @@@ class Page
          # queue of queries with maybe a domid, see enqueue_query
          self._queue=[]
          # global prelude object
 +        self.prelude=Prelude(css_files='css/plugin.css')
 +        print "Loading... CSS OneLab"
 +        self.prelude=Prelude(css_files='css/onelab_marko.css')
+ #        self.prelude=Prelude(css_files=['css/plugin.css','css/onelab_marko.css',])
 -        self.prelude=Prelude()
  
      # record known plugins hashed on their domid
      def record_plugin (self, plugin):
diff --cc unfold/static/css/onelab_marko.css
index 7cab5e0e,7e19d780..ab82706b
--- a/unfold/static/css/onelab_marko.css
+++ b/unfold/static/css/onelab_marko.css
@@@ -9,20 -5,12 +5,18 @@@
  /* GENERAL */
  
  .container {
 -    padding: 0 !important;
 -/*    color: #fff; */
 +	padding: 0 !important;
 +	color: #fff;
 +    background: url(http://new.fit-equipex.fr/images/background.jpg) no-repeat;
 +    margin: 0;
 +    width: 100%;
 +    max-width: 100%;
 +    min-height: 100%;
 +    height: 100%;
  }
  
- .container h1 {
- 	color: #fff !important;
- 	font-family: Ubuntu;
- 	margin-top: 60px;
+ .container h1, .container h2 {
+     color: #fff !important;
  }
  
  div.plugin-outline-complete, 
@@@ -61,30 -49,22 +55,30 @@@ a.plugin-tooltip:hover 
  
  
  /* LIST VIEW */
 -
 +div.well-lg {
 +    background-color: rgba(168, 32, 202, 0.5) !important;
 +}
 +div.onelab-title {
 +    background-color: rgba(168, 32, 202, 0.5) !important;
 +}
 +div.well {
 +    background-color: rgba(0, 0, 0, 0.5) !important;
 +}
  h2.well.well-lg {
- 	border-radius:0;
- 	border: 0;
- 	font-family: Ubuntu, arial, sans-serif;
- 	/* text-transform: ; */
- 	font-weight: normal;
- 	font-size: 40px;
- 	/* color: #30196d; */
+     border-radius:0;
+     border: 0;
+     font-family: Ubuntu, arial, sans-serif;
+     /* text-transform: ; */
+     font-weight: normal;
+     font-size: 40px;
+     /* color: #30196d; */
      color: white;
- 	margin-bottom: 0px;
- 	margin-top: 0;
- 	padding: 40px;
- 	opacity: 1;
- 	text-align: center;
- 	background-color: #30196d;
+     margin-bottom: 0px;
+     margin-top: 0;
+     padding: 40px;
+     opacity: 1;
+     text-align: center;
+     background-color: #30196d;
  }
  
  #complete-resources {