From 88019aee3da4278f58aaffc177ca7e800fddc179 Mon Sep 17 00:00:00 2001 From: Krasimir Tsonev Date: Mon, 13 Oct 2014 08:21:37 +0300 Subject: [PATCH 1/3] Working on schedule page --- css/styles.css | 7 ++ html/css/styles.css | 173 ++++++++++++++++++++++++++++++++++++++++---- html/team.html | 2 +- 3 files changed, 167 insertions(+), 15 deletions(-) diff --git a/css/styles.css b/css/styles.css index d077c59..242e864 100644 --- a/css/styles.css +++ b/css/styles.css @@ -637,3 +637,10 @@ a.button:hover { opacity: 0.8; } .member span { display: block; } + +/********************************************* + * Team members + *********************************************/ +.schdule { + +} \ No newline at end of file diff --git a/html/css/styles.css b/html/css/styles.css index e15bb73..d077c59 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -235,16 +235,17 @@ nav ul { margin: 0; padding: 0; } -nav ul > li { +nav ul li { + position: relative; +} + +nav .menu > li { float: left; margin: 0; padding: 0; } -nav ul a { - color: #000; - text-decoration: none; - display: block; - padding: 1.5em 0.4em; + +nav .menu > li { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -252,9 +253,56 @@ nav ul a { -webkit-transition: border-top 200ms; border-top: 0 solid #FFF; } -nav ul a:hover { + +nav .menu > li:hover { border-top: 0.4em solid #A8D6FF; } + +.menu li.fa::before { + display: block; + padding: 30px 4px 0 4px; +} + + +.menu li.fa a { + padding-top: 0; + position: absolute; + display: block; + top: 0; + left: 0; + height: 52px; + width: 10px; +} + +nav ul a { + color: #000; + text-decoration: none; + display: block; + padding: 1.5em 0.4em; +} + +nav ul .sub-menu { + display: none; + position: absolute; + background: #fff; + width: 200px; + left: 50%; + margin-left: -100px; + box-shadow: 0 3px 5px -3px #000 +} + +nav ul li:hover .sub-menu { + display: block; + position: absolute; +} + +nav ul .sub-menu li, +nav ul .sub-menu li a { display: block; width: 100%; } + +nav ul .sub-menu li a { padding: 1em 0; text-align: center; } + +nav ul .sub-menu li { border-bottom: 1px solid #ccc; } + nav ul .separator { display: block; width: 0.05em; @@ -306,15 +354,15 @@ nav .selected { /* Banner */ .banner { - height: 245px; + height: 258px; background: url("../img/banner.jpg") no-repeat; background-size: cover; - padding: 4em 0 0 0; + padding: 0.2em 0 0 0; } .banner img { display: block; max-width: 100%; - height: 157px; + height: 247px; margin: 0 auto; } @media all and (max-width: 840px) { @@ -350,6 +398,10 @@ nav .selected { -moz-box-sizing: border-box; box-sizing: border-box; } +.grid .col3:nth-child(3n + 1) { + clear: both; + padding: 0; +} .grid .col4 { width: 25%; float: left; @@ -357,6 +409,10 @@ nav .selected { -moz-box-sizing: border-box; box-sizing: border-box; } +.grid .col4:nth-child(4n + 1) { + clear: both; + padding: 0; +} .grid .col-left { width: 70%; float: left; @@ -368,10 +424,15 @@ nav .selected { .grid .col-right { width: 30%; float: left; + margin-bottom: 2em; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } +.grid .col-right .content { + width: 100%; +} + @media all and (max-width: 600px) { .grid .col2, .grid .col3, .grid .col4, .grid .col-left, .grid .col-right { width: 100%; @@ -415,7 +476,7 @@ h4 { /* Footer */ footer { - margin: 2em 0 0 0; + margin: -0.3em 0 0; padding-top: 1em; padding-bottom: 1em; -webkit-box-sizing: border-box; @@ -424,16 +485,26 @@ footer { background: #ddd; } +footer .content li { list-style: none; } + +#copyright { + text-align: center; +} + /* Sub navigation */ .subnav { margin-top: 1.6em; list-style: none; padding-left: 0; } +.subnav .menu { + margin-left: -2.2em; +} .subnav li { float: left; padding: 0; margin: 0 1em 0 0; + list-style: none outside; } .subnav li.selected { font-weight: bold; @@ -462,9 +533,9 @@ footer { float: left; padding: 0.3em; background: #FFF; - -moz-box-shadow: 0px 0px 1px 1px #999; + -moz-box-shadow: 0px 0px 1px 1px #999; -webkit-box-shadow: 0px 0px 1px 1px #999; - box-shadow: 0px 0px 1px 1px #999; + box-shadow: 0px 0px 1px 1px #999; margin: 0 1em 2em 0; } .speaker .icons { @@ -491,4 +562,78 @@ footer { .sponsors-item .col2 > img { display: inline-block; margin: 0 0 2em 0; -} \ No newline at end of file +} + +/* Plugins */ +.gmp_map_opts { + float: none !important; + margin-top: 2em !important; +} + + +/********************************************* + * GLOBAL STYLES (Small style changes) + *********************************************/ + +h1 { font-size: 1.8em; } +h2 { font-size: 1.8em; } +h3 { font-size: 1.6em; } +h4 { font-size: 1.4em; } +h5 { font-size: 1.2em; } +h6 { font-size: 1.0em; } + +h1, h2, h3, h4, h5, h6 { font-weight: normal; } + +a { color: #428bca; text-decoration: none; } +a:hover { text-decoration: underline; } + + +/********************************************* + * Navigation + *********************************************/ + +nav .menu > li { margin: 1px 10px; } + +/********************************************* + * Tagline & Sponsors + *********************************************/ + +.col2.tagline { width: 70%; } + +.col2.sponsors { width: 30%; } + +.separator { margin: 2.4em 0; height: 1px; background: #DBDBDB; } + +section.content.grid.homepage { margin-top: 2em; } + +h4 { margin: 1em 0; } + +a.footer { color: #333; } + +a.button { text-decoration: none; color: #333; } + +a.button:hover { opacity: 0.8; } + +/********************************************* + * Team members + *********************************************/ + +.members { + margin: 0 0 2em 0; +} +.member { + margin: 0 0 1em 0; +} +.member a { + display: block; +} +.member a > img { + padding: 0.3em; + background: #FFF; + -moz-box-shadow: 0px 0px 1px 1px #999; + -webkit-box-shadow: 0px 0px 1px 1px #999; + box-shadow: 0px 0px 1px 1px #999; +} +.member span { + display: block; +} diff --git a/html/team.html b/html/team.html index dc494c2..87d09cc 100644 --- a/html/team.html +++ b/html/team.html @@ -17,7 +17,7 @@ OpenFest - + From c296d3142c7f8219414300dea44c14855a69c3ca Mon Sep 17 00:00:00 2001 From: Krasimir Tsonev Date: Mon, 13 Oct 2014 09:09:18 +0300 Subject: [PATCH 2/3] Schedule --- css/styles.css | 61 +++++++++- html/schedule.html | 281 +++++++++++++++++++++++++++++++++++++++++++++ img/en_US.png | Bin 0 -> 599 bytes 3 files changed, 340 insertions(+), 2 deletions(-) create mode 100644 html/schedule.html create mode 100644 img/en_US.png diff --git a/css/styles.css b/css/styles.css index 0a6e794..b62f4f8 100644 --- a/css/styles.css +++ b/css/styles.css @@ -640,6 +640,63 @@ a.button:hover { opacity: 0.8; } /********************************************* * Team members *********************************************/ -.schdule { - +.schedule { + width: 100%; + font-size: 0.8em; + margin: 0 0 3em 0; + clear: both; } +.schedule-legend { + width: 300px; +} +.schedule th, .schedule td { + border-bottom: 1px solid #000; + border-right: 1px dotted #999; + padding: 0.6em 0.4em; + text-align: center; + vertical-align: middle; +} +.schedule-legend td { + padding: 0.4em; +} +.schedule tr td:first-child { + min-width: 82px; +} +.schedule-day { + font-weight: bold; +} +.schedule-empty { + background: #FFF; +} +.schedule-social { + background: #EDD7A7; +} +.schedule-technical { + background: #A4D183; +} +.schedule-workshop { + background: #E2E0E9; +} +.schedule-english::after { + content: " "; + background: url('../img/en_US.png'); + width: 16px; + height: 11px; + display: block; + margin: 0.3em auto 0.3em auto; +} +.schedule-civic { + background: #E8AAAB; +} +.schedule-advanced-technical { + background: #91C4DF; +} +.schedule-open-biz { + background: #DECDCB; +} +.schedule-misc { + background: #B0E9EC; +} +.schedule-open-art { + background: #ED9134; +} \ No newline at end of file diff --git a/html/schedule.html b/html/schedule.html new file mode 100644 index 0000000..50a565f --- /dev/null +++ b/html/schedule.html @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + OpenFest + + + + + + + + + +

+ +
+

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Laudantium obcaecati eos expedita natus temporibus, soluta illum alias aspernatur ullam officiis autem dolore error voluptatem nisi a culpa corrupti voluptates quis! +

+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Зала 1Зала ВарнаЗала Г1workshops
Събота
10:00-10:15Откриване (Яна и Мариян)
10:15-11:11Encryption as social change (ze germans)
11:15-12:00ES6: The Good Parts (Симандов)Отворени инструменти за независима журналистика (Петя иuinput-mapper (Merlijn Wajer)How To CryptoParty
12:15-13:00Програмируем Дом (Олимекс)Виртуализирай това... (Мартин Иванов)Re-usable components for civic tech (Dave)
13:00-14:30Обяд
14:30-15:15I reject your reality and substitute my own (Iliyan)Node.js going to be native (Валентин Николов)The web hacking competition
15:30-16:15Отворен код в държавата (Божо)RIPE Atlas data processing backend (Sergey)Приложение на Linux в управлението на минния добив
16:30-17:15UI design for open data (Hollie)ATA over Ethernet (krosnov)Lightning talks
17:30-18:15Висше образование, университети, проблеми и решения (rLUKS, TPM and full disk encryption without password (Никола Колев)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Зала 1Зала ВарнаЗала Г1workshops
Неделя
10:15-11:00За свободата, програмиста, и менажерията (Николай ЦветAggressive DevOps (core-ix)Open не е достатъчно (Тони)
11:15-12:00Clojure (skanev)SIM card protocol tracing using Osmocom SIMtrace (Harald)Peer-to-peer streaming & file storage (Иво Георгиев)Да хакнем дрон
11:15-12:00The future is open (Chiara & Carlo)Адаптация на Linux за ARM устройства (Леон Анави)Polymer (Пламен)
13:00-14:30Обяд
14:30-15:15За програмирането (краси)Лесни стъпки към по-добра Уеб сигурност (Явор)Lightning talksOlimex workshop ?
15:30-16:15Интерактивни технологии в контекста на съвременните изMaintaining custom Kernel builds (mm)FFmpeg от 0 до x264 (Емил Иванов)
16:30-17:15Software Defined Radio and rtl-sdr (harald)Mind patterns and anti-patterns (Djuvi)
17:30-18:15The Elements of Style in Programming (batsov)OpenCL: Как програмата ми стана 1500 пъти по-бърза (боби)
18:15-18:30закриване (Мариян и Яна)
+ + + + + + + + + + + +
Technical
Advanced technical
Social
Open art
Open biz
Civic hacking
Misc
English speaking
+ +
+ + + + + \ No newline at end of file diff --git a/img/en_US.png b/img/en_US.png new file mode 100644 index 0000000000000000000000000000000000000000..ff701e19f6d2c0658fb23b1d94124cba4ce60851 GIT binary patch literal 599 zcmV-d0;v6oP)U(k2*|8J(R-+sudaynhucHbwAMTnor{mwqO^w7JHzaBsT z{O^B8RYf5+LvDs&KmRKVd78=o{`1#HTiEo_OolaGleS)G+IQ#sUI`b*pv<`1zCJ=H0jd{{2S>p`ri%{LsXJ%FbMS z$#S`6f|?OG!^Jxczkf6Q`UNF{l0Sd`ad7zm>({^EzyAS6{{CgrkluOb3l1A>ZU2~A zK+FZ=zkmP!`TOVhpFbzBzFaPmD2$N3;+$pK?>zdet`f0002ovPDHLkV1gy;I?Vt8 literal 0 HcmV?d00001 From 11b676475578642ff9f053e0e630646292f98d78 Mon Sep 17 00:00:00 2001 From: Krasimir Tsonev Date: Mon, 13 Oct 2014 09:17:28 +0300 Subject: [PATCH 3/3] Bulgarian flag --- css/styles.css | 8 +++++ html/schedule.html | 73 +++++++++++++++++++++++---------------------- img/bg_BG.png | Bin 0 -> 462 bytes 3 files changed, 45 insertions(+), 36 deletions(-) create mode 100644 img/bg_BG.png diff --git a/css/styles.css b/css/styles.css index b62f4f8..9fec986 100644 --- a/css/styles.css +++ b/css/styles.css @@ -685,6 +685,14 @@ a.button:hover { opacity: 0.8; } display: block; margin: 0.3em auto 0.3em auto; } +.schedule-bg::after { + content: " "; + background: url('../img/bg_BG.png'); + width: 16px; + height: 11px; + display: block; + margin: 0.3em auto 0.3em auto; +} .schedule-civic { background: #E8AAAB; } diff --git a/html/schedule.html b/html/schedule.html index 50a565f..62ab0a9 100644 --- a/html/schedule.html +++ b/html/schedule.html @@ -76,24 +76,24 @@ 10:15-11:11 - Encryption as social change (ze germans) + Encryption as social change (ze germans) 11:15-12:00 - ES6: The Good Parts (Симандов) - Отворени инструменти за независима журналистика (Петя и + ES6: The Good Parts (Симандов) + Отворени инструменти за независима журналистика (Петя и uinput-mapper (Merlijn Wajer) - How To CryptoParty + How To CryptoParty 12:15-13:00 - Програмируем Дом (Олимекс) - Виртуализирай това... (Мартин Иванов) + Програмируем Дом (Олимекс) + Виртуализирай това... (Мартин Иванов) Re-usable components for civic tech (Dave) @@ -106,34 +106,34 @@ 14:30-15:15 - I reject your reality and substitute my own (Iliyan) - Node.js going to be native (Валентин Николов) - - The web hacking competition + I reject your reality and substitute my own (Iliyan) + Node.js going to be native (Валентин Николов) + + The web hacking competition 15:30-16:15 - Отворен код в държавата (Божо) - RIPE Atlas data processing backend (Sergey) - Приложение на Linux в управлението на минния добив + Отворен код в държавата (Божо) + RIPE Atlas data processing backend (Sergey) + Приложение на Linux в управлението на минния добив 16:30-17:15 UI design for open data (Hollie) - ATA over Ethernet (krosnov) - Lightning talks + ATA over Ethernet (krosnov) + Lightning talks 17:30-18:15 - Висше образование, университети, проблеми и решения (r - LUKS, TPM and full disk encryption without password (Никола Колев) + Висше образование, университети, проблеми и решения (r + LUKS, TPM and full disk encryption without password (Никола Колев) @@ -157,25 +157,25 @@ 10:15-11:00 - За свободата, програмиста, и менажерията (Николай Цвет - Aggressive DevOps (core-ix) - Open не е достатъчно (Тони) + За свободата, програмиста, и менажерията (Николай Цвет + Aggressive DevOps (core-ix) + Open не е достатъчно (Тони) 11:15-12:00 - Clojure (skanev) - SIM card protocol tracing using Osmocom SIMtrace (Harald) - Peer-to-peer streaming & file storage (Иво Георгиев) + Clojure (skanev) + SIM card protocol tracing using Osmocom SIMtrace (Harald) + Peer-to-peer streaming & file storage (Иво Георгиев) Да хакнем дрон 11:15-12:00 The future is open (Chiara & Carlo) - Адаптация на Linux за ARM устройства (Леон Анави) - Polymer (Пламен) + Адаптация на Linux за ARM устройства (Леон Анави) + Polymer (Пламен) @@ -185,30 +185,30 @@ 14:30-15:15 - За програмирането (краси) - Лесни стъпки към по-добра Уеб сигурност (Явор) - Lightning talks - Olimex workshop ? + За програмирането (краси) + Лесни стъпки към по-добра Уеб сигурност (Явор) + Lightning talks + Olimex workshop ? 15:30-16:15 - Интерактивни технологии в контекста на съвременните из - Maintaining custom Kernel builds (mm) - FFmpeg от 0 до x264 (Емил Иванов) + Интерактивни технологии в контекста на съвременните из + Maintaining custom Kernel builds (mm) + FFmpeg от 0 до x264 (Емил Иванов) 16:30-17:15 Software Defined Radio and rtl-sdr (harald) - Mind patterns and anti-patterns (Djuvi) + Mind patterns and anti-patterns (Djuvi) 17:30-18:15 - The Elements of Style in Programming (batsov) - OpenCL: Как програмата ми стана 1500 пъти по-бърза (боби) + The Elements of Style in Programming (batsov) + OpenCL: Как програмата ми стана 1500 пъти по-бърза (боби) @@ -229,7 +229,8 @@ Open biz Civic hacking Misc - English speaking + English + Български diff --git a/img/bg_BG.png b/img/bg_BG.png new file mode 100644 index 0000000000000000000000000000000000000000..0469f0607dc76eb60327c29e04d9585f3ef25dc7 GIT binary patch literal 462 zcmV;<0WtoGP)WfB*UmB!B(-`wPhZ^#?@C^U5EbbPyl_g=3Hc01Sh${{P9=HB%4| z34*<3-m=C?^;L%miR{xQv2*hU;8+Y&0Dxf-W~KjsusWFAC4@j0#9_j;X5z6SjRhH> zd}sd(7FPhVFdSi!*Zj@;_Sc`kfByUdk|3A-`STmZ_yb~qxIp9o{E-p)bLt=iKmf7) z+|Ix(`{&<1pm88mK&}8g1WG~}e||Ik`OB#Cw~m1UAb?na(Zlrn4}+v6P!1@{@CT$5 z