From 6d4c3c1f6c60ded03991a39d58f603e0e7a30341 Mon Sep 17 00:00:00 2001 From: Jan Koppe Date: Thu, 31 Oct 2024 08:52:46 +0100 Subject: [PATCH] adjusted for dhcp ci --- assets/css/custom/styles/_banner-speaker.scss | 13 ++++---- assets/css/custom/styles/_banner-talk.scss | 16 +++++----- assets/css/custom/styles/_base.scss | 2 +- assets/css/custom/styles/_clock.scss | 4 +-- assets/css/custom/styles/_schedule.scss | 30 ++++++++----------- assets/css/custom/styles/_variables.scss | 8 +++-- assets/css/fonts/fonts.scss | 2 ++ assets/css/fonts/uroob.css | 9 ++++++ static/fonts/uroob-webfont.woff | 3 ++ static/fonts/uroob-webfont.woff2 | 3 ++ 10 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 assets/css/fonts/uroob.css create mode 100644 static/fonts/uroob-webfont.woff create mode 100644 static/fonts/uroob-webfont.woff2 diff --git a/assets/css/custom/styles/_banner-speaker.scss b/assets/css/custom/styles/_banner-speaker.scss index 838758f..a224259 100644 --- a/assets/css/custom/styles/_banner-speaker.scss +++ b/assets/css/custom/styles/_banner-speaker.scss @@ -2,7 +2,7 @@ @import "_base"; .slide { - background-color: $color-bg; + //background-color: $color-bg; } .speaker-box { @@ -24,24 +24,25 @@ } .speaker { - background-color: $color-ci-green; + background-color: $color-fg-accent; // border-width: 5px; // border-style: solid; // border-color: $color-ci-green; // box-shadow: 0px 0px 5px 5px rgba(0,0,0,0.2); - box-shadow: 8px 6px 0px $color-bg; + //box-shadow: 8px 6px 0px $color-bg; + box-shadow: 10px 10px 0px 0px rgba($colod-fg, 0.2); // vertical-align: middle; white-space: normal; // padding: 10px 15px; - padding: 5px 15px; + padding: 25px 20px 0px 20px; - font-family: 'Lato'; + font-family: "uroob"; font-weight: 700; - font-size: 60px; + font-size: 80px; } .speaker .title { diff --git a/assets/css/custom/styles/_banner-talk.scss b/assets/css/custom/styles/_banner-talk.scss index fff0477..5976177 100644 --- a/assets/css/custom/styles/_banner-talk.scss +++ b/assets/css/custom/styles/_banner-talk.scss @@ -19,21 +19,21 @@ } .talk { - background-color: $color-ci-green; + background-color: $color-fg-accent; // border-width: 5px; // border-style: solid; // border-color: $color-ci-green; - // box-shadow: 0px 0px 5px 5px rgba(0,0,0,0.2); + box-shadow: 10px 10px 0px 0px rgba($colod-fg, 0.2); // vertical-align: middle; white-space: normal; // padding: 10px 15px; - padding: 5px 10px; + padding: 20px 15px 10px 15px; - font-family: 'Lato'; + font-family: "uroob"; font-weight: 400; } @@ -46,7 +46,7 @@ overflow: hidden; text-overflow: ellipsis; - font-size: 25px; + font-size: 43px; // color: $color-ci-green; @@ -69,9 +69,9 @@ overflow: hidden; text-overflow: ellipsis; - - font-size: 23px; - font-style: italic; + padding-top: 5px; + font-size: 26.5px; + //font-style: italic; } img { diff --git a/assets/css/custom/styles/_base.scss b/assets/css/custom/styles/_base.scss index 83c70c2..cb5137f 100644 --- a/assets/css/custom/styles/_base.scss +++ b/assets/css/custom/styles/_base.scss @@ -7,7 +7,7 @@ body { color: $colod-fg; - background: rgb(25,25,25); + background: #e2c991; //rgb(25,25,25); margin: 0px; padding: 0px; } diff --git a/assets/css/custom/styles/_clock.scss b/assets/css/custom/styles/_clock.scss index 689dcfb..74a25c1 100644 --- a/assets/css/custom/styles/_clock.scss +++ b/assets/css/custom/styles/_clock.scss @@ -16,7 +16,7 @@ top: 240px; left: 1144px; - font-family: 'Source Code Pro'; + font-family: "uroob"; font-weight: 600; - font-size: 60px; + font-size: 80px; } diff --git a/assets/css/custom/styles/_schedule.scss b/assets/css/custom/styles/_schedule.scss index b809f7d..8a33d7a 100644 --- a/assets/css/custom/styles/_schedule.scss +++ b/assets/css/custom/styles/_schedule.scss @@ -2,12 +2,10 @@ @import "_base"; @import "_music"; - .slide { background-color: $color-bg; } - .header { position: absolute; top: 0; @@ -15,7 +13,6 @@ z-index: 10; } - .room-location { position: absolute; top: 260px; @@ -23,12 +20,12 @@ z-index: 20; - font-family: 'Source Code Pro'; - font-weight: 700; + font-family: "uroob"; + //font-weight: 700; font-size: 40px; text-align: end; - color: white; + color: $color-fg-accent; // box-align: center; // -moz-box-align: center; @@ -54,14 +51,13 @@ .schedule .title { // position: static; - font-family: 'Source Code Pro'; + font-family: "uroob"; font-weight: 700; font-size: 60px; //text-align: bottom; } - .events { position: absolute; top: 340px; @@ -92,7 +88,7 @@ // top: 0; left: 0px; - font-family: 'Source Code Pro'; + font-family: "uroob"; font-weight: 400; font-size: 50px; @@ -104,7 +100,7 @@ position: absolute; left: 200px; - font-family: 'Lato'; + font-family: "uroob"; font-weight: 400; font-size: 50px; @@ -114,12 +110,11 @@ } .this-room { - font-style: italic; - color: white; + //font-style: italic; + font-weight: bold; + color: $color-fg-accent; } - - .event-info { position: relative; // left: 550px; @@ -135,7 +130,7 @@ // word-break: break-all; // overflow-wrap: break-word; - font-family: 'Lato'; + font-family: "uroob"; font-weight: 400; font-size: 50px; @@ -162,11 +157,10 @@ overflow: hidden; text-overflow: ellipsis; - font-style: italic; + //font-style: italic; font-size: 40px; } - .footer { position: absolute; left: 65px; @@ -184,7 +178,7 @@ margin-bottom: 10px; - font-family: 'Source Code Pro'; + font-family: "uroob"; font-weight: 600; font-size: 22px; diff --git a/assets/css/custom/styles/_variables.scss b/assets/css/custom/styles/_variables.scss index 46859d4..a722297 100644 --- a/assets/css/custom/styles/_variables.scss +++ b/assets/css/custom/styles/_variables.scss @@ -1,8 +1,12 @@ $full-width: 1920px; $full-height: 1080px; -$colod-fg: rgb(255,255,255); -$color-bg: rgb(30, 30, 30); +$colod-fg: #3d2c13; //rgb(255, 255, 255); +$color-bg: #e2c991; //rgb(30, 30, 30); +$color-fg-alt1: #bd4145; +$color-fg-alt2: #157785; +$color-fg-accent: #e37242; +$color-fg-disrupt: #ff69c5; // Old CI $color-ci-gray: rgb(101, 103, 103); diff --git a/assets/css/fonts/fonts.scss b/assets/css/fonts/fonts.scss index d30b3f1..0e3099f 100644 --- a/assets/css/fonts/fonts.scss +++ b/assets/css/fonts/fonts.scss @@ -3,3 +3,5 @@ @import "source-code-pro"; @import "lato"; + +@import "uroob"; diff --git a/assets/css/fonts/uroob.css b/assets/css/fonts/uroob.css new file mode 100644 index 0000000..a1e5460 --- /dev/null +++ b/assets/css/fonts/uroob.css @@ -0,0 +1,9 @@ +/* uroob */ +@font-face { + font-family: "uroob"; + src: + url("./fonts/uroob-webfont.woff2") format("woff2"), + url("./fonts/uroob-webfont.woff") format("woff"); + font-weight: normal; + font-style: normal; +} diff --git a/static/fonts/uroob-webfont.woff b/static/fonts/uroob-webfont.woff new file mode 100644 index 0000000..44c5a3b --- /dev/null +++ b/static/fonts/uroob-webfont.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c1b06ea88a9f2380638685f89a9c4778fec3957c583fc9b7931543c699245d2 +size 28092 diff --git a/static/fonts/uroob-webfont.woff2 b/static/fonts/uroob-webfont.woff2 new file mode 100644 index 0000000..3a618bc --- /dev/null +++ b/static/fonts/uroob-webfont.woff2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:defaed478b965fe0777c7489d68856dbe869d8ca62cb6552e6f1f393cbda896a +size 21568