From 766f42f802dceeb6b89860f4d3d8531cfe049775 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 3 Dec 2015 07:38:07 -0500 Subject: [PATCH] where I was last week --- controller/action/CreditActions.class.php | 2 - view/fund/currentGoal.php | 17 +++ view/fund/header.php | 27 +++++ view/layout/basic.php | 1 + view/nav/footer.php | 3 + view/page/fund-after.php | 21 ++++ view/page/fund.php | 110 +++++++++++--------- view/page/goals.php | 42 ++++++++ view/page/home.php | 57 +++++----- view/page/learn.php | 12 +-- web/js/global.js | 11 +- web/scss/_content.scss | 2 + web/scss/_cover.scss | 20 +++- web/scss/_sale.scss | 120 +++++++++++++++++----- 14 files changed, 327 insertions(+), 118 deletions(-) create mode 100644 view/fund/currentGoal.php create mode 100644 view/fund/header.php create mode 100644 view/page/fund-after.php create mode 100644 view/page/goals.php diff --git a/controller/action/CreditActions.class.php b/controller/action/CreditActions.class.php index 4fe2dc3b..94692977 100644 --- a/controller/action/CreditActions.class.php +++ b/controller/action/CreditActions.class.php @@ -12,8 +12,6 @@ class CreditActions extends Actions $fundStartTime = strtotime('2015-11-15'); $daysActive = floor((time() - $fundStartTime) / (60*60*24)); return ['page/fund', [ - 'totalUSD' => CreditApi::getTotalDollarSales(), - 'totalPeople' => CreditApi::getTotalPeople(), 'creditsPerDollar' => CreditApi::getCreditsPerDollar($daysActive), 'creditsPerDollarTomorrow' => CreditApi::getCreditsPerDollar($daysActive + 1), ]]; diff --git a/view/fund/currentGoal.php b/view/fund/currentGoal.php new file mode 100644 index 00000000..64aa7201 --- /dev/null +++ b/view/fund/currentGoal.php @@ -0,0 +1,17 @@ + + +
+

+ I18n::formatCurrency($goalAmount)]) ?> + See all goals. +

+
+
+
+
+
+
+ % + funded +
+
\ No newline at end of file diff --git a/view/fund/header.php b/view/fund/header.php new file mode 100644 index 00000000..96e269cc --- /dev/null +++ b/view/fund/header.php @@ -0,0 +1,27 @@ + + +
+
+

Fund LBRY

+
+
+
+

+ + people gave + + to + + ', [ + __('build a better future'), + __('eliminate corporate middlemen'), + __('keep art alive'), + __('create a more sustainable internet'), + __('protect freedom of speech'), + __('reduce the cost of education'), + ]) ?> + +

+
+
+
\ No newline at end of file diff --git a/view/layout/basic.php b/view/layout/basic.php index cd4f8f2e..1ea50f0c 100644 --- a/view/layout/basic.php +++ b/view/layout/basic.php @@ -23,6 +23,7 @@ + diff --git a/view/nav/footer.php b/view/nav/footer.php index 9405ef50..c7cfd750 100644 --- a/view/nav/footer.php +++ b/view/nav/footer.php @@ -3,6 +3,9 @@
+
+ +
diff --git a/view/page/fund-after.php b/view/page/fund-after.php new file mode 100644 index 00000000..a7cfd61c --- /dev/null +++ b/view/page/fund-after.php @@ -0,0 +1,21 @@ + + +
+
+
+
+ Fund LBRY +
+
+
+

Thank You!!!

+

OMG thanks for paying.

+

Here is a unique URL that you can use to refer others. You get 10% bonus credits for anyone who uses it.

+

http://lbry.io/i/butts

+

Here are some details about how to claim them or other things you would want to know.

+
+
+
+
+
+ diff --git a/view/page/fund.php b/view/page/fund.php index 83057ced..7df6d08e 100644 --- a/view/page/fund.php +++ b/view/page/fund.php @@ -1,58 +1,54 @@ - - + + false]) ?>
-
-
-

Fund LBRY

-
-
-
-

- - have given - - to -
- - ', [ - __('build a better future'), - __('eliminate corporate middlemen'), - __('keep art alive'), - __('create a more sustainable internet'), - __('protect freedom of speech'), - __('reduce the cost of education'), - ]) ?> - -

-
-
+ +

Current Goal

+
+

Select Your Level

    • -
    • -
    • +
    • +
    • -
    • -
    • +
    • +
    • -
    • +
- + + +
    +
    • +
    • +
    • +
    • +
+ + +
    +
    • +
    • +
    • +
    • +
+ +
'basic', @@ -65,19 +61,30 @@ 'cost' => 25, 'rewardHtml' => $standardRewardHtml ], [ - 'id' => 'premium', - 'label' => __('Premium'), + 'id' => 'optimal', + 'label' => __('Optimal'), 'cost' => 100, - 'rewardHtml' => $premiumRewardHtml + 'rewardHtml' => $optimalRewardHtml + ], [ + 'id' => 'prometheus ', + 'label' => __('Prometheus'), + 'cost' => 1000, + 'rewardHtml' => $prometheusRewardHtml + ], [ + 'id' => 'apollo', + 'label' => __('Apollo'), + 'cost' => 10000, + 'rewardHtml' => $apolloRewardHtml ]] as $level): ?> -
+ +

- - + +
- <?php echo __('Pay with Bitcoin') ?> + <?php echo __('Pay with Bitcoin') ?>
- <?php echo __('Pay with PayPal') ?> + <?php echo __('Pay with PayPal') ?>
- +
-

+

- +

-

+

@@ -157,21 +164,24 @@

-

+

- +

- +

-

+

- + '' . __('Learn') . '', + '%address%' => 'fund@lbry.io', + ]) ?>

diff --git a/view/page/goals.php b/view/page/goals.php new file mode 100644 index 00000000..9f72d5b5 --- /dev/null +++ b/view/page/goals.php @@ -0,0 +1,42 @@ + + + false]) ?> +
+
+
+ +

+ +

+ +

Core development continues through 2016.

+ + +

Android and iPhone so cool.

+ +
+
+
+ 'Core Development Continues', + 'amount' => 25000, + 'rewardHtml' => $coreDevRewardHtml + ], [ + 'name' => 'Android and iPhone Apps', + 'amount' => 50000, + 'rewardHtml' => $appRewardHtml + ]] as $goal): ?> +
+

+
+
+
+
+
+
+ +
+
+
+
+ diff --git a/view/page/home.php b/view/page/home.php index ec7c1f33..5cf93a38 100644 --- a/view/page/home.php +++ b/view/page/home.php @@ -9,40 +9,35 @@

Stream, Share, Earn.

-
-
- - -
- - - in - - ', $labels) ?> - + + +
+ + + others in + + ', $labels) ?> + +
+
+
+ Fund LBRY
-
-
- Fund LBRY -
-
- Learn More -
+
+ Learn More
-
-
- -
+
+
diff --git a/view/page/learn.php b/view/page/learn.php index 4d7c2d3d..9c2dc801 100644 --- a/view/page/learn.php +++ b/view/page/learn.php @@ -3,8 +3,8 @@ false]) ?>
-
-
+
+

@@ -24,13 +24,13 @@ Our goal is to provide a single box that allows anyone anywhere to find and purchase digital content from anyone else.

- +
-
-
+
+

@@ -40,7 +40,7 @@

- +
diff --git a/web/js/global.js b/web/js/global.js index 9f555aef..5ef9d57b 100644 --- a/web/js/global.js +++ b/web/js/global.js @@ -24,7 +24,16 @@ $(document).ready(function() { if (labelCycles.length) { - setInterval(refreshLabelCycles,6000); + setInterval(refreshLabelCycles,5000); + labelCycles.each(function() { + var labelCycle = $(this), + maxHeight = Math.max.apply(Math, labelCycles.find('> *').map(function(){ return $(this).height(); }).get()); + if (maxHeight) + { + labelCycle.height(maxHeight); + } + labelCycle.addClass('label-cycle-init'); + }); } function onAnchorClick() diff --git a/web/scss/_content.scss b/web/scss/_content.scss index 4841593c..40d216e3 100644 --- a/web/scss/_content.scss +++ b/web/scss/_content.scss @@ -45,6 +45,8 @@ { color: $color-meta-light; } + + .link-primary { color: $color-primary; } } p diff --git a/web/scss/_cover.scss b/web/scss/_cover.scss index b2145e03..df81210e 100644 --- a/web/scss/_cover.scss +++ b/web/scss/_cover.scss @@ -17,18 +17,29 @@ } @media (max-width: $mobile-width-threshold) { .cover { padding: $spacing-vertical $spacing-vertical * 2 / 3; } - .cover-title { margin-bottom: $spacing-vertical; } + .cover-title { font-size: 2.4em; margin-bottom: $spacing-vertical; } +} +@media (min-width: $mobile-width-threshold) { + .cover-title { font-size: 3.6em; } } @media (max-width: $max-content-width) and (min-width: $mobile-width-threshold) { - .cover { padding: $spacing-vertical * 2 $spacing-vertical * 2; } + .cover { padding: $spacing-vertical * 1.5 $spacing-vertical * 2; } .cover-column { padding-left: $spacing-vertical * 0.5; padding-right: $spacing-vertical * 0.5; } } @media (min-width: $max-content-width) { - .cover { padding: $spacing-vertical * 2 $spacing-vertical * 3; } + .cover { padding: $spacing-vertical * 1.5 $spacing-vertical * 3; } .cover-column { padding-left: $spacing-vertical * 1.5; padding-right: $spacing-vertical * 1.5; } - .cover-title { margin-bottom: $spacing-vertical * 2; } } +.cover-stretch-wrap +{ + @include display-flex(); + @include flex-direction(column); + > .cover + { + @include flex(1); + } +} .cover-center { @include flex-direction(column); @@ -60,7 +71,6 @@ .cover-title { - font-size: 3.6em; line-height: 1.4; } .cover-subtitle diff --git a/web/scss/_sale.scss b/web/scss/_sale.scss index b0db0b78..509ef2a1 100644 --- a/web/scss/_sale.scss +++ b/web/scss/_sale.scss @@ -1,51 +1,72 @@ @import "global"; +.sale-title +{ + margin-bottom: 0; + font-size: 1.5em; +} .sale-title-filler { - font-size: 0.6em; + font-size: 0.65em; color: #ddd; } .sale-title-emphasis { - font-size: 1.25em; - font-weight: bold; + font-size: 1.35em; +} + +.sale-ctas +{ + display: block; +} +.sale-cta +{ + display: block; } .sale-call { text-align: center; - padding: $spacing-vertical 30px; + margin-bottom: $spacing-vertical / 2; .sale-call-total-people { font-weight: bold; font-size: 2.4em; } - .sale-cta - { - font-weight: bold; - font-size: 2.0em; - display: inline-block; - min-height: $spacing-vertical * 4; - } .sale-call-prep, .sale-call-verb { - display: block; font-size: 0.85em; } + .sale-ctas + { + margin-bottom: $spacing-vertical; + } + .sale-cta + { + font-size: 2.0em; + font-weight: bold; + } .sale-call-verb { margin-bottom: $spacing-vertical / 4; + margin-right: 10px; } .sale-call-prep { - margin: $spacing-vertical / 2 0 $spacing-vertical / 4; + margin: 10px $spacing-vertical / 2 0 $spacing-vertical / 4; } } .label-cycle { - :not(:first-child) + visibility: hidden; + display: block; + &.label-cycle-init { - display: none; + visibility: visible; + :not(:first-child) + { + display: none; + } } } @@ -54,16 +75,21 @@ @include border-radius(5px); background: #fff; color: #111; - padding: $spacing-vertical $spacing-vertical / 2; - margin: 0 $spacing-vertical / 2 $spacing-vertical; + padding: $spacing-vertical; cursor: pointer; position: relative; - &:hover + margin-bottom: $spacing-vertical; + &.sale-level-clickable { - padding-left: $spacing-vertical; - padding-right: $spacing-vertical; - margin-left: 0; - margin-right: 0; + padding: $spacing-vertical $spacing-vertical / 2; + margin: 0 $spacing-vertical / 2 $spacing-vertical; + &:hover + { + padding-left: $spacing-vertical; + padding-right: $spacing-vertical; + margin-left: 0; + margin-right: 0; + } } } .sale-level-label @@ -136,6 +162,55 @@ color: #444; } +.goal-wrap { + width: 100%; + padding: 0 20px; + @include clearfix(); +} + +.goal-glass { + width: 100%; + height: $spacing-vertical; + background: #c7c7c7; + border-radius: 10px; + overflow: hidden; +} + +.goal-progress { + float: left; + height: $spacing-vertical; + background: repeating-linear-gradient( + 45deg, + lighten($color-primary, 20), + lighten($color-primary, 20) 10px, + lighten($color-primary, 30) 10px, + lighten($color-primary, 30) 20px + ); + z-index: 1; +} + + +.goal-amount { + float: right; +} + +.goal-stat, .goal-amount { + padding: 10px; +} + +.goal-stat +{ + float: left; +} + +.goal-number, .goal-label { + font-size: 0.9em; +} + +.goal-number { + font-weight: bold; +} + .control-item-img { a @@ -145,4 +220,3 @@ line-height: 0; } } -