# HG changeset patch # User Chloe Laisne # Date 1475432638 -7200 # Node ID e3217b6adea3bd76cae8fdf8b81517713845a91d # Parent f5690d91835874fe3940c32c6b723bbc2c36c2c6 Display footer toolbar only when transcript or notice is open diff -r f5690d918358 -r e3217b6adea3 cms/app-client/app/styles/app.scss --- a/cms/app-client/app/styles/app.scss Sun Oct 02 19:14:07 2016 +0200 +++ b/cms/app-client/app/styles/app.scss Sun Oct 02 20:23:58 2016 +0200 @@ -12,7 +12,6 @@ $content-height: 600px; - body { background-color: $medium-white; } @@ -73,6 +72,7 @@ color: $dark-grey; box-sizing: border-box; background-color: $medium-white; + position: relative; } body.videoscreen .corpus-app-container { @@ -138,6 +138,7 @@ .corpus-app-container.window { overflow: scroll; + height: 560px; } .corpus-app-modal { diff -r f5690d918358 -r e3217b6adea3 cms/app-client/app/styles/components/filter-component.scss --- a/cms/app-client/app/styles/components/filter-component.scss Sun Oct 02 19:14:07 2016 +0200 +++ b/cms/app-client/app/styles/components/filter-component.scss Sun Oct 02 20:23:58 2016 +0200 @@ -2,7 +2,8 @@ background-color: $medium-blue; color: $light-white; position: relative; - padding: 14px 20px; + padding: 0px 20px; + overflow: hidden; } .filter-component:empty { @@ -25,7 +26,7 @@ .filter-component ul { list-style: none; padding: 0px; - margin: 0px; + margin: 14px 0px; font-size: 0px; color: $dark-blue; } diff -r f5690d918358 -r e3217b6adea3 cms/app-client/app/styles/components/toolbar-component.scss --- a/cms/app-client/app/styles/components/toolbar-component.scss Sun Oct 02 19:14:07 2016 +0200 +++ b/cms/app-client/app/styles/components/toolbar-component.scss Sun Oct 02 20:23:58 2016 +0200 @@ -1,6 +1,6 @@ .toolbar-component { height: 40px; - width: 100%; + width: 50%; line-height: 40px; text-transform: none; padding: 0px 15px; @@ -8,6 +8,9 @@ color: $light-white; font-size: 13px; background-color: $dark-blue; + box-sizing: border-box; + position: absolute; + bottom: 0px; } .toolbar-component ul { diff -r f5690d918358 -r e3217b6adea3 cms/app-client/app/templates/application.hbs --- a/cms/app-client/app/templates/application.hbs Sun Oct 02 19:14:07 2016 +0200 +++ b/cms/app-client/app/templates/application.hbs Sun Oct 02 20:23:58 2016 +0200 @@ -1,26 +1,31 @@ {{player-component action="changeDocument" document=currentItem}}
+ {{#if notice}}
{{ notice-component class="overlay" model=noticeModel }}
{{/if}} +
- {{#if (if-and player.window (eq player.window 'notice'))}} - {{ notice-component }} - {{else if (if-and player.window player.transcript (eq player.window 'transcript'))}} - {{ transcript-component }} + {{#if player.window}} + {{#if (eq player.window 'notice')}} + {{ notice-component }} + {{else if (if-and (eq player.window 'transcript') player.transcript)}} + {{ transcript-component }} + {{/if}} {{else}} {{ outlet }} {{/if}}
+ {{#if player.window}} + {{toolbar-component}} + {{/if}}
{{ filter-component }} {{ playlist-component notice=notice model=model }}
-
- -{{toolbar-component}} \ No newline at end of file + \ No newline at end of file