Mirrors/streaming-website
2
0
Fork 0
mirror of https://github.com/voc/streaming-website synced 2024-11-10 14:44:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'staging'

Browse source
This commit is contained in:
derchris 2021-12-26 22:38:30 +01:00
commit 4bb4b41e09
11 changed files with 58 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
configs/conferences/rc3/background-21-mobile.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 815 KiB

8
configs/conferences/rc3/config.php
View file

@ -585,7 +585,7 @@ $CONFIG['ROOMS'] = array(
'MUSIC' => false,
'SCHEDULE' => true,
'SCHEDULE_NAME' => 'r3s - Monheim/Rhein',
'ROOM_GUID' => '',
'ROOM_GUID' => 'f91f4af4-b667-4705-9aab-5c280177bf49',
'FEEDBACK' => true,
'SUBTITLES' => false,
'EMBED' => true,
@ -619,7 +619,7 @@ $CONFIG['ROOMS'] = array(
'MUSIC' => false,
'SCHEDULE' => true,
'SCHEDULE_NAME' => 'Sendezentrum Bühne',
'ROOM_GUID' => '',
'ROOM_GUID' => 'd1915b0a-6d9d-47f0-b9e8-3c00ab62e2fe',
'FEEDBACK' => true,
'SUBTITLES' => false,
'EMBED' => true,
@ -690,8 +690,8 @@ $CONFIG['ROOMS'] = array(
'SLIDES' => false,
'MUSIC' => false,
'SCHEDULE' => true,
'SCHEDULE_NAME' => 'Bierschäune',
'ROOM_GUID' => '',
'SCHEDULE_NAME' => 'Bierscheune',
'ROOM_GUID' => 'e5d65c11-3c4e-418c-aebe-4fc7a655176b',
'FEEDBACK' => true,
'SUBTITLES' => false,
'EMBED' => true,

26
configs/conferences/rc3/font.less
View file

@ -7,15 +7,29 @@
@font-path: "fonts/";
@font-face {
font-family: "orbitron-bold";
font-weight: 500;
font-family: 'montserratbold';
font-weight: normal;
font-style: normal;
.fontPath(@font-path, "orbitron-bold-webfont");
.fontPath(@font-path, "montserrat-bold-webfont");
}
@font-face {
font-family: "Montserrat";
font-weight: 400;
font-family: 'montserratitalic';
font-weight: normal;
font-style: normal;
.fontPath(@font-path, "Montserrat-Regular");
.fontPath(@font-path, "montserrat-italic-webfont");
}
@font-face {
font-family: 'montserratregular';
font-weight: normal;
font-style: normal;
.fontPath(@font-path, "montserrat-regular-webfont");
}
@font-face {
font-family: 'changasemibold';
font-weight: normal;
font-style: normal;
src: url('@{font-path}changa-semibold.ttf');
}

BIN
configs/conferences/rc3/fonts/changa-semibold.ttf Normal file
View file

Binary file not shown.

BIN
configs/conferences/rc3/fonts/montserrat-bold-webfont.woff Normal file
View file

Binary file not shown.

BIN
configs/conferences/rc3/fonts/montserrat-bold-webfont.woff2 Normal file
View file

Binary file not shown.

BIN
configs/conferences/rc3/fonts/montserrat-italic-webfont.woff Normal file
View file

Binary file not shown.

BIN
configs/conferences/rc3/fonts/montserrat-italic-webfont.woff2 Normal file
View file

Binary file not shown.

BIN
configs/conferences/rc3/fonts/montserrat-regular-webfont.woff Normal file
View file

Binary file not shown.

BIN
configs/conferences/rc3/fonts/montserrat-regular-webfont.woff2 Normal file
View file

Binary file not shown.

58
configs/conferences/rc3/main.less
View file

@ -48,10 +48,14 @@
@brand-danger: @one; // @schedule-now
@schedule-gap-bg: @dark;
.block.event {
body .schedule .block.event {
background-color: rgba(0, 0, 0, 0.3);
}
body .schedule .block h5 {
color: #606060;
}
// headings
@headings-color: @four;
h1, h2 {
color: @three;
@ -61,30 +65,11 @@ h3 {
color: #888;
}
body .schedule .block h5 {
color: #606060;
}
body {
background-color: #000;
background: url(background-21.png) no-repeat right top fixed;
background-size: 100% 100%;
padding: @navbar-height 0;
@media (max-width: 498px) { /* when the navbar breaks */
padding: 165px 0;
}
}
/*
* font
*/
// font
@import "font.less";
@font-family-sans-serif: "Montserrat", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@headings-font-family: "orbitron-bold", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@font-family-sans-serif: "montserratregular";
@headings-font-family: "changasemibold";
h1, h2,
body.overview .room a.title,
@ -96,19 +81,44 @@ body.overview .panel-primary a,
font-family: @headings-font-family;
}
body {
background-color: #000;
background: url(background-21.png) no-repeat right top fixed;
background-size: 100% 100%;
padding: @navbar-height 0;
@media screen and (orientation: portrait) {
background: url(background-21-mobile.jpg) no-repeat right top fixed;
}
@media (max-width: 498px) { /* when the navbar breaks */
padding: 165px 0;
}
}
.nav-tabs>li>a {
color: white;
background: @dark2;
}
.navbar-header, .navbar, .navbar .btn {
background: none;
border: none;
}
.navbar {
background-color: rgba(0, 0, 0, 0.5) !important;
}
.panel-body {
}
.tab-content{
background-color: rgba(0, 0, 0, 0.65) !important;
}
.btn {
background: none !important;
border: none;
}