From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 24 Jul 2014 13:06:09 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~49
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=91f1a0ed2c2b3be7377cce7182731a2339962304;hp=-c;p=myslice.git

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

91f1a0ed2c2b3be7377cce7182731a2339962304
diff --combined portal/static/css/onelab.css
index 8d6e73e5,4c53cce0..5be1bf37
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@@ -12,7 -12,6 +12,7 @@@ body 
  a, a:active, a:focus {
      outline: 0;
      text-decoration:none;
 +    color:#201E62;
  }
  
  h1 {
@@@ -27,20 -26,13 +27,20 @@@ h1 img 
      margin-right:10px;
  }
  h2 {
 +    margin:0 0 15px 0;
      font-size:14pt;
      color:#333333;
  }
  h3 {
 +    margin:0 0 5px 0;
      font-size:13pt;
      color:#201E62;
  }
 +h4 {
 +    margin:0 0 5px 0;
 +    font-size:12pt;
 +    color:#333333;
 +}
  input[type=text], input[type=password], input[type=email], input[type=tel], input[type=number], select, option {
      min-width:260px;
      padding:6px;
@@@ -69,9 -61,6 +69,9 @@@ div.breadcrumbs 
      color:gray;
      font-size:10pt;
  }
 +.tab-pane {
 +    padding-top:15px;
 +}
  /* buttons */
  button.btn, input.btn {
      padding:6px 10px;
@@@ -380,6 -369,8 +380,8 @@@ a.sl-resources, a.sl-resources:hover 
      padding:2px 4px;
      -moz-border-radius: 4px;
      border-radius: 4px;
+     width:125px;
+     text-align: center;
  }
  a.sl-resources.active, a.sl-resources.active:hover, a.sl-resources.active:focus {
      border:0;
@@@ -703,4 -694,4 +705,4 @@@ div.slogan 
      color:white;
      padding-top:60px;
      text-shadow: 1px 1px #013540;
- }
+ }