Merge branch 'release' into bug-1138
authorBenny Baumann <BenBE@geshi.org>
Sat, 11 Jan 2014 19:10:03 +0000 (20:10 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 11 Jan 2014 19:10:03 +0000 (20:10 +0100)
Conflicts:
www/styles/default.css

1  2 
includes/account.php
includes/notary.inc.php
pages/account/43.php
www/styles/default.css

Simple merge
Simple merge
Simple merge
@@@ -13,9 -14,10 +14,10 @@@ body 
        margin: 0px;
        padding: 0px;
        background: #cccccc;
- /*      url("/siteimages/bg_grad.jpg") fixed;   */
 -/*  url("/siteimages/bg_grad.jpg") fixed;   */
++/*    url("/siteimages/bg_grad.jpg") fixed;   */
  }
  
  /******* hyperlink and anchor tag styles *******/
  
  a:link, a:visited {
@@@ -198,22 -204,22 +204,22 @@@ ul.no_indent 
  }
  */
  
  /************* globalNav styles ****************/
  
- #globalNav{
- position: relative;
- width: 100%;
- min-width: 640px;
- height: 32px;
- color: #cccccc;
- padding: 0px;
- margin: 0px;
background-image:  url("siteimages/glbnav_background.gif");
+ #globalNav {
      position: relative;
      width: 100%;
      min-width: 640px;
      height: 32px;
      color: #cccccc;
      padding: 0px;
      margin: 0px;
      background-image: url("siteimages/glbnav_background.gif");
  }
  
- #globalNav img{
+ #globalNav img {
 -    margin-bottom: -4px;
 +      margin-bottom: -4px;
  }
  
  #gnl {
@@@ -557,18 -571,13 +571,18 @@@ td.greytxt 
        text-align: right;
        vertical-align: bottom;
  }
 -
 +.bold {
 +      font-weight:bold;
 +}
 +.italic {
 +      font-style:italic;
 +}
  .title {
-       background: #E2E2E2;
-       font-weight:BOLD;
+       background: #e2e2e2;
+       font-weight: bold;
        padding: 1px 5px 1px 5px;
-       border: 1px solid #CFCFCF;
-       border-bottom: 3px double #CFCFCF;
+       border: 1px solid #cfcfcf;
+       border-bottom: 3px double #cfcfcf;
        border-top: 1px solid #656565;
        text-align: center;
  }