From 8cc25c7ea7cec950634382fb1dc24c545693feb2 Mon Sep 17 00:00:00 2001 From: Anton Schubert Date: Thu, 24 Dec 2020 14:16:06 +0100 Subject: rC3: fix fonts, moar css --- configs/conferences/rc3/config.php | 2 +- configs/conferences/rc3/font.css | 130 --------------------- configs/conferences/rc3/font.less | 21 ++++ .../conferences/rc3/fonts/Montserrat-Regular.woff | Bin 0 -> 112336 bytes .../conferences/rc3/fonts/Montserrat-Regular.woff2 | Bin 0 -> 85120 bytes .../rc3/fonts/orbitron-bold-webfont.woff | Bin 0 -> 16068 bytes .../rc3/fonts/orbitron-bold-webfont.woff2 | Bin 0 -> 11600 bytes .../rc3/fonts/orbitron-medium-webfont.woff | Bin 0 -> 19456 bytes .../rc3/fonts/orbitron-medium-webfont.woff2 | Bin 0 -> 14236 bytes configs/conferences/rc3/main.less | 35 ++++-- 10 files changed, 49 insertions(+), 139 deletions(-) delete mode 100644 configs/conferences/rc3/font.css create mode 100644 configs/conferences/rc3/font.less create mode 100644 configs/conferences/rc3/fonts/Montserrat-Regular.woff create mode 100644 configs/conferences/rc3/fonts/Montserrat-Regular.woff2 create mode 100644 configs/conferences/rc3/fonts/orbitron-bold-webfont.woff create mode 100644 configs/conferences/rc3/fonts/orbitron-bold-webfont.woff2 create mode 100644 configs/conferences/rc3/fonts/orbitron-medium-webfont.woff create mode 100644 configs/conferences/rc3/fonts/orbitron-medium-webfont.woff2 (limited to 'configs/conferences') diff --git a/configs/conferences/rc3/config.php b/configs/conferences/rc3/config.php index 6f6d1e6..1f56863 100644 --- a/configs/conferences/rc3/config.php +++ b/configs/conferences/rc3/config.php @@ -35,7 +35,7 @@ $CONFIG['CONFERENCE'] = array( * Dieser im Seiten-Header, im -Tag, in der About-Seite und ggf. ab weiteren Stellen als * Anzeigetext benutzt */ - 'TITLE' => 'rC3 Test', # TODO + 'TITLE' => 'RC3 Test', # TODO /** * Veranstalter diff --git a/configs/conferences/rc3/font.css b/configs/conferences/rc3/font.css deleted file mode 100644 index 6550761..0000000 --- a/configs/conferences/rc3/font.css +++ /dev/null @@ -1,130 +0,0 @@ -@font-face { - font-family: "orbitron-medium"; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/orbitron-medium-webfont.woff") format("woff"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/orbitron-medium-webfont.ttf") format("truetype") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 100; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Thin.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Thin.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 100; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ThinItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ThinItalic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 200; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraLight.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraLight.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 200; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraLightItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraLightItalic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 300; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Light.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Light.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 300; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-LightItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-LightItalic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 400; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Regular.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Regular.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 400; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Italic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Italic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 500; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Medium.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Medium.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 500; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-MediumItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-MediumItalic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 600; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-SemiBold.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-SemiBold.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 600; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-SemiBoldItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-SemiBoldItalic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 700; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Bold.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Bold.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 700; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-BoldItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-BoldItalic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 800; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraBold.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraBold.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 800; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraBoldItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-ExtraBoldItalic.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 900; - font-style: normal; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Black.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-Black.woff") format("woff") -} - -@font-face { - font-family: "Montserrat"; - font-weight: 900; - font-style: italic; - src: url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-BlackItalic.woff2") format("woff2"), url("https://app-test.rc3.cccv.de/static/plainui/fonts/Montserrat-BlackItalic.woff") format("woff") -} \ No newline at end of file diff --git a/configs/conferences/rc3/font.less b/configs/conferences/rc3/font.less new file mode 100644 index 0000000..1ad5ea5 --- /dev/null +++ b/configs/conferences/rc3/font.less @@ -0,0 +1,21 @@ +// font path mixin +.fontPath(@path, @filename){ + src: url('@{path}@{filename}.woff2') format('woff2'), + url('@{path}@{filename}.woff') format('woff'); +} + +@font-path: "fonts/"; + +@font-face { + font-family: "orbitron-bold"; + font-weight: 500; + font-style: normal; + .fontPath(@font-path, "orbitron-bold-webfont"); +} + +@font-face { + font-family: "Montserrat"; + font-weight: 400; + font-style: normal; + .fontPath(@font-path, "Montserrat-Regular"); +} \ No newline at end of file diff --git a/configs/conferences/rc3/fonts/Montserrat-Regular.woff b/configs/conferences/rc3/fonts/Montserrat-Regular.woff new file mode 100644 index 0000000..956e5f4 Binary files /dev/null and b/configs/conferences/rc3/fonts/Montserrat-Regular.woff differ diff --git a/configs/conferences/rc3/fonts/Montserrat-Regular.woff2 b/configs/conferences/rc3/fonts/Montserrat-Regular.woff2 new file mode 100644 index 0000000..69c1aa7 Binary files /dev/null and b/configs/conferences/rc3/fonts/Montserrat-Regular.woff2 differ diff --git a/configs/conferences/rc3/fonts/orbitron-bold-webfont.woff b/configs/conferences/rc3/fonts/orbitron-bold-webfont.woff new file mode 100644 index 0000000..3a0f12e Binary files /dev/null and b/configs/conferences/rc3/fonts/orbitron-bold-webfont.woff differ diff --git a/configs/conferences/rc3/fonts/orbitron-bold-webfont.woff2 b/configs/conferences/rc3/fonts/orbitron-bold-webfont.woff2 new file mode 100644 index 0000000..af18acb Binary files /dev/null and b/configs/conferences/rc3/fonts/orbitron-bold-webfont.woff2 differ diff --git a/configs/conferences/rc3/fonts/orbitron-medium-webfont.woff b/configs/conferences/rc3/fonts/orbitron-medium-webfont.woff new file mode 100644 index 0000000..f80f130 Binary files /dev/null and b/configs/conferences/rc3/fonts/orbitron-medium-webfont.woff differ diff --git a/configs/conferences/rc3/fonts/orbitron-medium-webfont.woff2 b/configs/conferences/rc3/fonts/orbitron-medium-webfont.woff2 new file mode 100644 index 0000000..fe934ea Binary files /dev/null and b/configs/conferences/rc3/fonts/orbitron-medium-webfont.woff2 differ diff --git a/configs/conferences/rc3/main.less b/configs/conferences/rc3/main.less index 92e0165..a81e2d4 100644 --- a/configs/conferences/rc3/main.less +++ b/configs/conferences/rc3/main.less @@ -3,10 +3,10 @@ // conference specific styles here @one: #B239FF; @two: #6800E7; -@three: #05B9EC; +@three: #26beff; @four: #FFFFFF; -@dark: #160624; -@dark2: #100E23; +@dark2: #201d47; +@dark: #100E23; @grey-lighter: #333333; @grey-darker: #2a2a2a; @@ -14,8 +14,14 @@ @brand-primary: @two; @well-bg: @dark; +@link-color: @two; +@nav-link-hover-bg: @two; @navbar-default-bg: @dark; +@border-radius-base: 0px; + +@btn-default-color: white; @btn-default-bg: @two; +@btn-default-border: @two; @text-color: @four; @panel-default-border: @two; @@ -25,13 +31,16 @@ @navbar-height: 70px; @navbar-default-border: @two; +@navbar-default-brand-color: @three; +@nav-tabs-link-hover-border-color: @two; @nav-tabs-active-link-hover-color: @four; @nav-tabs-active-link-hover-bg: @one; @nav-tabs-active-link-hover-border-color: @one; +@nav-tabs-justified-link-border-color: @one; @nav-tabs-border-color: @one; -// schedule +// schedule @schedule-pause: @grey-lighter; @schedule-pause-bg: fade(@schedule-pause, 30%); @brand-success: @three; // @schedule-selected-room @@ -49,16 +58,17 @@ body { @headings-color: @four; h1, h2 { - color: #46eed5; + // color: #46eed5; + color: @three; } /* * font */ -@import url("/configs/conferences/rc3/font.css"); +@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-medium", -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"; h1, h2, body.overview .room a.title, @@ -67,5 +77,14 @@ body.overview .panel-primary a, .panel-heading, .panel-default > .panel-heading, .nav.nav-tabs { - font-family: @headings-font-family + font-family: @headings-font-family; +} + +.nav-tabs>li>a { + color: white; + background: @dark2; } + +.panel-body{ + color: white; +} \ No newline at end of file -- cgit v1.2.3