Changeset 2576 in main


Ignore:
Timestamp:
08/21/13 12:42:05 (6 years ago)
Author:
pcosquer
Message:

branch 2.0: merge commit [2575]

Location:
branches/2.0
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0

    • Property svn:mergeinfo changed
      /trunkmerged: 2575
  • branches/2.0/CHANGES

    r2574 r2576  
    55 * Document3D: fix download of a decomposed STEP file 
    66 * Document3D: fix 3D view of published Document3D (add a missing JavaScript file) 
     7 * Navigate: fix overlapping of fullscreen button and thumbnails list 
  • branches/2.0/docs/en/devel/applications/document3D

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/2.0/openPLM

  • branches/2.0/openPLM/plmapp/static/css/navigate.css

    r2524 r2576  
    145145    display:none; 
    146146    float:right; 
    147     height: 500px; 
     147    height: 100%; 
    148148    z-index:70; 
    149149    position:absolute; 
    150     height: 500px; 
    151150    right:0px; 
    152151    border-left: 1px solid #7f7c7c; 
     
    274273    position: absolute; 
    275274    right: 20px; 
    276     top: 20px; 
     275    top: 30px; 
    277276    z-index : 99; 
    278277    padding: 2px; 
     
    286285    border: 1px solid #242424; 
    287286    right: 10px; 
    288     top: 60px; 
     287    top: 70px; 
    289288    z-index: 99; 
    290289    padding: 3px; 
     
    301300    display: block; 
    302301    top: 5px; 
    303     right: 5px; 
     302    right: 10px; 
    304303} 
    305304 
  • branches/2.0/openPLM/plmapp/static/js/navigate.js

    r2545 r2576  
    9595    if ($("#navThumbnails").is(":hidden")) { 
    9696        $("#navThumbnails").show(); 
    97         $("#FilterNav, #RevisionsNav").css("right", "190px"); 
     97        $("#FilterNav, #RevisionsNav, #full-screen").css("right", "190px"); 
    9898        var width = node.width(); 
    9999        if (node.offset().left + width > $("#navThumbnails").offset().left){ 
     
    106106function hide_thumbnails_panel(){ 
    107107    $("#navThumbnails").hide(); 
    108     $("#FilterNav, #RevisionsNav").css("right", "10px"); 
     108    $("#FilterNav, #RevisionsNav, #full-screen").css("right", "10px"); 
    109109} 
    110110 
     
    131131            $("#navDocument").text(data["doc"]); 
    132132            show_thumbnails_panel($("#" + node_id)); 
    133             list.outerHeight(list.parent().innerHeight() - $("#navDocument").outerHeight()-2); 
     133            list.outerHeight(list.parent().innerHeight() - $("#navDocument").outerHeight()-6); 
    134134        } 
    135135    }); 
     
    640640                $("#main_content, #Navigate").css({"width": "inherit", "height": height+"px"}); 
    641641            } 
     642            var list = $("#thumbnailsList"); 
     643            list.outerHeight(list.parent().innerHeight() - $("#navDocument").outerHeight()-6); 
    642644            center(); 
    643645        }; 
Note: See TracChangeset for help on using the changeset viewer.