From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 8 Apr 2012 20:00:11 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/themes
X-Git-Tag: LCARStrek-2.9~9
X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=76c1877e1d85ee27ea6e5da23923778a69442d78;hp=-c

Merge branch 'master' of linz:/srv/git/themes
---

76c1877e1d85ee27ea6e5da23923778a69442d78
diff --combined EarlyBlue/global/media/videocontrols.css
index 78b9764b,9d85d889..e0b56c65
--- a/EarlyBlue/global/media/videocontrols.css
+++ b/EarlyBlue/global/media/videocontrols.css
@@@ -40,10 -40,7 +40,7 @@@
  }
  
  .fullscreenButton {
-   background-color: transparent;
-   list-style-image: url("chrome://global/skin/media/fullscreenButton.png");
-   -moz-image-region: rect(0px, 16px, 16px, 0px);
-   -moz-appearance: none;
+   background: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0) no-repeat center;
    margin: 0;
    padding: 0;
    min-height: 28px;
@@@ -52,7 -49,7 +49,7 @@@
  }
  
  .fullscreenButton[fullscreened] {
-   -moz-image-region: rect(0px, 32px, 16px, 16px);
+   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16);
  }
  
  .volumeStack {
@@@ -178,7 -175,7 +175,7 @@@
    font-size: 10px;
    font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
    text-shadow: rgba(102,102,153, 0.3) 0 1px;
-   padding-top: 2px;
+   padding-top: 5px;
  }
  
  .statusOverlay {
@@@ -205,24 -202,6 +202,24 @@@
    background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
  }
  
 +/* Overlay Play button */
 +.clickToPlay {
 +  width: 64px;
 +  height: 64px;
 +  -moz-box-pack: center;
 +  -moz-box-align: center;
 +  opacity: 0.7;
 +  background-image: url("chrome://global/skin/media/clicktoplay-bgtexture.png"),
 +                    url("chrome://global/skin/media/videoClickToPlayButton.svg");
 +  background-repeat: repeat, no-repeat;
 +  background-position: center, center;
 +  background-size: auto, 64px 64px;
 +  background-color: hsla(0,0%,10%,.5);
 +}
 +.clickToPlay:hover {
 +  opacity: 1;
 +}
 +
  /* Statistics formatting */
  html|*.statsDiv {
    position: relative;
@@@ -249,18 -228,6 +246,18 @@@ html|table 
  }
  
  /* CSS Transitions */
 +.clickToPlay {
 +  -moz-transition-property: opacity, background-size;
 +  -moz-transition-duration: 400ms, 400ms;
 +}
 +.clickToPlay[fadeout] {
 +  background-size: auto, 192px 192px;
 +  opacity: 0;
 +}
 +.clickToPlay[fadeout][immediate] {
 +  -moz-transition-property: opacity, background-size;
 +  -moz-transition-duration: 0s, 0s;
 +}
  .controlBar:not([immediate]) {
    -moz-transition-property: opacity;
    -moz-transition-duration: 200ms;
diff --combined EarlyBlue/mozapps/extensions/extensions.css
index 89e58b56,21f90ab3..e7e951a7
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@@ -90,7 -90,7 +90,7 @@@
    border-bottom: 1px solid #9999CC;
  }
  
- @media all and (max-width: 600px) {
+ @media (max-width: 600px) {
    .global-warning-text {
      display: none;
    }
@@@ -239,7 -239,7 +239,7 @@@
  }
  
  /* Maximize the size of the viewport when the window is small */
- @media all and (max-width: 800px) {
+ @media (max-width: 800px) {
    .category-name {
      display: none;
    }
@@@ -449,7 -449,7 +449,7 @@@
  }
  
  .addon[active="false"] .icon {
 -/*  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale"); */
 +  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
  }
  
  .addon-view[type="theme"] .icon {
@@@ -596,7 -596,7 +596,7 @@@
  }
  
  .addon[active="false"] {
 -  /* background-color: rgba(135, 135, 135, 0.1); */
 +  background-color: #DDDDDD;
  }
  
  .addon-view[active="false"],
@@@ -643,11 -643,11 +643,11 @@@
  }
  
  .addon[active="false"][selected] {
 -  color: #000000;
 +  color: #AAAAAA;
  }
  
  .addon[active="false"][selected] .name-container {
 -  color: #222233;
 +  color: #DDDDDD;
  }
  
  
@@@ -739,9 -739,13 +739,13 @@@
    -moz-margin-start: 0;
  }
  
- #detail-icon {
+ #detail-icon-container {
+   width: 64px;
    -moz-margin-end: 10px;
    margin-top: 6px;
+ }
+ 
+ #detail-icon {
    max-width: 64px;
    max-height: 64px;
  }
@@@ -819,6 -823,7 +823,7 @@@
  }
  
  #detail-grid > columns > column:first-child {
+   min-width: 15em;
    max-width: 25em;
  }
  
diff --combined LCARStrek/global/media/videocontrols.css
index 3220dcaf,2e2b7131..19ee4de1
--- a/LCARStrek/global/media/videocontrols.css
+++ b/LCARStrek/global/media/videocontrols.css
@@@ -59,10 -59,7 +59,7 @@@
  }
  
  .fullscreenButton {
-   background-color: transparent;
-   list-style-image: url("chrome://global/skin/media/fullscreenButton.png");
-   -moz-image-region: rect(0px, 16px, 16px, 0px);
-   -moz-appearance: none;
+   background: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0) no-repeat center;
    margin: 0;
    padding: 0;
    min-height: 28px;
@@@ -72,16 -69,16 +69,16 @@@
  
  .fullscreenButton:hover {
    background-color: rgba(255,207,0,0.75);
-   -moz-image-region: rect(16px, 16px, 32px, 0px);
+   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 16, 16, 32, 0);
  }
  
  .fullscreenButton[fullscreened] {
-   -moz-image-region: rect(0px, 32px, 16px, 16px);
+   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16);
  }
  
  .fullscreenButton[fullscreened]:hover {
    background-color: rgba(255,207,0,0.75);
-   -moz-image-region: rect(16px, 32px, 32px, 16px);
+   background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 16, 32, 32, 16);
  }
  
  .volumeStack {
@@@ -215,7 -212,7 +212,7 @@@
    font-size: 10px;
    font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
    text-shadow: rgba(255,259,0, 0.3) 0 1px;
-   padding-top: 2px;
+   padding-top: 5px;
  }
  
  .statusOverlay {
@@@ -242,24 -239,6 +239,24 @@@
    background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
  }
  
 +/* Overlay Play button */
 +.clickToPlay {
 +  width: 64px;
 +  height: 64px;
 +  -moz-box-pack: center;
 +  -moz-box-align: center;
 +  opacity: 0.7;
 +  background-image: url("chrome://global/skin/media/clicktoplay-bgtexture.png"),
 +                    url("chrome://global/skin/media/videoClickToPlayButton.svg");
 +  background-repeat: repeat, no-repeat;
 +  background-position: center, center;
 +  background-size: auto, 64px 64px;
 +  background-color: hsla(0,0%,10%,.5);
 +}
 +.clickToPlay:hover {
 +  opacity: 1;
 +}
 +
  /* Statistics formatting */
  html|*.statsDiv {
    position: relative;
@@@ -286,18 -265,6 +283,18 @@@ html|table 
  }
  
  /* CSS Transitions */
 +.clickToPlay {
 +  -moz-transition-property: opacity, background-size;
 +  -moz-transition-duration: 400ms, 400ms;
 +}
 +.clickToPlay[fadeout] {
 +  background-size: auto, 192px 192px;
 +  opacity: 0;
 +}
 +.clickToPlay[fadeout][immediate] {
 +  -moz-transition-property: opacity, background-size;
 +  -moz-transition-duration: 0s, 0s;
 +}
  .controlBar:not([immediate]) {
    -moz-transition-property: opacity;
    -moz-transition-duration: 200ms;
diff --combined LCARStrek/mozapps/extensions/extensions.css
index 5d187782,b8e7e4f9..868a43b9
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@@ -90,7 -90,7 +90,7 @@@
    border-bottom: 3px solid #000000;
  }
  
- @media all and (max-width: 600px) {
+ @media (max-width: 600px) {
    .global-warning-text {
      display: none;
    }
@@@ -251,7 -251,7 +251,7 @@@
  }
  
  /* Maximize the size of the viewport when the window is small */
- @media all and (max-width: 800px) {
+ @media (max-width: 800px) {
    .category-name {
      display: none;
    }
@@@ -482,7 -482,7 +482,7 @@@
  }
  
  .addon[active="false"] .icon {
 -/*  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale"); */
 +  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
  }
  
  .addon-view[type="theme"] .icon {
@@@ -629,13 -629,12 +629,13 @@@
  }
  
  .addon[active="false"] {
 -  /* background-color: rgba(135, 135, 135, 0.1); */
 +  background-color: #8050B0;
 +  color: #E7ADE7;
  }
  
 -.addon-view[active="false"],
  .addon-view[active="false"] .name-container {
    color: #E7ADE7;
 +  color: #000000;
  }
  
  .addon-view[notification="warning"] {
@@@ -787,9 -786,13 +787,13 @@@
    -moz-margin-start: 0;
  }
  
- #detail-icon {
+ #detail-icon-container {
+   width: 64px;
    -moz-margin-end: 10px;
    margin-top: 6px;
+ }
+ 
+ #detail-icon {
    max-width: 64px;
    max-height: 64px;
  }
@@@ -863,6 -866,7 +867,7 @@@
  }
  
  #detail-grid {
+   min-width: 15em;
    margin-bottom: 2em;
  }