Ergonomics – get rid of typography file

1. Merge typography into main
2. Get rid of use of `#view` in scss
3. Make `render` work with conference pages
This commit is contained in:
Matthew Taylor 2016-05-12 17:57:48 -04:00
parent fa9c8bca1d
commit e1cebe46db
31 changed files with 1197 additions and 1228 deletions

View file

@ -1,129 +0,0 @@
@import "./colors";
@import "./frameless";
#view {
// Global Typography
h1,
h2,
h3,
h4,
h5,
p {
line-height: 1.7em;
color: $type-gray;
}
::selection {
background-color: lighten($ui-blue, 30);
}
// Headers
h1 {
font-size: 2.5rem;
font-weight: 900;
}
h2 {
font-size: 2rem;
font-weight: 600;
}
h3 {
font-size: 1.4rem;
font-weight: 500;
}
h4 {
font-size: 1rem;
font-weight: 700;
}
h5 {
text-transform: uppercase;
letter-spacing: 2px;
font-size: .85rem;
font-weight: 700;
}
// Link Typography
a {
cursor: pointer;
color: $ui-blue;
font-weight: 500;
&:hover {
text-decoration: none;
color: darken($ui-blue, 15);
}
}
// Paragraph Typography
p {
//max-width: 700px;
font-size: 1rem;
font-weight: 300;
&.intro {
font-size: 1.1rem;
}
&.callout {
// margin: 1.5em 0;
// border-top: 1px solid $ui-border;
// border-bottom: 1px solid $ui-border;
// padding: 1em 0;
margin: 1.5em 0;
border: 1px solid $active-gray;
border-radius: 5px;
background-color: lighten($ui-blue, 40);
padding: 1.25em;
&.orange {
background-color: lighten($ui-orange, 30);
}
}
a {
white-space: nowrap;
}
}
b {
font-weight: 500;
}
// List Typography
ol,
ul {
padding-left: 20px;
line-height: 1.5em;
font-size: 1rem;
font-weight: 300;
li {
margin: .75em 0;
}
}
dl {
line-height: 1.5rem;
font-size: 1rem;
font-weight: 300;
dt {
font-weight: 700;
}
dd {
margin: 0;
}
}
}

View file

@ -14,6 +14,7 @@ $base-bg: $ui-white;
.box-header {
h4 {
line-height: .9rem;
font-size: .9rem;
}
}
@ -25,6 +26,7 @@ $base-bg: $ui-white;
.box-header {
h4 {
line-height: 1rem;
font-size: 1rem;
}
}
@ -36,6 +38,7 @@ $base-bg: $ui-white;
.box-header {
h4 {
line-height: 1.1rem;
font-size: 1.1rem;
}
}
@ -47,6 +50,7 @@ $base-bg: $ui-white;
.box-header {
h4 {
line-height: 1.1rem;
font-size: 1.1rem;
}
}

View file

@ -1,6 +1,5 @@
@import "../../../colors";
@import "../../../frameless";
@import "../../../typography";
#footer {
.inner {

View file

@ -18,12 +18,16 @@
dt {
display: block;
margin-bottom: 8px;
font-weight: bold;
}
dd {
display: block;
margin: 5px 0;
line-height: 1.2rem;
a {
font-weight: 400;
}
}
}

View file

@ -1,5 +1,12 @@
@import "../../colors";
h1 {
line-height: 2.125rem;
color: $ui-orange;
font-size: 1.625rem;
font-weight: 400;
}
.intro {
display: flex;
margin-top: 20px;
@ -13,11 +20,6 @@
display: inline-block;
width: calc(66% - 30px);
vertical-align: top;
h1 {
color: $ui-orange;
font-weight: 400;
}
}
.sprites {

View file

@ -3,183 +3,181 @@
$base-bg: $ui-white;
#view {
background-color: $base-bg;
padding: 0;
background-color: $base-bg;
padding: 0;
// To be integrated into the Global Typography standards
h3,
// To be integrated into the Global Typography standards
h3,
p {
font-weight: 300;
}
p {
line-height: 2em;
}
h1 {
margin: 0 auto;
padding: 5px 10%;
text-align: center;
color: $type-gray;
}
.top-banner,
.videos-section,
.section {
padding: 30px 0;
width: 100%;
h1,
p {
font-weight: 300;
}
p {
line-height: 2em;
}
h1 {
margin: 0 auto;
padding: 5px 10%;
text-align: center;
color: $type-gray;
}
}
.top-banner,
.videos-section,
.section {
padding: 30px 0;
width: 100%;
.videos-container {
display: flex;
margin: 0 auto;
h1,
p {
margin: 0 auto;
padding: 5px 10%;
text-align: center;
color: $type-gray;
}
}
.videos-container {
display: flex;
margin: 0 auto;
justify-content: center;
flex-wrap: wrap;
align-items: center;
.videos {
display: inline-flex;
justify-content: center;
flex-wrap: wrap;
align-items: center;
}
.videos {
display: inline-flex;
justify-content: center;
flex-wrap: wrap;
.video {
position: relative;
margin: 10px;
border-radius: 7px;
background-color: $active-gray;
padding: 2px;
max-width: 290px;
}
img {
margin: 10px 10px 5px;
border-radius: 5px;
width: calc(100% - 20px);
height: 179px;
}
.play-button {
display: block;
top: calc(50% - 25px);
left: calc(50% - 35px);
opacity: .8;
border: 5px solid $ui-border;
border-radius: 20px;
background-color: $type-gray;
width: 70px;
height: 50px;
&,
&:after {
position: absolute;
margin: 0;
cursor: pointer;
padding: 0;
}
.video {
position: relative;
margin: 10px;
border-radius: 7px;
background-color: $active-gray;
padding: 2px;
max-width: 290px;
&:after {
$play-arrow: rgba(255, 255, 255, 0);
top: 37px;
left: 28px;
margin-top: -30px;
border: solid transparent;
border-width: 18px;
border-color: $play-arrow;
border-left-color: $ui-white;
width: 0;
height: 0;
content: " ";
pointer-events: none;
}
}
}
img {
margin: 10px 10px 5px;
border-radius: 5px;
width: calc(100% - 20px);
height: 179px;
.content {
img {
display: block;
margin-right: auto;
margin-left: auto;
}
.box,
iframe {
display: block;
margin-right: auto;
margin-left: auto;
border: 0;
padding-top: 25px;
padding-bottom: 15px;
}
iframe {
height: 600px;
}
.editor {
position: relative;
iframe {
width: 100%;
}
.play-button {
display: block;
top: calc(50% - 25px);
left: calc(50% - 35px);
opacity: .8;
border: 5px solid $ui-border;
border-radius: 20px;
background-color: $type-gray;
width: 70px;
height: 50px;
&,
&:after {
position: absolute;
margin: 0;
cursor: pointer;
padding: 0;
}
&:after {
$play-arrow: rgba(255, 255, 255, 0);
top: 37px;
left: 28px;
margin-top: -30px;
border: solid transparent;
border-width: 18px;
border-color: $play-arrow;
border-left-color: $ui-white;
width: 0;
height: 0;
content: " ";
pointer-events: none;
}
.scratch-link {
position: absolute;
right: 3%;
width: 10%;
}
}
.content {
img {
display: block;
margin-right: auto;
margin-left: auto;
.side-by-side {
margin-right: auto;
margin-left: auto;
height: 520px;
.design-studio-projects,
.design-studio {
display: inline-block;
width: 45%;
height: 500px;
}
.box,
iframe {
display: block;
margin-right: auto;
margin-left: auto;
border: 0;
padding-top: 25px;
padding-bottom: 15px;
.design-studio-projects {
float: right;
}
iframe {
height: 600px;
}
.editor {
position: relative;
.design-studio {
float: left;
iframe {
width: 100%;
}
.scratch-link {
position: absolute;
right: 3%;
width: 10%;
}
}
.side-by-side {
margin-right: auto;
margin-left: auto;
height: 520px;
.design-studio-projects,
.design-studio {
display: inline-block;
width: 45%;
height: 500px;
}
.design-studio-projects {
float: right;
}
.design-studio {
float: left;
iframe {
margin-top: 60px;
width: 200%;
-webkit-transform: scale(.5);
-webkit-transform-origin: top left;
-moz-transform: scale(.5);
}
}
}
}
.box-content {
.nestedcarousel {
text-align: center;
.thumbnail {
display: inline-block;
margin: 0 50px;
margin-top: 60px;
width: 200%;
-webkit-transform: scale(.5);
-webkit-transform-origin: top left;
-moz-transform: scale(.5);
}
}
}
}
.box-content {
.nestedcarousel {
text-align: center;
.thumbnail {
display: inline-block;
margin: 0 50px;
}
}
}

View file

@ -11,6 +11,7 @@
list-style-type: none;
li {
margin-top: 0;
margin-right: 10px;
color: $type-white;
}

View file

@ -41,6 +41,7 @@
display: inline-block;
position: relative;
float: left;
margin: 0;
height: 100%;
align-self: flex-start;
@ -72,7 +73,7 @@
.link {
> a {
display: block;
padding: 17px 15px 0 15px;
padding: 15px 15px 2px 15px;
height: 33px;
text-decoration: none;

View file

@ -24,63 +24,65 @@
}
}
.search {
margin: 0 20px;
border-right: 0;
color: $type-white;
flex-grow: 3;
.inner > ul > li {
&.search {
margin: 0 20px;
border-right: 0;
color: $type-white;
flex-grow: 3;
.ie9 & {
width: 100%;
}
form {
margin: 0;
}
input {
display: inline-block;
margin-top: 5px;
outline: none;
border: 0;
background-color: $active-gray;
height: 14px;
&[type=submit] {
position: absolute;
background-color: transparent;
background-image: url("/images/nav-search-glass.png");
background-repeat: no-repeat;
background-position: center center;
background-size: 14px 14px;
width: 40px;
height: 40px;
.ie9 & {
width: 100%;
}
&[type=text] {
transition: .15s ease background-color;
padding: 0;
padding-right: 10px;
padding-left: 40px;
width: calc(100% - 50px);
height: 40px;
color: $type-white;
font-size: .85em;
form {
margin: 0;
}
&::placeholder {
$placeholder-transparent: rgba(255, 255, 255, .75);
color: $placeholder-transparent;
input {
display: inline-block;
margin-top: 5px;
outline: none;
border: 0;
background-color: $active-gray;
height: 14px;
&[type=submit] {
position: absolute;
background-color: transparent;
background-image: url("/images/nav-search-glass.png");
background-repeat: no-repeat;
background-position: center center;
background-size: 14px 14px;
width: 40px;
height: 40px;
}
&:focus {
transition: .15s ease background-color;
background-color: $active-dark-gray;
}
&[type=text] {
transition: .15s ease background-color;
padding: 0;
padding-right: 10px;
padding-left: 40px;
width: calc(100% - 50px);
height: 40px;
color: $type-white;
font-size: .85em;
.ie9 & {
width: 70px;
&::placeholder {
$placeholder-transparent: rgba(255, 255, 255, .75);
color: $placeholder-transparent;
}
&:focus {
transition: .15s ease background-color;
background-color: $active-dark-gray;
}
.ie9 & {
width: 70px;
}
}
}
}

View file

@ -1,5 +1,5 @@
@import "../../../colors";
@import "../../../main";
@import "../../../frameless";
#navigation {
h1 {
@ -26,6 +26,13 @@
}
#view {
padding: 0;
}
.index,
.plan,
.expect,
.schedule {
padding: 0 0 20px 0;
p {
@ -46,10 +53,11 @@
}
@media only screen and (max-width: $tablet - 1) {
margin-top: 100px;
margin-top: 50px;
}
.title-banner {
margin-bottom: 0;
background-color: $ui-blue;
padding: 2rem 0;

View file

@ -7,7 +7,7 @@
width: 100%;
color: $type-white;
font-size: .8rem;
font-weight: bold;
font-weight: 500;
justify-content: center;
flex-wrap: wrap;

View file

@ -17,15 +17,18 @@ var store = redux.createStore(
var render = function (jsx, element) {
// Get locale and messages from global namespace (see "init.js")
var locale = window._locale || 'en';
if (typeof window._messages[locale] === 'undefined') {
// Fall back on the split
locale = locale.split('-')[0];
var messages = {};
if (typeof window._messages !== 'undefined') {
if (typeof window._messages[locale] === 'undefined') {
// Fall back on the split
locale = locale.split('-')[0];
}
if (typeof window._messages[locale] === 'undefined') {
// Language appears to not be supported fall back to 'en'
locale = 'en';
}
messages = window._messages[locale];
}
if (typeof window._messages[locale] === 'undefined') {
// Language appears to not be supported fall back to 'en'
locale = 'en';
}
var messages = window._messages[locale];
// Render view component
ReactDOM.render(

View file

@ -26,13 +26,30 @@ h4 {
}
h1 {
line-height: 2.125rem;
font-size: 1.625rem;
font-size: 2.5rem;
font-weight: 900;
}
h2 {
font-size: 2rem;
font-weight: 600;
}
h3 {
font-size: 1.4rem;
font-weight: 500;
}
h4 {
line-height: 1.1rem;
font-size: 1rem;
font-weight: 700;
}
h5 {
text-transform: uppercase;
letter-spacing: 2px;
font-size: .85rem;
font-weight: 700;
}
p {
@ -40,13 +57,42 @@ p {
font-size: .8rem;
}
&.intro {
font-size: 1.1rem;
}
&.callout {
// margin: 1.5em 0;
// border-top: 1px solid $ui-border;
// border-bottom: 1px solid $ui-border;
// padding: 1em 0;
margin: 1.5em 0;
border: 1px solid $active-gray;
border-radius: 5px;
background-color: lighten($ui-blue, 40);
padding: 1.25em;
&.orange {
background-color: lighten($ui-orange, 30);
}
}
a {
white-space: nowrap;
}
}
b {
font-weight: 500;
}
/* Links */
a {
cursor: pointer;
color: $ui-blue;
font-weight: 500;
&:link,
&:visited,
&:active {
@ -55,7 +101,8 @@ a {
}
&:hover {
text-decoration: underline;
text-decoration: none;
color: darken($ui-blue, 15);
}
}
@ -76,6 +123,52 @@ a {
}
}
h1,
h2,
h3,
h4,
h5,
p {
line-height: 1.7em;
color: $type-gray;
}
p {
font-size: 1rem;
font-weight: 300;
}
::selection {
background-color: lighten($ui-blue, 30);
}
ol,
ul {
padding-left: 20px;
line-height: 1.5em;
font-size: 1rem;
font-weight: 300;
li {
margin: .75em 0;
}
}
dl {
line-height: 1.5rem;
font-size: 1rem;
font-weight: 300;
dt {
font-weight: 700;
}
dd {
margin: 0;
}
}
#view {
display: inline-block;

View file

@ -40,13 +40,13 @@ var About = React.createClass({
<div className="body">
<ul>
<li>
<h2><FormattedMessage id='about.whoUsesScratch' /></h2>
<h3><FormattedMessage id='about.whoUsesScratch' /></h3>
<img src="/images/about/who-uses-scratch.jpg" alt="" />
<p><FormattedHTMLMessage id='about.whoUsesScratchDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.literacy' /></h2>
<h3><FormattedMessage id='about.literacy' /></h3>
<iframe
src="https://embed-ssl.ted.com/talks/mitch_resnick_let_s_teach_kids_to_code.html"
scrolling="no"
@ -57,31 +57,31 @@ var About = React.createClass({
</li>
<li>
<h2><FormattedMessage id='about.aroundTheWorld' /></h2>
<h3><FormattedMessage id='about.aroundTheWorld' /></h3>
<img src="/images/about/around-the-world.png" alt="" />
<p><FormattedHTMLMessage id='about.aroundTheWorldDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.schools' /></h2>
<h3><FormattedMessage id='about.schools' /></h3>
<img src="/images/about/scratch-in-schools.jpg" alt="" />
<p><FormattedHTMLMessage id='about.schoolsDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.quotes' /></h2>
<h3><FormattedMessage id='about.quotes' /></h3>
<img src="/images/about/quotes.gif" alt="Quotes about Scratch" />
<p><FormattedHTMLMessage id='about.quotesDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.research' /></h2>
<h3><FormattedMessage id='about.research' /></h3>
<img src="/images/about/research-remix.png" alt="" />
<p><FormattedHTMLMessage id='about.researchDescription' /></p>
</li>
<li>
<h2><FormattedMessage id='about.learnMore' /></h2>
<h3><FormattedMessage id='about.learnMore' /></h3>
<p>
<ul className="list">
<li>
@ -101,7 +101,7 @@ var About = React.createClass({
</li>
<li>
<h2><FormattedMessage id='about.support' /></h2>
<h3><FormattedMessage id='about.support' /></h3>
<p><FormattedHTMLMessage id='about.supportDescription' /></p>
</li>
</ul>

View file

@ -1,72 +1,70 @@
@import "../../colors";
#view {
.masthead {
display: flex;
flex-wrap: no-wrap;
justify-content: space-between;
align-items: stretch;
.masthead {
display: flex;
flex-wrap: no-wrap;
justify-content: space-between;
align-items: stretch;
div {
display: inline-block;
width: calc(50% - 10px);
ul {
margin: 0;
padding: 0;
list-style: none;
}
li {
display: inline-block;
text-transform: uppercase;
&:nth-child(odd) {
margin-right: 10px;
border-right: 1px solid $ui-gray;
padding-right: 10px;
}
}
iframe {
border: 1px solid $ui-gray;
width: 460px;
height: 290px;
}
}
}
.body {
position: relative;
margin: 20px 0 0;
border: 1px solid $ui-gray;
border-radius: 10px;
background: $ui-white;
padding: 26px 40px 6px;
width: calc(100% - 80px);
div {
display: inline-block;
width: calc(50% - 10px);
ul {
display: flex;
margin: 0;
padding: 0;
list-style: none;
justify-content: space-between;
flex-wrap: wrap;
}
li {
display: inline-block;
margin-bottom: 20px;
width: calc(384px + 5px + 5px);
text-transform: uppercase;
&:nth-child(odd) {
margin-right: 10px;
border-right: 1px solid $ui-gray;
padding-right: 10px;
}
}
img,
iframe {
display: block;
border: 1px solid $ui-gray;
padding: 5px;
width: 396px;
height: 222px;
width: 460px;
height: 290px;
}
}
}
.body {
position: relative;
margin: 20px 0 0;
border: 1px solid $ui-gray;
border-radius: 10px;
background: $ui-white;
padding: 26px 40px 6px;
width: calc(100% - 80px);
ul {
display: flex;
margin: 0;
padding: 0;
list-style: none;
justify-content: space-between;
flex-wrap: wrap;
}
li {
display: inline-block;
margin-bottom: 20px;
width: calc(384px + 5px + 5px);
}
img,
iframe {
display: block;
border: 1px solid $ui-gray;
padding: 5px;
width: 396px;
height: 222px;
}
}

View file

@ -1,19 +1,17 @@
@import "../../colors";
@import "../../typography";
@import "../../frameless";
// type-specific margins
#view {
h4 {
margin: 1.5em 0 .3em;
}
h4 {
margin: 1.5em 0 .3em;
}
h1 {
margin: .75em 0 .3em;
}
h1 {
margin: .75em 0 .3em;
}
p {
margin: .25em 0 1em;
}
p {
margin: .25em 0 1em;
}
.cards {

View file

@ -1,5 +1,3 @@
#view {
h1 {
margin: 0 0 10px 0;
}
h1 {
margin: 0 0 10px 0;
}

View file

@ -1,5 +1,5 @@
var React = require('react');
var ReactDOM = require('react-dom');
var render = require('../../../lib/render.jsx');
var FlexRow = require('../../../components/flex-row/flex-row.jsx');
var Page = require('../../../components/page/conference/page.jsx');
@ -283,4 +283,4 @@ var ConferenceExpectations = React.createClass({
}
});
ReactDOM.render(<Page><ConferenceExpectations /></Page>, document.getElementById('app'));
render(<Page><ConferenceExpectations /></Page>, document.getElementById('app'));

View file

@ -1,177 +1,174 @@
@import "../../../colors";
@import "../../../frameless";
@import "../../../typography";
#view {
.flex-row {
align-items: flex-start;
justify-content: space-between;
.flex-row {
align-items: flex-start;
justify-content: space-between;
.card {
width: $cols4;
.card {
width: $cols4;
p {
p {
text-align: left;
}
}
}
.profile {
img {
border-radius: 8em;
width: 80%;
}
h4 {
margin-top: 1.2rem;
}
@media only screen and (max-width: $tablet - 1) {
img {
width: 50%;
}
h2 {
margin: 20px 0;
text-align: center;
font-size: 1.7rem;
}
}
@media only screen and (max-width: $desktop - 1) {
.uneven {
flex-direction: column;
align-items: center;
}
}
}
.keynote {
background-color: $ui-purple;
padding: 48px 0 64px 0;
width: 100%;
h2,
h3,
b,
p {
color: $ui-white;
}
h2 {
margin-bottom: 32px;
}
h3 {
margin: 15px 0;
}
img {
width: 100%;
}
.date {
b {
border-radius: 20px;
background-color: $ui-orange;
padding: 5px 15px;
font-size: .85rem;
}
margin: 15px 0;
}
@media only screen and (max-width: $desktop - 1) {
.flex-row {
flex-direction: column;
align-items: center;
.card {
margin-top: 25px;
text-align: left;
}
}
}
}
.profile {
img {
border-radius: 8em;
width: 80%;
}
h4 {
margin-top: 1.2rem;
}
@media only screen and (max-width: $tablet - 1) {
img {
width: 50%;
}
h2 {
margin: 20px 0;
text-align: center;
font-size: 1.7rem;
}
}
@media only screen and (max-width: $desktop - 1) {
.uneven {
flex-direction: column;
align-items: center;
}
}
}
.keynote {
background-color: $ui-purple;
padding: 48px 0 64px 0;
width: 100%;
h2,
h3,
b,
p {
color: $ui-white;
}
.schedule {
.title {
display: flex;
justify-content: space-between;
align-items: center;
h2 {
margin-bottom: 32px;
}
h3 {
margin: 15px 0;
}
img {
width: 100%;
}
.date {
b {
border-radius: 20px;
background-color: $ui-orange;
padding: 5px 15px;
font-size: .85rem;
}
margin: 15px 0;
}
@media only screen and (max-width: $desktop - 1) {
.flex-row {
flex-direction: column;
align-items: center;
.card {
margin-top: 25px;
text-align: left;
}
}
margin: 0;
}
}
.schedule {
.title {
display: flex;
justify-content: space-between;
align-items: center;
img {
width: 30px;
}
h2 {
margin: 0;
}
}
.callout {
display: flex;
padding: .85rem;
align-items: center;
img {
width: 30px;
margin-right: 30px;
}
}
.callout {
table {
width: $cols4;
th {
display: flex;
padding: .85rem;
border-bottom: thin solid $ui-border;
padding: 2.5%;
align-items: center;
justify-content: flex-start;
h3 {
margin: 0;
}
img {
margin-right: 30px;
}
}
table {
width: $cols4;
td {
display: flex;
border-bottom: thin solid $ui-border;
padding: 2.5%;
height: 60px;
align-items: center;
th {
display: flex;
border-bottom: thin solid $ui-border;
padding: 2.5%;
align-items: center;
justify-content: flex-start;
h3 {
margin: 0;
}
img {
margin-right: 30px;
}
b {
width: 30%;
line-height: 1.7em;
}
td {
display: flex;
border-bottom: thin solid $ui-border;
padding: 2.5%;
height: 60px;
align-items: center;
p {
margin: 0;
width: 70%;
}
}
}
b {
width: 30%;
line-height: 1.7em;
}
@media only screen and (max-width: $desktop - 1) {
.flex-row {
flex-direction: column;
align-items: center;
p {
margin: 0;
width: 70%;
table {
margin-top: 50px;
width: $cols6;
text-align: left;
th {
justify-content: center;
}
}
}
@media only screen and (max-width: $desktop - 1) {
.flex-row {
flex-direction: column;
align-items: center;
table {
margin-top: 50px;
width: $cols6;
text-align: left;
th {
justify-content: center;
}
}
}
}
}
}
}

View file

@ -1,5 +1,5 @@
var React = require('react');
var ReactDOM = require('react-dom');
var render = require('../../../lib/render.jsx');
var Button = require('../../../components/forms/button.jsx');
var FlexRow = require('../../../components/flex-row/flex-row.jsx');
@ -69,4 +69,4 @@ var ConferenceSplash = React.createClass({
}
});
ReactDOM.render(<Page><ConferenceSplash /></Page>, document.getElementById('app'));
render(<Page><ConferenceSplash /></Page>, document.getElementById('app'));

View file

@ -1,61 +1,65 @@
@import "../../../colors";
@import "../../../typography";
@import "../../../frameless";
#view {
background-color: $ui-light-gray;
min-height: initial;
}
.title-banner {
margin-bottom: 0;
background-image: url("/images/conference/index/title-banner.jpg");
padding: 48px 0;
.title-banner {
margin-bottom: 0;
background-image: url("/images/conference/index/title-banner.jpg");
padding: 48px 0;
h1,
h3,
h4,
p {
margin: 0 auto;
padding: 5px 0;
text-align: center;
color: $type-white;
}
h1,
h3,
h4,
p {
margin: 0 auto;
padding: 5px 0;
text-align: center;
color: $type-white;
}
p {
margin-top: 3rem;
p {
margin-top: 3rem;
a {
button {
background-color: $ui-white;
color: $ui-blue;
font-size: 1rem;
}
}
}
@media only screen and (max-width: $mobile - 1) {
h3 {
display: none;
margin-top: 0;
}
p {
margin-top: .25rem;
}
}
@media only screen and (max-width: $desktop - 1) {
h1 {
font-size: 2.5rem;
}
p {
margin-top: 1.5rem;
a {
button {
background-color: $ui-white;
color: $ui-blue;
font-size: 1rem;
}
}
}
@media only screen and (max-width: $mobile - 1) {
h3 {
display: none;
margin-top: 0;
}
p {
margin-top: .25rem;
}
}
@media only screen and (max-width: $desktop - 1) {
h1 {
font-size: 2.5rem;
}
p {
margin-top: 1.5rem;
}
}
}
.index {
.flex-row {
align-items: flex-start;
div {
width: 28%;
text-align: center;
@ -63,12 +67,12 @@
img {
display: block;
margin: auto;
max-width: 65%;
max-width: 125px;
}
@media only screen and (max-width: $tablet - 1) {
margin: .5rem;
width: 60%;
width: 125px;
}
}
}

View file

@ -1,5 +1,5 @@
var React = require('react');
var ReactDOM = require('react-dom');
var render = require('../../../lib/render.jsx');
var Button = require('../../../components/forms/button.jsx');
var FlexRow = require('../../../components/flex-row/flex-row.jsx');
@ -339,4 +339,4 @@ var ConferencePlan = React.createClass({
}
});
ReactDOM.render(<Page><ConferencePlan /></Page>, document.getElementById('app'));
render(<Page><ConferencePlan /></Page>, document.getElementById('app'));

View file

@ -1,113 +1,111 @@
@import "../../../colors";
@import "../../../frameless";
#view {
section {
border-bottom: 2px solid $ui-border;
section {
border-bottom: 2px solid $ui-border;
&.last {
border-bottom: 0;
}
&.last {
border-bottom: 0;
}
}
.flex-row {
align-items: flex-start;
justify-content: space-between;
.flex-row {
align-items: flex-start;
justify-content: space-between;
&.uneven {
img {
width: 100%;
}
@media only screen and (max-width: $tablet - 1) {
img {
width: 30%;
}
}
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
img {
width: 70%;
}
}
}
}
.lodging {
text-align: left;
@media only screen and (max-width: $desktop - 1) {
.uneven {
.short {
display: none;
}
}
}
}
.transportation {
.uneven {
align-items: center;
}
@media only screen and (max-width: $desktop - 1) {
.flex-row {
flex-direction: column-reverse;
}
}
}
.explore {
div {
margin-top: 30px;
}
ul {
display: flex;
max-height: 23rem;
flex-flow: column wrap;
justify-content: flex-start;
&.uneven {
img {
width: 100%;
}
@media only screen and (max-width: $tablet - 1) {
ul {
max-height: 100%;
img {
width: 30%;
}
}
@media only screen and (max-width: $desktop - 1) {
div {
text-align: left;
}
}
}
.faq {
dl {
dt {
font-weight: bold;
}
dd {
margin: 8px 0 32px 0;
}
}
.short {
margin-top: 64px;
border: 2px solid $ui-border;
border-radius: 4px;
background-color: $ui-white;
padding: 16px;
text-align: center;
h3 {
margin: 0;
}
@media only screen and (max-width: $tablet - 1) {
margin-top: 0;
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
img {
width: 70%;
}
}
}
}
.lodging {
text-align: left;
@media only screen and (max-width: $desktop - 1) {
.uneven {
.short {
display: none;
}
}
}
}
.transportation {
.uneven {
align-items: center;
}
@media only screen and (max-width: $desktop - 1) {
.flex-row {
flex-direction: column-reverse;
}
}
}
.explore {
div {
margin-top: 30px;
}
ul {
display: flex;
max-height: 23rem;
flex-flow: column wrap;
justify-content: flex-start;
}
@media only screen and (max-width: $tablet - 1) {
ul {
max-height: 100%;
}
}
@media only screen and (max-width: $desktop - 1) {
div {
text-align: left;
}
}
}
.faq {
dl {
dt {
font-weight: bold;
}
dd {
margin: 8px 0 32px 0;
}
}
.short {
margin-top: 64px;
border: 2px solid $ui-border;
border-radius: 4px;
background-color: $ui-white;
padding: 16px;
text-align: center;
h3 {
margin: 0;
}
@media only screen and (max-width: $tablet - 1) {
margin-top: 0;
}
}
}

View file

@ -1,38 +1,36 @@
@import "../../colors";
#view {
p {
line-height: 1.5rem;
p {
line-height: 1.5rem;
a {
word-wrap: break-word; /* Overrides: https://github.com/LLK/scratch-www/blob/develop/src/main.scss#L43-L47 */
}
}
ul {
display: flex;
margin: 0;
padding: 0;
list-style: none;
flex-wrap: wrap;
}
li {
display: inline-block;
margin: 10px 0;
width: 188px;
text-align: center;
img {
margin: 10px 23px;
border: 2px;
border-style: solid;
border-radius: 50%;
border-color: $ui-dark-gray;
background-color: $ui-white;
padding: 20px;
width: 85px;
height: 85px;
}
a {
word-wrap: break-word; /* Overrides: https://github.com/LLK/scratch-www/blob/develop/src/main.scss#L43-L47 */
}
}
ul {
display: flex;
margin: 0;
padding: 0;
list-style: none;
flex-wrap: wrap;
}
li {
display: inline-block;
margin: 10px 0;
width: 188px;
text-align: center;
img {
margin: 10px 23px;
border: 2px;
border-style: solid;
border-radius: 50%;
border-color: $ui-dark-gray;
background-color: $ui-white;
padding: 20px;
width: 85px;
height: 85px;
}
}

View file

@ -4,8 +4,6 @@ var render = require('../../lib/render.jsx');
var Page = require('../../components/page/www/page.jsx');
var Box = require('../../components/box/box.jsx');
require('./dmca.scss');
var Dmca = React.createClass({
type: 'Dmca',
render: function () {

View file

@ -1,2 +0,0 @@
@import "../../colors";
@import "../../typography";

View file

@ -1,15 +1,12 @@
@import "../../colors";
@import "../../typography";
#view {
.guidelines-footer {
.guidelines-footer {
margin-top: 1.5rem;
text-align: center;
}
dl {
dt {
margin-top: 1.5rem;
text-align: center;
}
dl {
dt {
margin-top: 1.5rem;
}
}
}

View file

@ -5,220 +5,224 @@ $base-bg: $ui-white;
#view {
padding: 0;
}
// To be integrated into the Global Typography standards
h3,
p {
font-weight: 300;
.title-banner {
&.wbb-bg {
background-image: url("/images/hoc2015/hide-bg.jpg");
}
p {
line-height: 2em;
&.dance-bg {
background-image: url("/images/hoc2015/dance-bg.jpg");
}
.title-banner {
&.wbb-bg {
background-image: url("/images/hoc2015/hide-bg.jpg");
}
&.dance-bg {
background-image: url("/images/hoc2015/dance-bg.jpg");
}
&.name-bg {
background-image: url("/images/hoc2015/name-bg.jpg");
}
section {
border: 0;
padding: 10px 0;
max-width: $desktop;
.card-deck {
padding: 0 20px;
}
//6 columns
@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
max-width: $mobile;
}
}
}
.flex-row {
.card {
margin: 10px;
border-radius: 7px;
background-color: $active-gray;
padding: 2px;
width: 30%;
min-width: 200px;
max-width: 230px;
.card-info {
border-radius: 5px;
background-color: $base-bg;
width: 100%;
height: 100%;
button,
img {
width: calc(100% - 20px);
}
img {
margin: 10px 10px 5px 10px;
border-radius: 5px;
}
button {
margin: 0 10px 10px 10px;
}
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
margin: 2px;
min-width: 175px;
button {
font-size: .7em;
}
}
}
&.name-bg {
background-image: url("/images/hoc2015/name-bg.jpg");
}
section {
display: flex;
margin: 0 auto;
border-bottom: 1px solid $ui-border;
padding: 50px 0;
width: 95%;
border: 0;
padding: 10px 0;
max-width: $desktop;
justify-content: center;
flex-wrap: wrap;
align-items: center;
p {
margin: 10px auto 20px;
max-width: 600px;
}
&:last-child {
border-bottom: 0;
}
&.one-up {
text-align: center;
.column {
width: 100%;
}
}
&.two-up {
.column {
min-width: 200px;
max-width: 40%;
text-align: left;
img {
border-radius: 5px;
width: 100%;
}
}
}
}
.resource,
.studio {
display: flex;
margin: 10px 0;
min-width: 200px;
text-align: left;
justify-content: center;
align-items: center;
img {
margin-right: 15px;
}
h5 {
margin: 8px 0;
font-weight: 500;
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
display: block;
width: 30%;
min-width: 180px;
text-align: center;
img {
margin: 0 auto;
}
}
}
.resource {
width: 33%;
a {
display: block;
margin: 5px 0;
font-size: .8em;
}
}
.studio {
width: 50%;
h5 {
width: 200px;
}
img {
float: left;
}
@media only screen and (max-width: $mobile - 1) {
display: inline-block;
.card-deck {
padding: 0 20px;
}
//6 columns
@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
display: inline-block;
max-width: $mobile;
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
h5 {
width: 100%;
}
img {
float: none;
}
}
}
.logos {
margin: 20px 0;
width: 100%;
img {
margin: 20px;
max-width: 150px;
max-height: 55px;
vertical-align: middle;
}
}
.trademark {
margin-top: 20px;
}
}
.flex-row {
.card {
margin: 10px;
border-radius: 7px;
background-color: $active-gray;
padding: 2px;
width: 30%;
min-width: 200px;
max-width: 230px;
.card-info {
border-radius: 5px;
background-color: $base-bg;
width: 100%;
height: 100%;
button,
img {
width: calc(100% - 20px);
}
img {
margin: 10px 10px 5px 10px;
border-radius: 5px;
}
button {
margin: 0 10px 10px 10px;
}
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
margin: 2px;
min-width: 175px;
button {
font-size: .7em;
}
}
}
}
section {
display: flex;
margin: 0 auto;
border-bottom: 1px solid $ui-border;
padding: 50px 0;
width: 95%;
justify-content: center;
flex-wrap: wrap;
align-items: center;
p {
margin: 10px auto 20px;
max-width: 600px;
}
&:last-child {
border-bottom: 0;
}
&.one-up {
text-align: center;
.column {
width: 100%;
}
}
&.two-up {
.column {
min-width: 200px;
max-width: 40%;
text-align: left;
img {
border-radius: 5px;
width: 100%;
}
}
}
}
.resource,
.studio {
display: flex;
margin: 10px 0;
min-width: 200px;
text-align: left;
justify-content: center;
align-items: center;
img {
margin-right: 15px;
}
a {
h5 {
margin: 8px 0;
color: $ui-blue;
font-weight: 500;
&:hover {
color: darken($ui-blue, 15);
}
}
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
display: block;
width: 30%;
min-width: 180px;
text-align: center;
img {
margin: 0 auto;
}
}
}
.resource {
width: 33%;
a {
display: block;
margin: 5px 0;
font-size: .8em;
}
.resource-info {
h5 {
margin: .85rem 0;
line-height: 0;
}
}
}
.studio {
width: 50%;
h5 {
width: 200px;
}
img {
float: left;
}
@media only screen and (max-width: $mobile - 1) {
display: inline-block;
}
@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
display: inline-block;
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
h5 {
width: 100%;
}
img {
float: none;
}
}
}
.logos {
margin: 20px 0;
width: 100%;
img {
margin: 20px;
max-width: 150px;
max-height: 55px;
vertical-align: middle;
}
}
.trademark {
margin-top: 20px;
}

View file

@ -1,55 +1,53 @@
@import "../../colors";
#view {
h1 {
line-height: 2.6rem;
font-size: 2.3rem;
font-weight: 300;
h1 {
line-height: 2.6rem;
font-size: 2.3rem;
font-weight: 300;
}
h2 {
font-size: 1.8rem;
font-weight: 300;
}
.top {
img {
margin-bottom: 10px;
}
}
.middle {
margin: 20px 0;
background-color: $ui-gray;
padding: 40px 0;
width: 100%;
}
.bottom {
width: 100%;
line-height: 200%;
.thin-heading {
padding: 20px 0;
}
h2 {
font-size: 1.8rem;
font-weight: 300;
p {
margin: auto;
width: 70%;
}
.top {
img {
margin-bottom: 10px;
}
}
ul {
padding: 0;
.middle {
margin: 20px 0;
background-color: $ui-gray;
padding: 40px 0;
width: 100%;
}
list-style: none;
.bottom {
width: 100%;
line-height: 200%;
.thin-heading {
padding: 20px 0;
}
p {
margin: auto;
width: 70%;
}
ul {
li {
margin: 0;
padding: 0;
list-style: none;
li {
margin: 0;
padding: 0;
span {
margin-left: 10px;
}
span {
margin-left: 10px;
}
}
}

View file

@ -1,33 +1,31 @@
#view {
.splash-header {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
.splash-header {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
.ie9 & {
display: table;
margin: 0 -20px 20px -20px;
min-width: 100%;
border-spacing: 20px 0;
}
.box {
display: inline-block;
width: calc(60% - 20px);
.ie9 & {
display: table-cell;
vertical-align: top;
}
}
.news {
width: 40%;
}
.ie9 & {
display: table;
margin: 0 -20px 20px -20px;
min-width: 100%;
border-spacing: 20px 0;
}
.box {
margin-bottom: 20px;
}
display: inline-block;
width: calc(60% - 20px);
.ie9 & {
display: table-cell;
vertical-align: top;
}
}
.news {
width: 40%;
}
}
.box {
margin-bottom: 20px;
}

View file

@ -1,225 +1,224 @@
@import "../../colors";
@import "../../frameless";
@import "../../typography";
#view {
padding: 0;
}
h3,
h4 {
margin: 1.5em 0 .3em;
h3,
h4 {
margin: 1.5em 0 .3em;
}
h2 {
margin: .75em 0 .3em;
}
p {
margin: .25em 0 1em;
&.intro {
margin-bottom: 1em;
}
&.callout {
padding: .75em 1em;
text-align: center;
}
}
.top-banner {
margin-bottom: 50px;
background-color: $ui-blue;
padding: 50px 0;
width: 100%;
h2 {
margin: .75em 0 .3em;
color: $ui-white;
}
p {
margin: .25em 0 1em;
&.intro {
margin-bottom: 1em;
}
&.callout {
padding: .75em 1em;
text-align: center;
}
color: $ui-white;
}
.top-banner {
margin-bottom: 50px;
background-color: $ui-blue;
padding: 50px 0;
width: 100%;
h2 {
color: $ui-white;
}
p {
color: $ui-white;
}
.columns2 {
display: flex;
justify-content: space-between;
align-items: center;
}
.banner-text {
max-width: $cols7;
}
.banner-photo {
max-width: $cols4;
img {
width: 100%;
}
}
}
section {
margin-bottom: 50px;
text-align: center;
}
// Getting Started Section
.columns3 {
.columns2 {
display: flex;
justify-content: space-between;
.column {
margin: 15px;
max-width: $cols4;
img {
margin: 0 auto;
width: 80%;
}
}
align-items: center;
}
// Project Highlight Section
#starter-projects {
h3,
p {
text-align: center;
}
.banner-text {
max-width: $cols7;
}
.banner {
background-color: $ui-gray;
padding: 10px 0 50px;
h3 {
margin-top: 30px;
}
}
.project-list {
display: flex;
margin: 0 auto;
max-width: $cols9;
justify-content: space-between;
}
.project-card {
transition: transform .25s ease;
margin: 10px;
border-radius: 7px;
background-color: $ui-white;
max-width: $cols3;
overflow: hidden;
img {
border-bottom: 2px solid $ui-white;
width: 100%;
}
p {
display: block;
margin: 15px 15px 20px;
color: $ui-blue;
font-weight: 500;
}
&:hover {
transform: scale(1.1, 1.1);
transition: transform .25s ease;
cursor: pointer;
p {
color: darken($ui-blue, 15);
}
}
}
// Device Cards
.device-card {
display: inline-block;
margin: 0 10px;
max-width: $cols3;
.banner-photo {
max-width: $cols4;
img {
width: 100%;
}
}
}
// Responsive Behavior
section {
margin-bottom: 50px;
text-align: center;
}
//4 columns
@media only screen and (max-width: $mobile - 1) {
.inner {
// Getting Started Section
.columns3 {
display: flex;
justify-content: space-between;
.column {
margin: 15px;
max-width: $cols4;
img {
margin: 0 auto;
width: calc(100% - 40px);
}
.top-banner {
text-align: center;
.banner-photo {
display: none;
}
}
.project-list,
.columns3 {
display: block;
}
.project-card,
.columns3 .column {
display: block;
margin: 20px auto;
width: $cols6;
}
}
//6 columns
@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
.project-list,
.columns3 {
display: inline-block;
}
.top-banner {
text-align: center;
.banner-photo {
display: none;
}
}
.project-card,
.columns3 .column {
display: inline-block;
width: $cols6;
}
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
#view {
text-align: center;
}
.top-banner {
text-align: left;
.banner-photo {
max-width: $cols3;
}
}
.inner {
margin: 0 auto;
width: $tablet;
width: 80%;
}
}
}
// Project Highlight Section
#starter-projects {
h3,
p {
text-align: center;
}
}
.banner {
background-color: $ui-gray;
padding: 10px 0 50px;
h3 {
margin-top: 30px;
}
}
.project-list {
display: flex;
margin: 0 auto;
max-width: $cols9;
justify-content: space-between;
}
.project-card {
transition: transform .25s ease;
margin: 10px;
border-radius: 7px;
background-color: $ui-white;
max-width: $cols3;
overflow: hidden;
img {
border-bottom: 2px solid $ui-white;
width: 100%;
}
p {
display: block;
margin: 15px 15px 20px;
color: $ui-blue;
font-weight: 500;
}
&:hover {
transform: scale(1.1, 1.1);
transition: transform .25s ease;
cursor: pointer;
p {
color: darken($ui-blue, 15);
}
}
}
// Device Cards
.device-card {
display: inline-block;
margin: 0 10px;
max-width: $cols3;
img {
width: 100%;
}
}
// Responsive Behavior
//4 columns
@media only screen and (max-width: $mobile - 1) {
.inner {
margin: 0 auto;
width: calc(100% - 40px);
}
.top-banner {
text-align: center;
.banner-photo {
display: none;
}
}
.project-list,
.columns3 {
display: block;
}
.project-card,
.columns3 .column {
display: block;
margin: 20px auto;
width: $cols6;
}
}
//6 columns
@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
.project-list,
.columns3 {
display: inline-block;
}
.top-banner {
text-align: center;
.banner-photo {
display: none;
}
}
.project-card,
.columns3 .column {
display: inline-block;
width: $cols6;
}
}
//8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
#view {
text-align: center;
}
.top-banner {
text-align: left;
.banner-photo {
max-width: $cols3;
}
}
.inner {
margin: 0 auto;
width: $tablet;
}
}