# HG changeset patch # User veltr # Date 1372238540 -7200 # Node ID 1da0c1382b07d7021f48e26321b88a3dec384a42 # Parent 3f480bb52daaff95d4778822f07b4c575116cdf9 Cleaning diff -r 3f480bb52daa -r 1da0c1382b07 player/css/styles.css --- a/player/css/styles.css Wed Jun 26 11:13:10 2013 +0200 +++ b/player/css/styles.css Wed Jun 26 11:22:20 2013 +0200 @@ -432,12 +432,6 @@ float: left; margin: 0 5px 2px 0; } -.column-group { - column-count: 2; column-gap: 60px; - -moz-column-count: 2; -moz-column-gap: 60px; - -webkit-column-count: 2; -webkit-column-gap: 60px; -} - .text-contents h2 { font-size: 21px; } diff -r 3f480bb52daa -r 1da0c1382b07 player/js/player.js --- a/player/js/player.js Wed Jun 26 11:13:10 2013 +0200 +++ b/player/js/player.js Wed Jun 26 11:22:20 2013 +0200 @@ -547,8 +547,7 @@ } annotationDiv.find(".text-contents a").attr("target","_blank"); annotationDiv.find(".text-contents").css({ - "max-height": - $(".main-video").height() - 140 + "max-height": $(".main-video").height() - 140 }); break; @@ -560,8 +559,7 @@ annotationDiv.find(".link-contents").html( annotationinfo.annotation.content.links.map(linkTemplate).join("") ).css({ - "max-height": - $(".main-video").height() - 140 + "max-height": $(".main-video").height() - 140 }); break;