[linterna-magica-commit] [373] Fixed height for the interface.

[Ivaylo Valkov]

Revision: 373
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=373
Author:   valkov
Date:     2012-12-31 08:56:41 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
Fixed height for the interface. The value by which the height is
decreased is the correct one for the new/current interface.

Modified Paths:
--------------
    trunk/data/style/template.css
    trunk/src/lm_create_video_object.js

Modified: trunk/data/style/template.css
===================================================================
--- trunk/data/style/template.css       2012-12-30 18:05:10 UTC (rev 372)
+++ trunk/data/style/template.css       2012-12-31 08:56:41 UTC (rev 373)
@@ -57,18 +57,17 @@
 }
 
 /* The header div */
-body div#top_content_box div.dmpi_video_playerv4
-.linterna-magica-controls-time-slider {
-    text-align: left  !important;
-    color: #333333  !important;
-    background: gray url('header-background.png') 0 0 repeat-x !important;
-    height: 24px  !important;
-    line-height: 24px  !important;
-    border: solid #666666  !important;
-    border-width: 1px 0px  !important;
-    position: relative  !important;
-    top: 0px !important;
-}
+/* body div#top_content_box div.dmpi_video_playerv4 */
+/* .linterna-magica-controls-time-slider { */
+/*     text-align: left  !important; */
+/*     color: #333333  !important; */
+/*     background: gray url('header-background.png') 0 0 repeat-x !important; 
*/
+/*     line-height: 24px  !important; */
+/*     border: solid #666666  !important; */
+/*     border-width: 1px 0px  !important; */
+/*     position: relative  !important; */
+/*     top: 0px !important; */
+/* } */
 
 div.linterna-magica-controls-time-slider {
     height: 12px !important;

Modified: trunk/src/lm_create_video_object.js
===================================================================
--- trunk/src/lm_create_video_object.js 2012-12-30 18:05:10 UTC (rev 372)
+++ trunk/src/lm_create_video_object.js 2012-12-31 08:56:41 UTC (rev 373)
@@ -38,8 +38,14 @@
 
     // Decrease the size for the object, so it all fits in the space
     // allocated by the website
-    object_data.outer_height = object_data.height;
-    object_data.height -= 48;
+    // height of all controls + borders
+    // 36 = 12 + 22 + 2
+    // 12 - time slider
+    // 22 - control barr
+    // 2 - borders 
+    // -1 = bottom border of the object
+    object_data.outer_height = object_data.height-1;
+    object_data.height -= this.controls ? 36 : 24;
 
   
     var toggle_plugin = null;