Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Showing with 6 additions and 16 deletions.
  1. +1 −1 public/stylesheets/screen.css
  2. +1 −6 sass/screen.scss
  3. +2 −2 sass/views/_index.scss
  4. +2 −7 views/index.jade
View
2 public/stylesheets/screen.css
@@ -1 +1 @@
-/* normalize.css v1.0.1 | MIT License | git.io/normalize *//* normalize.css v1.0.1 | HTML5 Display Definitions | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}/* normalize.css v1.0.1 | Base | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}/* normalize.css v1.0.1 | Links | MIT License | git.io/normalize */a:focus{outline:thin dotted}a:active,a:hover{outline:0}/* normalize.css v1.0.1 | Typography | MIT License | git.io/normalize */h1{font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:1em 40px}dfn{font-style:italic}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace, serif;_font-family:'courier new', monospace;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:"\201C" "\201D" "\2018" "\2019"}q{quotes:none}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ul,nav ol{list-style:none;list-style-image:none}/* normalize.css v1.0.1 | Embedded Content | MIT License | git.io/normalize */img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}/* normalize.css v1.0.1 | Figures | MIT License | git.io/normalize */figure{margin:0}/* normalize.css v1.0.1 | Forms | MIT License | git.io/normalize */form{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}/* normalize.css v1.0.1 | Tables | MIT License | git.io/normalize */table{border-collapse:collapse;border-spacing:0}.clear{overflow:hidden;*zoom:1;clear:both}.left{float:left;margin-right:1em}.right{float:right;margin-left:1em}.container{overflow:hidden;*zoom:1;clear:both;margin:0 auto}.grid-row{overflow:hidden;*zoom:1;clear:both}.grid-row :first-child{margin-left:0}.grid-1-2{width:49.25%;margin-left:1.5%;float:left}.grid-1-3{width:32.33333%;margin-left:1.5%;float:left}.grid-2-3{width:66.16667%;margin-left:1.5%;float:left}.grid-1-6{width:15.41667%;margin-left:1.5%;float:left}.grid-1-3:first-child,.grid-1-3:nth-child(4n),.grid-1-2:nth-child(odd){overflow:hidden;*zoom:1;clear:both;margin-left:0}header{clear:both;overflow:hidden;margin-bottom:3em}header h1{float:left}header h1 a{display:block;text-indent:-99em;overflow:hidden;width:120px;height:120px;background:url(/images/js-logo@2x.png) no-repeat;background-size:120px}header h2{margin-top:1.5em;margin-left:140px;padding-bottom:0}header nav{margin-top:3em;margin-left:140px;text-transform:uppercase;font-weight:bold}@media screen and (max-width: 33em){header nav{margin-left:0;padding:1em 0;clear:both;overflow:hidden}}@media screen and (max-width: 37em){header nav{margin-top:1.5em}}header ul{margin:0;padding:0;border:0;overflow:hidden;*zoom:1}header ul li{list-style-image:none;list-style-type:none;margin-left:0;white-space:nowrap;display:inline;float:left;padding-left:4px;padding-right:4px}header ul li:first-child,header ul li.first{padding-left:0}header ul li:last-child{padding-right:0}header ul li.last{padding-right:0}header ul li{list-style-image:none;list-style-type:none;margin-left:0;white-space:nowrap;display:inline;float:left;padding-left:0.5em;padding-right:0.5em}header ul li:first-child,header ul li.first{padding-left:0}header ul li:last-child{padding-right:0}header ul li.last{padding-right:0}header ul a,header ul a:link,header ul a:active,header ul a:hover,header ul a:visited{text-decoration:none;color:#666}header ul a:hover{border-bottom:2px solid #666}.next-meetup{margin-bottom:1.5em}.next-meetup h1{font-size:2em;line-height:0.9375em}.next-meetup div{margin-top:5px}h2{padding-bottom:1em}.grid-1-6{margin-bottom:10px;height:105px}.grid-1-6 p{text-align:center;padding-left:1em;padding-right:1em}.talk-slots{margin-bottom:3em}.talk-slots .grid-1-3{height:350px;padding-left:1em;padding-right:1em;padding-top:1.5em;padding-bottom:1.5em}.talk-slots p:last-child{margin-bottom:10px}.talk-slots h1{font-size:1.42857em;line-height:1.05em;margin-bottom:21px}.talk-slots h1+h2{font-size:1.14286em;line-height:1.3125em;margin-top:-21px;font-weight:normal}@media screen and (max-width: 42em){.talk-slots h1+h2{margin-bottom:0}}.slot-taken,.slot-beerjs{background-color:#f0f0f0;-webkit-box-shadow:inset 0 0 70px 50px #fefefe,2px 3px 1px #eee;-moz-box-shadow:inset 0 0 70px 50px #fefefe,2px 3px 1px #eee;box-shadow:inset 0 0 70px 50px #fefefe,2px 3px 1px #eee;border:1px solid #eee;border-radius:4px}.slot-open{border:0.5em dashed #dfdfdf;border-radius:1em;color:#929292;text-shadow:0 1px 1px #FFFFFF}.slot-open h1{margin-top:-0.35em}.slot-beerjs{background:url(../images/beer-js@2x.png) center center no-repeat;background-size:50%}@media screen and (max-width: 42em){.slot-beerjs{background-image:none}}.talk-list .grid-row{margin-top:1.5em}.talk-list h1{font-size:1.71429em;line-height:1.75em}@media screen and (max-width: 42em){.talk-list h1{display:inline-block}}@media screen and (min-width: 42em){.talk-list h1{text-align:right}}.talk-list h1 .anchor{font-size:0.75em;color:#ccc !important;text-decoration:none;margin:0 0.5em;vertical-align:top;font-weight:normal;visibility:hidden}@media screen and (max-width: 42em){.talk-list h1 .anchor{float:right}}.talk-list h1:hover .anchor{visibility:visible}.talk-list h2{margin-top:0.371428571em;margin-bottom:0;font-size:1.428571429em;line-height:1.5}.talk-list h3{font-size:1em;line-height:1.5;font-weight:normal;margin:0}.talk-list article{margin-bottom:3em}.talk-list ul{clear:both;overflow:hidden;padding:0}.talk-list li{list-style-type:none;float:left;margin-right:0.5em}.talk-list li:before{content:"|";margin-right:0.5em}.talk-list li:first-child:before{content:"";margin-right:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}* html{font-size:87.5%}html{font-size:14px;line-height:1.5em}body{max-width:67.15em;margin:0 auto;text-rendering:optimizeLegibility;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-weight:300;color:#333;background:#f8f8f8 url("../images/noise.png")}h1,h2{margin:0}a,a:link,a:active,a:hover{color:#d0b114}a:visited{color:#73620b}p{margin-top:1.5em;margin-bottom:1.5em}article h1{padding-bottom:1em}aside h3{font-size:1.14286em;line-height:1.3125em}footer{clear:both;overflow:hidden;margin:3em 0 2em;font-size:0.85714em;line-height:1.75em}@media screen and (min-width: 33em){*[role='main']{min-height:15em}}@media screen and (max-width: 62em){body{padding-left:1em;padding-right:1em}}@media screen and (max-width: 42em){body{padding-left:1em;padding-right:1em}.grid-1-3,.grid-2-3{margin:0 0 1em 0;float:none;width:100%}.talk-slots .grid-1-3{min-height:308px}}@media handheld{.notMobile{display:none}}
+/* normalize.css v1.0.1 | MIT License | git.io/normalize *//* normalize.css v1.0.1 | HTML5 Display Definitions | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}/* normalize.css v1.0.1 | Base | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}/* normalize.css v1.0.1 | Links | MIT License | git.io/normalize */a:focus{outline:thin dotted}a:active,a:hover{outline:0}/* normalize.css v1.0.1 | Typography | MIT License | git.io/normalize */h1{font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:1em 40px}dfn{font-style:italic}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace, serif;_font-family:'courier new', monospace;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:"\201C" "\201D" "\2018" "\2019"}q{quotes:none}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ul,nav ol{list-style:none;list-style-image:none}/* normalize.css v1.0.1 | Embedded Content | MIT License | git.io/normalize */img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}/* normalize.css v1.0.1 | Figures | MIT License | git.io/normalize */figure{margin:0}/* normalize.css v1.0.1 | Forms | MIT License | git.io/normalize */form{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}/* normalize.css v1.0.1 | Tables | MIT License | git.io/normalize */table{border-collapse:collapse;border-spacing:0}.clear{overflow:hidden;*zoom:1;clear:both}.left{float:left;margin-right:1em}.right{float:right;margin-left:1em}.container{overflow:hidden;*zoom:1;clear:both;margin:0 auto}.grid-row{overflow:hidden;*zoom:1;clear:both}.grid-row :first-child{margin-left:0}.grid-1-2{width:49.25%;margin-left:1.5%;float:left}.grid-1-3{width:32.33333%;margin-left:1.5%;float:left}.grid-2-3{width:66.16667%;margin-left:1.5%;float:left}.grid-1-6{width:15.41667%;margin-left:1.5%;float:left}.grid-1-3:first-child,.grid-1-3:nth-child(4n),.grid-1-2:nth-child(odd){overflow:hidden;*zoom:1;clear:both;margin-left:0}header{clear:both;overflow:hidden;margin-bottom:3em}header h1{float:left}header h1 a{display:block;text-indent:-99em;overflow:hidden;width:120px;height:120px;background:url(/images/js-logo@2x.png) no-repeat;background-size:120px}header h2{margin-top:1.5em;margin-left:140px;padding-bottom:0}header nav{margin-top:3em;margin-left:140px;text-transform:uppercase;font-weight:bold}@media screen and (max-width: 33em){header nav{margin-left:0;padding:1em 0;clear:both;overflow:hidden}}@media screen and (max-width: 37em){header nav{margin-top:1.5em}}header ul{margin:0;padding:0;border:0;overflow:hidden;*zoom:1}header ul li{list-style-image:none;list-style-type:none;margin-left:0;white-space:nowrap;display:inline;float:left;padding-left:4px;padding-right:4px}header ul li:first-child,header ul li.first{padding-left:0}header ul li:last-child{padding-right:0}header ul li.last{padding-right:0}header ul li{list-style-image:none;list-style-type:none;margin-left:0;white-space:nowrap;display:inline;float:left;padding-left:0.5em;padding-right:0.5em}header ul li:first-child,header ul li.first{padding-left:0}header ul li:last-child{padding-right:0}header ul li.last{padding-right:0}header ul a,header ul a:link,header ul a:active,header ul a:hover,header ul a:visited{text-decoration:none;color:#666}header ul a:hover{border-bottom:2px solid #666}.next-meetup{margin-bottom:1.5em}.next-meetup h1{font-size:2em;line-height:0.9375em}.next-meetup div{margin-top:5px}h2{padding-bottom:1em}.grid-1-6{margin-bottom:10px;height:105px}.grid-1-6 p{text-align:center;padding-left:1em;padding-right:1em}.talk-slots{margin-bottom:3em}.talk-slots .grid-1-3{height:350px;padding-left:1em;padding-right:1em;padding-top:1.5em;padding-bottom:1.5em}.talk-slots p:last-child{margin-bottom:10px}.talk-slots h1{font-size:1.42857em;line-height:1.26em;margin-bottom:21px}.talk-slots h1+h2{font-size:1.14286em;line-height:1.575em;margin-top:-21px;font-weight:normal}@media screen and (max-width: 42em){.talk-slots h1+h2{margin-bottom:0}}.slot-taken,.slot-beerjs{background-color:#f0f0f0;-webkit-box-shadow:inset 0 0 70px 50px #fefefe,2px 3px 1px #eee;-moz-box-shadow:inset 0 0 70px 50px #fefefe,2px 3px 1px #eee;box-shadow:inset 0 0 70px 50px #fefefe,2px 3px 1px #eee;border:1px solid #eee;border-radius:4px}.slot-open{border:0.5em dashed #dfdfdf;border-radius:1em;color:#929292;text-shadow:0 1px 1px #FFFFFF}.slot-open h1{margin-top:-0.35em}.slot-beerjs{background:url(../images/beer-js@2x.png) center center no-repeat;background-size:50%}@media screen and (max-width: 42em){.slot-beerjs{background-image:none}}.talk-list .grid-row{margin-top:1.5em}.talk-list h1{font-size:1.71429em;line-height:1.75em}@media screen and (max-width: 42em){.talk-list h1{display:inline-block}}@media screen and (min-width: 42em){.talk-list h1{text-align:right}}.talk-list h1 .anchor{font-size:0.75em;color:#ccc !important;text-decoration:none;margin:0 0.5em;vertical-align:top;font-weight:normal;visibility:hidden}@media screen and (max-width: 42em){.talk-list h1 .anchor{float:right}}.talk-list h1:hover .anchor{visibility:visible}.talk-list h2{margin-top:0.371428571em;margin-bottom:0;font-size:1.428571429em;line-height:1.5}.talk-list h3{font-size:1em;line-height:1.5;font-weight:normal;margin:0}.talk-list article{margin-bottom:3em}.talk-list ul{clear:both;overflow:hidden;padding:0}.talk-list li{list-style-type:none;float:left;margin-right:0.5em}.talk-list li:before{content:"|";margin-right:0.5em}.talk-list li:first-child:before{content:"";margin-right:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}* html{font-size:87.5%}html{font-size:14px;line-height:1.5em}body{max-width:67.15em;margin:0 auto;text-rendering:optimizeLegibility;font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-weight:300;color:#333;background:#f8f8f8 url("../images/noise.png")}h1,h2{margin:0}a,a:link,a:active,a:hover{color:#d0b114}a:visited{color:#73620b}article h1{height:40px}aside h3{font-size:1.14286em;line-height:1.3125em}footer{clear:both;overflow:hidden;margin:3em 0 2em;font-size:0.85714em;line-height:1.75em}@media screen and (min-width: 33em){*[role='main']{min-height:15em}}@media screen and (max-width: 62em){body{padding-left:1em;padding-right:1em}}@media screen and (max-width: 42em){body{padding-left:1em;padding-right:1em}.grid-1-3,.grid-2-3{margin:0 0 1em 0;float:none;width:100%}.talk-slots .grid-1-3{min-height:308px}}@media handheld{.notMobile{display:none}}
View
7 sass/screen.scss
@@ -50,13 +50,8 @@ a:hover { color: darken($js-logo-color, 20%); }
a:visited { color: darken($js-logo-color, 40%); }
-p {
- @include margin-leader;
- @include margin-trailer;
-}
-
article h1 {
- padding-bottom: 1em;
+ height: 40px;
}
aside {
View
4 sass/views/_index.scss
@@ -42,11 +42,11 @@ h2 {
h1 {
- @include adjust-font-size-to(20px, 1);
+ @include adjust-font-size-to(20px, 1.2);
margin-bottom: $base-line-height;
& + h2 {
- @include adjust-font-size-to(16px, 1);
+ @include adjust-font-size-to(16px, 1.2);
margin-top: -($base-line-height);
font-weight: normal;
View
9 views/index.jade
@@ -49,19 +49,14 @@ aside.grid-row(role="complementary")
| Check out the information about <a href="/meetups">past meetups</a> and our list of <a href="/conferences">upcoming conferences</a> in Europe.
| To make sure, you don't miss out, subscribe to <a href="https://www.google.com/calendar/ical/6gg9b82umvrktnjsfvegq1tb24%40group.calendar.google.com/public/basic.ics">our calendar</a>!
-h2 Meetup Partners
-include includes/partners
aside.grid-row(role="complementary")
.grid-1-3
h3 Sponsors
p We need sponsors to help us bring the best JavaScript speakers to Prague. We would also appreciate help producing videos from meetups and more.
- .grid-1-3
+ .grid-2-3
h3 Partners
- p Partners pay for the space in Node5 (projector, ~30 people). In exchange they get a mention on this site and can place their banner on the stage.
- .grid-1-3
- h3 Sponsor
p.center
- |
+ | <a href="http://www.gooddata.com"><img src="/partners/GoodDataLogo.png" alt="GoodData Logo" /></a>
aside.grid-row(role="complementary")
p If you are interested in supporting the Czech Javascript Meetup as a sponsor or a partner contact <a href="mailto:ladislav@prskavec.net?subject=jsconfcz-sponsor">Ladislav Prskavec</a>.

No commit comments for this range

Something went wrong with that request. Please try again.