Merge branch 'master' of /srv/git/ipfire.org

Conflicts:

	www/include/style.css

diff --cc www/include/style.css
index e4618d708b10122d277af3e590e727d98fb2d0ad,3b36d52bc6575f4e37d89124a735cfef430a2eda..73cfb0144cd34901a5a32ac380c93cf1252c3abc
--- 1/www/include/style.css
--- 2/www/include/style.css
+++ b/www/include/style.css
@@@ -853,109 -853,24 +853,132 @@@ table.translate td.lang 
        background-color: #F1F1F1;
  }
  
 -}
++<<<<<<< HEAD:www/include/style.css
 +#screenshots {
 +      background-color: #444;
 +      padding: 10px;
 +      width: 520px;
 +}
 +#screenshots ul { list-style: none; }
 +#screenshots ul li { display: inline; }
 +#screenshots ul img {
 +      border: 5px solid #3e3e3e;
 +      border-width: 5px 5px 20px;
 +}
 +#screenshots ul a:hover img {
 +      border: 5px solid #fff;
 +      border-width: 5px 5px 20px;
 +      color: #fff;
 +}
 +#screenshots ul a:hover { color: #fff; }
 +
 +#jquery-overlay {
 +      position: absolute;
 +      top: 0;
 +      left: 0;
 +      z-index: 90;
 +      width: 100%;
 +      height: 500px;
 +}
 +#jquery-lightbox {
 +      position: absolute;
 +      top: 0;
 +      left: 0;
 +      width: 100%;
 +      z-index: 100;
 +      text-align: center;
 +      line-height: 0;
 +}
 +#jquery-lightbox a img { border: none; }
 +#lightbox-container-image-box {
 +      position: relative;
 +      background-color: #fff;
 +      width: 250px;
 +      height: 250px;
 +      margin: 0 auto;
 +}
 +#lightbox-container-image { padding: 10px; }
 +#lightbox-loading {
 +      position: absolute;
 +      top: 40%;
 +      left: 0%;
 +      height: 25%;
 +      width: 100%;
 +      text-align: center;
 +      line-height: 0;
 +}
 +#lightbox-nav {
 +      position: absolute;
 +      top: 0;
 +      left: 0;
 +      height: 100%;
 +      width: 100%;
 +      z-index: 10;
 +}
 +#lightbox-container-image-box > #lightbox-nav { left: 0; }
 +#lightbox-nav a { outline: none;}
 +#lightbox-nav-btnPrev, #lightbox-nav-btnNext {
 +      width: 49%;
 +      height: 100%;
 +      zoom: 1;
 +      display: block;
 +}
 +#lightbox-nav-btnPrev { 
 +      left: 0; 
 +      float: left;
 +}
 +#lightbox-nav-btnNext { 
 +      right: 0; 
 +      float: right;
 +}
 +#lightbox-container-image-data-box {
 +      font: 10px Verdana, Helvetica, sans-serif;
 +      background-color: #fff;
 +      margin: 0 auto;
 +      line-height: 1.4em;
 +      overflow: auto;
 +      width: 100%;
 +      padding: 0 10px 0;
 +}
 +#lightbox-container-image-data {
 +      padding: 0 10px; 
 +      color: #666; 
 +}
 +#lightbox-container-image-data #lightbox-image-details { 
 +      width: 70%; 
 +      float: left; 
 +      text-align: left; 
 +}     
 +#lightbox-image-details-caption { font-weight: bold; }
 +#lightbox-image-details-currentNumber {
 +      display: block; 
 +      clear: left; 
 +      padding-bottom: 1.0em;  
 +}                     
 +#lightbox-secNav-btnClose {
 +      width: 66px; 
 +      float: right;
 +      padding-bottom: 0.7em;  
 +}
++
+ /* IPFire Download Button */
+ .button {
+     background: url(/images/buttons/download_core_96x320.png);
+     background-repeat: no-repeat;
+     background-position: right;
+     width: 700px;
+     height: 96px;
+ }
+ .button a, .button a:link, .button  a:visited {
+       color:#333;
+       text-decoration:none;
+ }
+ .button a:hover {
+       text-decoration: underline;
+ }
+ .button_text {
+       color:#333; 
+       font-size: 20px !important;
+       text-shadow: #666 1px 2px 2px;
+     padding: 51px 0px 0px 430px;
++}