-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
Conversation
…explore lessons button
Codecov Report
@@ 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
Continue to review full report at Codecov.
|
Thanks @unit-00! Let me start with UI notes first, based on your very helpful screen animation.
Thanks! |
@@ -23,6 +23,8 @@ oppia.controller('Fractions', [ | |||
siteAnalyticsService, UrlInterpolationService) { | |||
$scope.getStaticImageUrl = UrlInterpolationService.getStaticImageUrl; | |||
|
|||
$scope.getStaticAssetUrl = UrlInterpolationService.getStaticAssetUrl; |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
(I only had one comment. On the whole, this looks pretty good. Thanks @unit-00!) |
Hi @seanlip ,
|
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=""> |
There was a problem hiding this comment.
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?
Hi @unit-00, thanks! Just found a couple of additional UI issues when testing:
Would it be possible to fix these? I think it should be fully ready after that. Thanks! |
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') |
There was a problem hiding this comment.
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!
Thanks @unit-00, it's looking good! Just one comment: 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! |
Hey @seanlip , quick feedback. How does this look from the text size above to the button's text size. Similarly, |
Looks good to me, thanks!
|
…text above, add a new media query, put text description in a container
There was a problem hiding this 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> |
There was a problem hiding this comment.
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> |
There was a problem hiding this comment.
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.
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. |
There was a problem hiding this 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 { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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; |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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; |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
A couple of minor UI things:
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! |
Hi @seanlip , I've centered the the library text and also change the exclamation mark to the period.
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. |
…rtant in css styling and adjusting styling in response to removing important
on it instead of just play button
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! |
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.
Checklist
python scripts/pre_commit_linter.py
andbash scripts/run_frontend_tests.sh
.