From bea9f4f781996f0d2f028c2d42022547b9ca9b62 Mon Sep 17 00:00:00 2001 From: Jonathan Baecker Date: Wed, 22 Apr 2020 17:19:41 +0200 Subject: [PATCH] work on layout --- ffplayout/frontend/pages/control.vue | 164 +++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 21 deletions(-) diff --git a/ffplayout/frontend/pages/control.vue b/ffplayout/frontend/pages/control.vue index a50fd31b..d0567570 100644 --- a/ffplayout/frontend/pages/control.vue +++ b/ffplayout/frontend/pages/control.vue @@ -11,7 +11,7 @@ - +
{{ timeStr }} @@ -33,8 +33,38 @@ - - control + + + +
+ + + +
+
+ +
+ + + +
+
+
+ +
+ + + +
+
+ +
+ + + +
+
+ @@ -111,7 +141,7 @@ - + Start @@ -120,13 +150,13 @@ Play - + Duration - + In - + Out @@ -139,7 +169,7 @@ - + {{ item.begin | secondsToTime }} @@ -150,13 +180,13 @@ - + {{ item.duration | secondsToTime }} - + {{ item.in | secondsToTime }} - + {{ item.out | secondsToTime }} @@ -300,30 +330,32 @@ export default { } .control-row { - height: 288px; + min-height: 254px; } .player-col { max-width: 542px; min-width: 380px; + margin-bottom: 6px; } .control-col { height: 100%; + min-height: 254px; } -.time-row { - height: 50%; +.stats-row { + height: 100%; min-width: 470px; } .time-col { position: relative; background: #32383E; - margin: 0 6px 4px 0; + height: calc(50% - 3px); + margin: 0 6px 6px 0; text-align: center; border-radius: 0.25rem; - height: 100%; } .time-str { @@ -334,24 +366,110 @@ export default { transform: translateY(-50%); font-family: 'DigitalNumbers-Regular'; font-size: 4.5em; - letter-spacing: -.15em; + letter-spacing: -.18em; + padding-right: 14px; } .current-clip { background: #32383E; - height: 50%; + height: calc(50% - 3px); margin-right: 6px; padding: 15px; border-radius: 0.25rem; } +.current-clip-text { + height: 70%; +} + +.current-clip-progress { + top: 80%; +} + +.control-unit-col { + min-width: 380px; +} + +.control-unit-row { + background: #32383E; + height: 100%; + margin-right: 0; + border-radius: 0.25rem; + text-align: center; +} + +.control-unit-row .col { + position: relative; + height: 50%; + min-height: 90px; +} + +.control-unit-row .col div { + position: relative; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); + height: 80%; +} + +.control-button { + font-size: 3em; + line-height: 0; + width: 80%; + height: 100%; +} + +.control-button-play { + color: #43c32e; +} +.control-button-stop { + color: #d01111; +} +.control-button-reload { + color: #ed7c06; +} +.control-button-restart { + color: #f6e502; +} + +@media (max-width: 1555px) { + .control-col { + height: 100%; + min-height: 294px; + } + .time-col { + height: calc(33.3% - 3px); + margin: 0 0 6px 0; + } + .current-clip { + height: calc(33.3% - 3px); + margin-right: 0; + } + .control-unit-row { + margin-right: -15px; + } + .control-unit-col { + flex: 0 0 66.6666666667%; + max-width: 66.6666666667%; + margin: 9px 0 0 0; + } +} + +@media (max-width: 849px) { + .stats-row { + min-width: 380px; + } +} + .date-row { - height: 40px; - padding-top: 3px; + height: 44px; + padding-top: 5px; } .list-row { - height: calc(100% - 368px); + height: calc(100% - 40px - 254px - 46px); + min-height: 300px; } .pane-row { @@ -402,4 +520,8 @@ export default { background-color: rgba(136, 136, 136, 0.38); } +.timecode { + min-width: 56px; +} +