diff --git a/public/site/2015-05/_includes/header.html b/public/site/2015-05/_includes/header.html index 59c7520e..fc1e964a 100644 --- a/public/site/2015-05/_includes/header.html +++ b/public/site/2015-05/_includes/header.html @@ -11,12 +11,12 @@ diff --git a/public/site/2015-05/_sass/_layout.scss b/public/site/2015-05/_sass/_layout.scss index 9b5d95a2..643f2e14 100644 --- a/public/site/2015-05/_sass/_layout.scss +++ b/public/site/2015-05/_sass/_layout.scss @@ -21,7 +21,7 @@ h1 { margin: 0; font-family: 'Rubik Mono One', sans-serif; - font-size: 2.5em; + font-size: 2em; text-align: center; } h2 { @@ -92,42 +92,43 @@ header { &::before, &::after { position: absolute; - background-size: cover !important; - opacity: 0; - transition: 0.3s opacity; - z-index: -1; - width: 100%; - height: 100%; - content: " "; + background-color: black; + background-size: cover !important; + opacity: 0; + transition: 0.3s opacity; + z-index: -1; + width: 100%; + height: 100%; + content: ''; } &::after { - z-index: -2; - background: url('../img/hero_main.jpg') center top; - opacity: 1; + z-index: -2; + background: url('../img/hero_main.jpg') center top; + opacity: 1; } &.hero_ios::before { - background: url('../img/hero_ios.jpg') center top; - opacity: 1; + background: url('../img/hero_ios.jpg') center center; + opacity: 1; } &.hero_android::before { - background: url('../img/hero_android.jpg') center center; - opacity: 1; + background: url('../img/hero_android.jpg') center center; + opacity: 1; } &.hero_mac::before { - background: url('../img/hero_mac.jpg') center center; - opacity: 1; + background: url('../img/hero_mac.jpg') center top; + opacity: 1; } &.hero_desktop::before { - background: url('../img/hero_desktop.jpg') center bottom; - opacity: 1; + background: url('../img/hero_desktop.jpg') center bottom; + opacity: 1; } &.hero_cli::before { - background: url('../img/hero_cli.jpg') center center; - opacity: 1; + background: url('../img/hero_cli.jpg') center bottom; + opacity: 1; } &.hero_web::before { - background: url('../img/hero_web.jpg') center center; - opacity: 1; + background: url('../img/hero_web.jpg') center center; + opacity: 1; } h1 { height: 1em; @@ -183,7 +184,7 @@ header.large, section { } section { box-sizing: border-box; - padding: 3em 100px; + padding: 2em 100px; font-size: 1.2em; } @@ -200,6 +201,9 @@ input { input:hover { background: rgba(200, 200, 200, 1); } +input[type=button] { + cursor: pointer; +} input[type=checkbox] { display: none; @@ -218,7 +222,7 @@ input[type=checkbox] { background: black; } } -#calculator table { +.widget_calculator table { height: 200px; padding: 4px; margin: 1em auto; @@ -243,26 +247,85 @@ input[type=checkbox] { } } } +.widget_gallery { + box-shadow: 0 0 1px black; + border-radius: 4px; + + & > ul { + display: flex; + list-style: none; + justify-content: space-around; + + li { + height: 100px; + + label { + display: block; + box-sizing: border-box; + width: 100%; + height: 100%; + padding: 1em; + + background: rgba(240, 240, 240, 1); + box-shadow: 0 0 2px black; + border-radius: 4px; + + cursor: pointer; + + &:hover { + background: rgba(200, 200, 200, 1); + } + + img { + display: block; + width: 100%; + height: 100%; + margin: 0; + box-shadow: none; + } + } + } + } + input[type=radio] { + display: none; + + & + div { + display:none; + margin: 1px; + padding: 2em; + background: rgba(240, 240, 240, 1); + } + &:checked + div { + display:block; + } + } +} +.widget_test ul { + list-style: none; + + li { + border-left: 4px solid rgba(200, 200, 200, 1); + } + + label { + font-size: 1.2em; + font-weight: 400; + } + + input[type=checkbox] { + & + label + div { + display:none; + margin: 1ex 0; + padding: 1ex 2em; + background: rgba(240, 240, 240, 1); + + font-weight: 100; + } + &:checked + label + div { + display:block; + } + } +} .flex-auto { flex: auto; } -.item_toggler { - font-size: 1.2em; - font-weight: 400; - list-style: none; - - border-left: 4px solid rgba(200, 200, 200, 1); - - .toggle_item { - display: none; - margin: 1ex 0; - padding: 1ex 2em; - background: rgba(240, 240, 240, 1); - - font-size: 0.83em; - font-weight: 100; - } - input:checked ~ .toggle_item { - display: block; - } -} diff --git a/public/site/2015-05/img/hero_desktop.jpg b/public/site/2015-05/img/hero_desktop.jpg index 72ed0d22..d4b1c973 100644 Binary files a/public/site/2015-05/img/hero_desktop.jpg and b/public/site/2015-05/img/hero_desktop.jpg differ diff --git a/public/site/2015-05/img/hero_mac.jpg b/public/site/2015-05/img/hero_mac.jpg index fb047597..c54773f5 100644 Binary files a/public/site/2015-05/img/hero_mac.jpg and b/public/site/2015-05/img/hero_mac.jpg differ diff --git a/public/site/2015-05/img/hero_main.jpg b/public/site/2015-05/img/hero_main.jpg index c54773f5..fb047597 100644 Binary files a/public/site/2015-05/img/hero_main.jpg and b/public/site/2015-05/img/hero_main.jpg differ diff --git a/public/site/2015-05/index.html b/public/site/2015-05/index.html index de8e6472..3ce49b7f 100644 --- a/public/site/2015-05/index.html +++ b/public/site/2015-05/index.html @@ -21,48 +21,63 @@ header: large Master Password's unique approach makes you safer from loss, theft, problems with backups, sync, confiscation, snooping, and more.

-

Let's see how Master Password could help you: -

-

+
+

Let's see how Master Password could help.
+ Check the boxes that apply to you:

+ + +
diff --git a/public/site/2015-05/js/main.js b/public/site/2015-05/js/main.js index 9e888f96..086e3dd9 100644 --- a/public/site/2015-05/js/main.js +++ b/public/site/2015-05/js/main.js @@ -8,41 +8,44 @@ $(function() { }); }); - var lhs = null; - var operator = null; - function calculator_apply() { - var display = $("#calculator input[type=text]"); - if (lhs && operator == '-') - display.val(parseInt(lhs) - parseInt(display.val())); - else if (lhs && operator == '+') - display.val(parseInt(lhs) + parseInt(display.val())); - } - $("#calculator input[type=button]").click(function() { - var display = $("#calculator input[type=text]"); - var value = $(this).val(); + $.each($(".widget_calculator"), function(i, calculator) { + calculator = $(calculator); + var display = calculator.find("input[type=text]"); + var lhs = null, operator = null; - if (value == '-' || value == '+') { - if (operator == value && !display.val()) + function calculator_apply() { + if (lhs && operator == '-') + display.val(parseInt(lhs) - parseInt(display.val())); + else if (lhs && operator == '+') + display.val(parseInt(lhs) + parseInt(display.val())); + } + + calculator.find("input[type=button]").click(function() { + var value = $(this).val(); + + if (value == '-' || value == '+') { + if (operator == value && !display.val()) + operator = null; + + else { + calculator_apply(); + operator = value; + lhs = display.val(); + display.val(''); + } + } else if (value == 'C') { operator = null; - - else { - calculator_apply(); - operator = value; - lhs = display.val(); + lhs = null; display.val(''); - } - } else if (value == 'C') { - operator = null; - lhs = null; - display.val(''); - } else if (value == '=') - calculator_apply(); - else - display.val(display.val() + '' + value); + } else if (value == '=') + calculator_apply(); + else + display.val(display.val() + '' + value); - $("#calculator input").removeClass('selected'); - if (operator) - $("#calculator input[value='" + operator + "']").addClass('selected'); + calculator.find("input").removeClass('selected'); + if (operator) + calculator.find("input[value='" + operator + "']").addClass('selected'); + }); }); }); diff --git a/public/site/2015-05/what.html b/public/site/2015-05/what.html index 8dea06da..98df4a6b 100644 --- a/public/site/2015-05/what.html +++ b/public/site/2015-05/what.html @@ -13,9 +13,9 @@ nav: what

Master Password is the answer to the problem that websites have forced on us.

Master Password is not a password manager. It is not a secure vault or a digital notebook. It is something else entirely, and yet something so simple.

-

Think of it as, a store-bought calculator. If your name was 1337, your master password was 5317 and your site was named 707, take any calculator in the world and type in 1337 + 5317 + 707 to get your site's account password, = 7361.

+

Think of it as, a store-bought calculator. If your name was 1337, your master password was 5317 and you'd like to log into the site 707, take any calculator in the world and type in 1337 + 5317 + 707 to get the password to use for this site, = 7361.

-
+
@@ -79,10 +79,10 @@ nav: what

Can somebody steal your password? Just hit .
What are you going to do if you forget your site's password? Just redo the math.
- What if you lose or break your device? Borrow a buddy's, get a new one, math is universal.
+ What if you lose or break your device? Borrow a buddy's or get a new one, math is universal.
Does a calculator need to sync with the cloud before you can use it? No, just remember your own name and master password.

This is the freedom Master Password gives you.
- Master Password performs a similar but cryptographically secure operation, while making everything else easy for you.

+ Master Password performs a similar but cryptographically secure operation, hardened by interweaving primitives against both known and unknown attack vectors, ensuring that targeting your identity remains absolutely insurmountable.


With Master Password you leave no passwords laying around. You no longer store passwords in commercial, proprietory apps and no longer send them off to the cloud. You are no longer tied to your laptop or the internet if you need to look one up. Even if a personal or natural catastrophe causes you loss, you can never lose your account passwords — all you ever need is your one and only secret master password and anyone's Master Password calculator app.

diff --git a/public/site/2015-05/why.html b/public/site/2015-05/why.html index 9a0bb0d8..b9d9e76c 100644 --- a/public/site/2015-05/why.html +++ b/public/site/2015-05/why.html @@ -4,7 +4,7 @@ nav: why ---
-

Why bother?

+

Why do I need it?

Passwords are frustrating.

@@ -16,7 +16,77 @@ nav: why

Do you really have passwords?
Or does something or someone else have them for you?

-

+ + +

A password is something you know,
not something you have.