# HG changeset patch # User veltr # Date 1354708163 -3600 # Node ID 6df5fbe0fead6753a73824968aa3864f520c1f63 # Parent b92079bd8d3836cc7155d5d326da87ed1b38d2f9 Some more small changes diff -r b92079bd8d38 -r 6df5fbe0fead integration/css/common.css --- a/integration/css/common.css Wed Dec 05 12:23:38 2012 +0100 +++ b/integration/css/common.css Wed Dec 05 12:49:23 2012 +0100 @@ -980,7 +980,13 @@ -webkit-box-shadow: inset 1px 1px 1px #808080; box-shadow: inset 1px 1px 1px #808080; } - +.active .media-segment-section, +.media-segment:hover .media-segment-section, +.list-video .frise-segment.active { + -moz-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; + -webkit-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; + box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; +} .media-segment-popin h3, .media-found-popin h3{ padding: 0; color: #de2500; diff -r b92079bd8d38 -r 6df5fbe0fead integration/css/players.css --- a/integration/css/players.css Wed Dec 05 12:23:38 2012 +0100 +++ b/integration/css/players.css Wed Dec 05 12:49:23 2012 +0100 @@ -103,12 +103,6 @@ position: relative; } -.active .media-segment-section, .media-segment:hover .media-segment-section { - -moz-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; - -webkit-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; - box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; -} - .mashup-link { display: none; font-size: 13px; diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/locale/en/LC_MESSAGES/django.mo Binary file src/hashcut/locale/en/LC_MESSAGES/django.mo has changed diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/locale/en/LC_MESSAGES/django.po --- a/src/hashcut/locale/en/LC_MESSAGES/django.po Wed Dec 05 12:23:38 2012 +0100 +++ b/src/hashcut/locale/en/LC_MESSAGES/django.po Wed Dec 05 12:49:23 2012 +0100 @@ -50,11 +50,11 @@ #: templates/mashup_content.html:6 #, python-format msgid "Playing video %(title)s" -msgstr "Playing Video “%(title)s”" +msgstr "Playing source “%(title)s”" #: templates/mashup_content.html:46 msgid "Video" -msgstr "Video" +msgstr "Source video" #: templates/mashup_content.html:79 templates/mashup_edit.html:128 #: templates/mashup_hashcut.html:78 diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/locale/fr/LC_MESSAGES/django.mo Binary file src/hashcut/locale/fr/LC_MESSAGES/django.mo has changed diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/locale/fr/LC_MESSAGES/django.po --- a/src/hashcut/locale/fr/LC_MESSAGES/django.po Wed Dec 05 12:23:38 2012 +0100 +++ b/src/hashcut/locale/fr/LC_MESSAGES/django.po Wed Dec 05 12:49:23 2012 +0100 @@ -50,11 +50,11 @@ #: templates/mashup_content.html:6 #, python-format msgid "Playing video %(title)s" -msgstr "Lecture de la Vidéo « %(title)s »" +msgstr "Lecture de la source « %(title)s »" #: templates/mashup_content.html:46 msgid "Video" -msgstr "Vidéo" +msgstr "Vidéo source" #: templates/mashup_content.html:79 templates/mashup_edit.html:128 #: templates/mashup_hashcut.html:78 diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/static/hashcut/bpi/css/common.css --- a/src/hashcut/static/hashcut/bpi/css/common.css Wed Dec 05 12:23:38 2012 +0100 +++ b/src/hashcut/static/hashcut/bpi/css/common.css Wed Dec 05 12:49:23 2012 +0100 @@ -980,7 +980,13 @@ -webkit-box-shadow: inset 1px 1px 1px #808080; box-shadow: inset 1px 1px 1px #808080; } - +.active .media-segment-section, +.media-segment:hover .media-segment-section, +.list-video .frise-segment.active { + -moz-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; + -webkit-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; + box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; +} .media-segment-popin h3, .media-found-popin h3{ padding: 0; color: #de2500; diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/static/hashcut/bpi/css/players.css --- a/src/hashcut/static/hashcut/bpi/css/players.css Wed Dec 05 12:23:38 2012 +0100 +++ b/src/hashcut/static/hashcut/bpi/css/players.css Wed Dec 05 12:49:23 2012 +0100 @@ -103,12 +103,6 @@ position: relative; } -.active .media-segment-section, .media-segment:hover .media-segment-section { - -moz-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; - -webkit-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; - box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; -} - .mashup-link { display: none; font-size: 13px; diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/static/hashcut/iri/css/common.css --- a/src/hashcut/static/hashcut/iri/css/common.css Wed Dec 05 12:23:38 2012 +0100 +++ b/src/hashcut/static/hashcut/iri/css/common.css Wed Dec 05 12:49:23 2012 +0100 @@ -980,7 +980,13 @@ -webkit-box-shadow: inset 1px 1px 1px #808080; box-shadow: inset 1px 1px 1px #808080; } - +.active .media-segment-section, +.media-segment:hover .media-segment-section, +.list-video .frise-segment.active { + -moz-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; + -webkit-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; + box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; +} .media-segment-popin h3, .media-found-popin h3{ padding: 0; color: #de2500; diff -r b92079bd8d38 -r 6df5fbe0fead src/hashcut/static/hashcut/iri/css/players.css --- a/src/hashcut/static/hashcut/iri/css/players.css Wed Dec 05 12:23:38 2012 +0100 +++ b/src/hashcut/static/hashcut/iri/css/players.css Wed Dec 05 12:49:23 2012 +0100 @@ -103,12 +103,6 @@ position: relative; } -.active .media-segment-section, .media-segment:hover .media-segment-section { - -moz-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; - -webkit-box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; - box-shadow: inset 0 0 2px 2px #fc00ff, 0 0 2px #fc00ff; -} - .mashup-link { display: none; font-size: 13px;