From ee571120035824cfbaf46073eaf904726b8d6333 Mon Sep 17 00:00:00 2001 From: Sven Reimers Date: Sat, 30 Sep 2023 14:35:39 +0200 Subject: [PATCH] Update BE 23 config and css --- cinema/src/main/resources/tweetwall.css | 2 +- .../src/main/resources/tweetwallConfig.json | 32 ++++++++ exhibition/src/main/resources/tweetwall.css | 78 ++++++++++++++----- .../src/main/resources/tweetwallConfig.json | 38 --------- hallway/src/main/resources/tweetwall.css | 67 ++++++++++++---- 5 files changed, 145 insertions(+), 72 deletions(-) diff --git a/cinema/src/main/resources/tweetwall.css b/cinema/src/main/resources/tweetwall.css index 0fcb8b5..9230924 100644 --- a/cinema/src/main/resources/tweetwall.css +++ b/cinema/src/main/resources/tweetwall.css @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2019 TweetWallFX + * Copyright (c) 2013 TweetWallFX * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/cinema/src/main/resources/tweetwallConfig.json b/cinema/src/main/resources/tweetwallConfig.json index a1ea066..17690a8 100644 --- a/cinema/src/main/resources/tweetwallConfig.json +++ b/cinema/src/main/resources/tweetwallConfig.json @@ -42,6 +42,22 @@ "nodeSelector": "#scheduleNode" } }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowTopRated", + "config": { + "layoutX": 35, + "layoutY": 140, + "topVotedType": "TODAY", + "stepDuration": 500 + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "unit": "SECONDS", + "amount": "15" + } + }, { "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowSchedule", "config": { @@ -76,6 +92,22 @@ "config": { "nodeSelector": "#scheduleNode" } + }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowTopRated", + "config": { + "layoutX": 35, + "layoutY": 140, + "topVotedType": "WEEK", + "stepDuration": 500 + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "unit": "SECONDS", + "amount": "15" + } } ] } diff --git a/exhibition/src/main/resources/tweetwall.css b/exhibition/src/main/resources/tweetwall.css index 4d49e9a..a2f0e76 100644 --- a/exhibition/src/main/resources/tweetwall.css +++ b/exhibition/src/main/resources/tweetwall.css @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2019 TweetWallFX + * Copyright (c) 2013 TweetWallFX * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -45,6 +45,10 @@ .root { -fx-font-family: 'System'; devoxx_gradient: linear-gradient(to bottom right, #e55630, #f68b1f); + devoxx_gradient_opaque: linear-gradient(to bottom right, rgba(229, 86, 48, 0.85) , rgba(246, 139, 31, 0.85)); + devoxx_light_font: blanchedalmond; + devoxx_dark_font: #060b33; + devoxx_font_color: devoxx_light_font; } .text { @@ -69,7 +73,7 @@ } .wordle .bg-image { - -fx-opacity: 0.4; + /*-fx-opacity: 0.4;*/ } .wordle .secondlogo { @@ -85,13 +89,13 @@ /*visibility: hidden;*/ /* -fx-scale-x: 0.7; -fx-scale-y: 0.7;*/ - -fx-translate-x: +150; - -fx-translate-y: -150; + /*-fx-translate-x: +50;*/ + /*-fx-translate-y: -50;*/ } .wordle .tag { /*-fx-font-family: "Calibri";*/ - -fx-fill:blanchedalmond !important; + -fx-fill: white !important; /* -fx-stroke: black; -fx-stroke-width: 0.5; */ /*-fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.7) , 6, 0.0 , 0 , 2 );*/ @@ -130,6 +134,7 @@ .tweetDisplay { -fx-background-color: devoxx_gradient; -fx-background-radius: 5; + /*-fx-background-insets: -5pt;*/ /* -fx-border-color: black; -fx-border-style: solid; -fx-border-width: 0pt 0pt 1pt 0pt; @@ -146,48 +151,85 @@ } .scheduleSession { - -fx-background-color: devoxx_gradient; + -fx-background-color: devoxx_gradient_opaque; -fx-background-radius: 5; - -fx-hgap: 10pt; -fx-vgap: 8pt; -fx-alignment: top-left; -fx-padding: 5pt; - /*-fx-effect: dropshadow(three-pass-box, #060b33, 10, 0, 2, 2);*/ + -fx-opaque: 0.85; -fx-grid-lines-visible: false; } .scheduleSession .room { - -fx-text-fill: #060b33; + -fx-text-fill: blanchedalmond; -fx-font-weight: bold; -fx-font-size: 14pt; } -.scheduleSession > .sessionBottomPane > .titlePane > .title { - -fx-text-fill: #060b33; - -fx-font-size: 12pt; +.scheduleSession .times { + -fx-text-fill: blanchedalmond; + -fx-font-weight: normal; + -fx-font-size: 10pt; +} + +.scheduleSession > .sessionBottomPane > .centerFlow .emojiFlow { + -fx-fill: blanchedalmond; + -fx-font-size: 15pt; + -fx-font-weight: bold; +} + +.scheduleSession > .sessionTopPane > .speakerNames { + -fx-alignment: "top-right" +} + +.scheduleSession > .sessionTopPane > .speakerNames > .speakerName { + -fx-text-fill: blanchedalmond; + -fx-font-size: 11pt; } -.scheduleSession > .sessionTopPane > .speakerName { +.scheduleSession > .sessionTopPane > .speakerNames > .companyName { -fx-text-fill: blanchedalmond; - /*-fx-font-size: 12pt;*/ + -fx-font-size: 8pt; } .scheduleSession .favoriteGlyph { -glyph-name: "HEART"; -glyph-size: 10pt; - -fx-fill: #060b33; + -fx-fill: blanchedalmond; } .scheduleSession .favoriteCount { - -fx-text-fill: #060b33; + -fx-text-fill: blanchedalmond; -fx-font-size: 10pt; } .schedule > .title { - -fx-background-color: devoxx_gradient; + -fx-background-color: devoxx_gradient_opaque; -fx-background-radius: 10; - -fx-text-fill: #060b33; + -fx-text-fill: blanchedalmond; -fx-font-size: 20pt; -fx-font-weight: bold; } + +.scheduleSession .sessionBottomPane .centerFlow { + -fx-spacing: 3pt; +} + +.scheduleSession .sessionBottomPane .centerFlow .tagPane .tags { + -fx-hgap: 8pt; + -fx-vgap: 4pt; + -fx-padding: 0 0 0 4; +} + +.scheduleSession .sessionBottomPane .centerFlow .tagPane .tags .tagLabel { + -fx-font-size: 10pt; + -fx-text-fill: blanchedalmond; + /* -fx-text-fill: #e55630; */ + /* -fx-background-color: black; */ + -fx-border-color: blanchedalmond; + -fx-border-radius: 5 0 5 0; + -fw-border-with: 2pt; + -fx-background-radius: 5 5 5 5; + -fx-border-insets: -1 -4 -1 -4; +} diff --git a/exhibition/src/main/resources/tweetwallConfig.json b/exhibition/src/main/resources/tweetwallConfig.json index 5221221..cfaec72 100644 --- a/exhibition/src/main/resources/tweetwallConfig.json +++ b/exhibition/src/main/resources/tweetwallConfig.json @@ -33,44 +33,6 @@ "config": { "nodeSelector": "#scheduleNode" } - }, - { - "stepClassName": "org.tweetwallfx.controls.steps.FadeInCloudStep", - "config": { - "layoutX": 1100, - "layoutY": 300, - "width": 800, - "height": 600, - "stepDuration": 30000 - } - }, - { - "stepClassName": "org.tweetwallfx.stepengine.steps.NextTweetStep" - }, - { - "stepClassName": "org.tweetwallfx.controls.steps.AddTweetToCloudStep" - }, - { - "stepClassName": "org.tweetwallfx.controls.steps.CloudToCloudStep" - }, - { - "stepClassName": "org.tweetwallfx.controls.steps.CloudToTweetStep" - }, - { - "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", - "config": { - "amount": 5, - "unit": "SECONDS" - } - }, - { - "stepClassName": "org.tweetwallfx.controls.steps.TweetToCloudStep" - }, - { - "stepClassName": "org.tweetwallfx.controls.steps.CloudFadeOutStep" - }, - { - "stepClassName": "org.tweetwallfx.controls.steps.ImageMosaicStep" } ] } diff --git a/hallway/src/main/resources/tweetwall.css b/hallway/src/main/resources/tweetwall.css index c1d5d11..7133125 100644 --- a/hallway/src/main/resources/tweetwall.css +++ b/hallway/src/main/resources/tweetwall.css @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2019 TweetWallFX + * Copyright (c) 2013 TweetWallFX * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -45,6 +45,10 @@ .root { -fx-font-family: 'System'; devoxx_gradient: linear-gradient(to bottom right, #e55630, #f68b1f); + devoxx_gradient_opaque: linear-gradient(to bottom right, rgba(229, 86, 48, 0.85) , rgba(246, 139, 31, 0.85)); + devoxx_light_font: blanchedalmond; + devoxx_dark_font: #060b33; + devoxx_font_color: devoxx_light_font; } .text { @@ -91,7 +95,7 @@ .wordle .tag { /*-fx-font-family: "Calibri";*/ - -fx-fill: #060b33 !important; + -fx-fill: white !important; /* -fx-stroke: black; -fx-stroke-width: 0.5; */ /*-fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.7) , 6, 0.0 , 0 , 2 );*/ @@ -130,6 +134,7 @@ .tweetDisplay { -fx-background-color: devoxx_gradient; -fx-background-radius: 5; + /*-fx-background-insets: -5pt;*/ /* -fx-border-color: black; -fx-border-style: solid; -fx-border-width: 0pt 0pt 1pt 0pt; @@ -146,26 +151,31 @@ } .scheduleSession { - -fx-background-color: devoxx_gradient; + -fx-background-color: devoxx_gradient_opaque; -fx-background-radius: 5; - -fx-hgap: 10pt; -fx-vgap: 8pt; -fx-alignment: top-left; -fx-padding: 5pt; - /*-fx-effect: dropshadow(three-pass-box, #060b33, 10, 0, 2, 2);*/ + -fx-opaque: 0.85; -fx-grid-lines-visible: false; } .scheduleSession .room { - -fx-text-fill: #060b33; + -fx-text-fill: blanchedalmond; -fx-font-weight: bold; - -fx-font-size: 20pt; + -fx-font-size: 14pt; +} + +.scheduleSession .times { + -fx-text-fill: blanchedalmond; + -fx-font-weight: normal; + -fx-font-size: 10pt; } -.scheduleSession > .sessionBottomPane .emojiFlow { - -fx-fill: #060b33; - -fx-font-size: 13pt; +.scheduleSession > .sessionBottomPane > .centerFlow .emojiFlow { + -fx-fill: blanchedalmond; + -fx-font-size: 15pt; -fx-font-weight: bold; } @@ -175,24 +185,51 @@ .scheduleSession > .sessionTopPane > .speakerNames > .speakerName { -fx-text-fill: blanchedalmond; - -fx-font-size: 10pt; + -fx-font-size: 11pt; +} + +.scheduleSession > .sessionTopPane > .speakerNames > .companyName { + -fx-text-fill: blanchedalmond; + -fx-font-size: 8pt; } .scheduleSession .favoriteGlyph { -glyph-name: "HEART"; -glyph-size: 10pt; - -fx-fill: #060b33; + -fx-fill: blanchedalmond; } .scheduleSession .favoriteCount { - -fx-text-fill: #060b33; + -fx-text-fill: blanchedalmond; -fx-font-size: 10pt; } .schedule > .title { - -fx-background-color: devoxx_gradient; + -fx-background-color: devoxx_gradient_opaque; -fx-background-radius: 10; - -fx-text-fill: #060b33; + -fx-text-fill: blanchedalmond; -fx-font-size: 20pt; -fx-font-weight: bold; } + +.scheduleSession .sessionBottomPane .centerFlow { + -fx-spacing: 3pt; +} + +.scheduleSession .sessionBottomPane .centerFlow .tagPane .tags { + -fx-hgap: 8pt; + -fx-vgap: 4pt; + -fx-padding: 0 0 0 4; +} + +.scheduleSession .sessionBottomPane .centerFlow .tagPane .tags .tagLabel { + -fx-font-size: 10pt; + -fx-text-fill: blanchedalmond; + /* -fx-text-fill: #e55630; */ + /* -fx-background-color: black; */ + -fx-border-color: blanchedalmond; + -fx-border-radius: 5 0 5 0; + -fw-border-with: 2pt; + -fx-background-radius: 5 5 5 5; + -fx-border-insets: -1 -4 -1 -4; +}