Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #5425: Redesign fractions landing page #5527

Merged
merged 38 commits into from
Sep 8, 2018
Merged

Conversation

unit-00
Copy link
Contributor

@unit-00 unit-00 commented Aug 15, 2018

Explanation

Fixes #5425
This is a PR for the fractions landing page redesign according to the mock up.

The desktop version looks similar to the mock up and below is a sample of the mobile version.
issue-5425

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes.
  • The PR explanation includes the words "Fixes #bugnum: ...".
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
  • The PR is made from a branch that's not called "develop".
  • The PR follows the style guide.
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue.

@unit-00 unit-00 requested a review from seanlip August 15, 2018 05:18
@codecov-io
Copy link

codecov-io commented Aug 15, 2018

Codecov Report

Merging #5527 into develop will decrease coverage by <.01%.
The diff coverage is 42.85%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #5527      +/-   ##
===========================================
- Coverage    45.83%   45.83%   -0.01%     
===========================================
  Files          511      511              
  Lines        29819    29826       +7     
  Branches      4514     4514              
===========================================
+ Hits         13669    13672       +3     
- Misses       16150    16154       +4
Impacted Files Coverage Δ
...ates/dev/head/pages/landing/fractions/Fractions.js 6.25% <0%> (-2.09%) ⬇️
...v/head/domain/utilities/UrlInterpolationService.js 93.33% <100%> (+0.27%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ec3d94...ff59c27. Read the comment docs.

@seanlip
Copy link
Member

seanlip commented Aug 16, 2018

Thanks @unit-00! Let me start with UI notes first, based on your very helpful screen animation.

  • Please read the original email carefully and make sure that all amendments to the Figma mocks are addressed. In particular, the "pizza"-looking cake should be removed from the first graphic.
  • As you scroll down, the card in the second section seems to disappear?
  • The bottom "Get Started" button does not seem centralized properly.

Thanks!

@@ -23,6 +23,8 @@ oppia.controller('Fractions', [
siteAnalyticsService, UrlInterpolationService) {
$scope.getStaticImageUrl = UrlInterpolationService.getStaticImageUrl;

$scope.getStaticAssetUrl = UrlInterpolationService.getStaticAssetUrl;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For parity with image, let's define getStaticVideoUrl similarly in UrlInterpolationService and add unit tests for it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will definitely add this, along with the unit test.

@seanlip
Copy link
Member

seanlip commented Aug 16, 2018

(I only had one comment. On the whole, this looks pretty good. Thanks @unit-00!)

@unit-00
Copy link
Contributor Author

unit-00 commented Aug 16, 2018

Hi @seanlip ,

  • I completely misunderstood what you meant on the pizza. I'll definitely remove it.
  • Thank you for catching this. I'm unsure of the reason why the card is disappearing, I'll look into it.
  • I'll be sure to fix this up.

@unit-00
Copy link
Contributor Author

unit-00 commented Aug 20, 2018

Hey @seanlip ,

I've removed the pizza, centered the buttons, added getStaticVideoUrl and its respective tests, but I think the white part disappearing might be a gif issue.

Everything else seems to be working the way that it is on both desktop and mobile.

<div class="container-fluid">
<div class="row">
<div class="col-sm-6 col-sm-push-6 oppia-fractions-landing-image-div" style="height: auto">
<img ng-src="<[getStaticImageUrl('/fractions_landing/student/intro_matthew.svg')]>" class="oppia-fractions-landing-image" style="width: 60%" alt="">
<img ng-src="<[getStaticImageUrl('/fractions_landing/teachers/matthew_pizza.png')]>" class="oppia-fractions-landing-image" style="width: 60%" alt="">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we name this image something that doesn't have "pizza" in it?

@seanlip
Copy link
Member

seanlip commented Aug 20, 2018

Hi @unit-00, thanks! Just found a couple of additional UI issues when testing:

  • The video isn't loading for me. I think the case of "fractions" is wrong in the video filename?
  • On narrow screens, sometimes the text falls off the screen -- see "Easy-to-follow lessons" in the first screenshot below.
  • There are some CSS issues with the text on the buttons ("Get Started", "Learn More") being much too small on narrow screens. See both screenshots below -- you need to squint to see what's on the buttons:

fractions-test

fractions-test-2

Would it be possible to fix these? I think it should be fully ready after that.

Thanks!

@unit-00 unit-00 requested a review from apb7 as a code owner August 29, 2018 03:46
@unit-00
Copy link
Contributor Author

unit-00 commented Aug 29, 2018

Hi @seanlip ,

I believe I've address the issues along with making some additional change to the overall look of the page.

Please look them over!

@@ -221,7 +221,7 @@
'third_party/*', 'build/*', '.git/*', '*.pyc', 'CHANGELOG',
'integrations/*', 'integrations_dev/*', '*.svg', '*.gif',
'*.png', '*.zip', '*.ico', '*.jpg', '*.min.js',
'assets/scripts/*', 'core/tests/data/*', '*.mp3')
'assets/scripts/*', 'core/tests/data/*', '*.mp3', '*.mp4')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for the changes made in this file only. Thanks!

@seanlip
Copy link
Member

seanlip commented Aug 29, 2018

Thanks @unit-00, it's looking good! Just one comment:

screenshot from 2018-08-29 02-23-11

Seems like the bottom button is not centered properly. (And the top one too, for that matter, comparing with the text just above it?)

Also, the text on the buttons is now a little too big. Could we make it a little smaller? It should probably be just a bit bigger than the "Get your students ... lessons" text. Ditto for the buttons at the bottom of the page.

Finally, could we embed the video in a phone outline, something like this? https://pixabay.com/en/smartphone-icon-modern-symbol-1557796/

Thanks!

@unit-00
Copy link
Contributor Author

unit-00 commented Aug 29, 2018

Hey @seanlip ,

quick feedback. How does this look from the text size above to the button's text size.

image

Similarly,

image

@seanlip
Copy link
Member

seanlip commented Aug 29, 2018 via email

…text above, add a new media query, put text description in a container
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wow, I just realized I hadn't submitted this review yet, sorry! Doing it now.

Also, any chance we could get this in soon? Want to include it in the September release...

Thanks!

<button class="btn oppia-fractions-landing-get-started" ng-click="onClickGetStartedButton('teacher')">Get Started</button>
<div class="col-sm-6 col-sm-pull-6" style="z-index:20">
<h1 class="oppia-fractions-landing-h1">Fractions just got easier</h1>
<h2 class="oppia-fractions-landing-h2" style="padding-right:15px;">Get your students and kids started with our free, effective math lessons.</h2>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: add space after ":" in the style attr.

<div class="col-sm-6 col-sm-pull-6" style="z-index:20">
<h1 class="oppia-fractions-landing-h1">Fractions just got easier</h1>
<h2 class="oppia-fractions-landing-h2" style="padding-right:15px;">Get your students and kids started with our free, effective math lessons.</h2>
<button class="btn oppia-fractions-landing-get-started" ng-click="onClickGetStartedButton('teacher')" style="left:10px;">Get Started</button>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: add space after ":" in the style attr.

@unit-00
Copy link
Contributor Author

unit-00 commented Sep 6, 2018

Hey @seanlip ,

I great apologize for the delay. I got a bit too frustrated with making sure the video align properly in the smartphone image.

I wasn't sure how to exactly arrange the video inside the image so I made a border to look like a smartphone instead.

messages image 1225722269

Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @unit-00, just took a look, and I think it looks amazing! I love what you did with the phone, it looks great. Sorry to hear that it was a bit frustrating though.

I left a few code comments! UI comments coming shortly.

max-height: 500px;
}
.oppia-fractions-landing-image-mobile {
display: none;
}
.video-frame {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please prefix this class name with .oppia-fractions-landing-... ? Ditto for anything below this one as well (text-box, easy-to-follow, etc.) -- want to make sure the CSS is well-scoped and only applies to this page.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh ops, didn't see these reviews. I'll definitely fix these.

max-height: 500px;
}
.oppia-fractions-landing-image-mobile {
display: none;
}
.video-frame {
position: relative;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For each CSS rule please alphabetize (e.g. background then border then border-bottom-width etc.) Ditto below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

}
.oppia-fractions-landing-h2 {
font-size: 1em;
text-align: left !important;
text-align: center !important;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible at all to get the desired effect without using !important, here and above? In general we try to avoid it.

Copy link
Contributor Author

@unit-00 unit-00 Sep 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually from whoever first designed this. Should I take out all the !important? I edited it a bit to change certain stylings.

@seanlip
Copy link
Member

seanlip commented Sep 7, 2018

A couple of minor UI things:

  • When you hover over the video in such a way that clicking would play it, the mouse pointer should look like something that can click (I think a hand, usually?).
  • On larger widths, the text between the buttons at the bottom is not centered -- in the screenshot below, you'll see that the text juts out to the right more than the left:

screenshot from 2018-09-07 03-29-03

  • Also, could we change the last exclamation mark (after "Library") to a period? Two exclamation marks in one go seems a bit much IMO.

Otherwise, it looks really nice, thanks a lot! Just so you know, the release cut for September has been delayed to this weekend, so if you could finish this and submit it by tomorrow or early Saturday, then it can go out in the September release.

Thanks!

@unit-00
Copy link
Contributor Author

unit-00 commented Sep 7, 2018

Hi @seanlip ,

I've centered the the library text and also change the exclamation mark to the period.

However it might be a bit harder to change the cursor for the html5 video.
Based on these SO posts, SO 0 and SO 1, it seems as though the controls are set by the browser.

I've been trying but it's only allowing me to change the cursor for the timeline, the volume, and the fullscreen button, not the play/pause, I'm going to see if I can do it some other way.

Edit: I was able to change everything to pointers upon hover and got around the play button issue. I've also took out the !important css stylings.

Please look over the code and see if I've address everything.

Thank you.

@seanlip
Copy link
Member

seanlip commented Sep 8, 2018

Hi @unit-00, this looks awesome, thanks so much! Merging now :) -- it'll be live in mid-Sept once the release has been QA'd and pushed!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement a redesign version of page at www.oppia.org/fractions
4 participants