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

Fix #4773: Add responsive behavior to the landing page #4801

Merged
merged 12 commits into from
Mar 13, 2018

Conversation

nithusha21
Copy link
Contributor

@nithusha21 nithusha21 commented Mar 12, 2018

Explanation

Fixes #4773 This PR adds responsive behavior to the landing page

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.

@nithusha21 nithusha21 requested review from seanlip and tjiang11 March 12, 2018 18:24
$scope.getStaticSubjectImageUrl = function(subjectName) {
return UrlInterpolationService.getStaticImageUrl('/subjects/' +
subjectName + '.svg');
};

$scope.onClickGetStartedButton = function(viewerType) {
siteAnalyticsService.registerOpenFractionsFromLandingPageEvent(
viewerType);
$timeout(function() {
$window.location = ' /collection/4UgTQUc1tala';
Copy link
Member

Choose a reason for hiding this comment

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

Why is there a leading space in the string?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops fixed that.


$scope.onClickLearnMoreButton = function() {
$timeout(function() {
$window.location = 'https://www.oppia.org/splash';
Copy link
Member

Choose a reason for hiding this comment

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

/splash, otherwise it'll go to the wrong place when you're testing on the test server.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay. fixed that

</div>
<div class="col-sm-6">
<h2 class="oppia-fractions-landing-h2" style="color: #242424; text-align: right; right: 10%">With Oppia, we make it easy to go through the lessons and learn something new!
<br><br>You will work to learn new concepts and help Matt become a great baker along the way. We make it fun and easy to get started.
Copy link
Member

Choose a reason for hiding this comment

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

Just realized something is off about the text on this page. Suggest:

You will work ... --> Students will work ...
Matt --> Matthew

(edit: please check the mocks again, this text is not correct)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had missed this when I finally pasted the student page to the teacher page. Fixed it now. Sorry about that

@seanlip
Copy link
Member

seanlip commented Mar 12, 2018

Also, please delete any image asset files that aren't used.

@seanlip
Copy link
Member

seanlip commented Mar 12, 2018

Bug report: on a larger screen, images seem to be getting cut off. See the arrow in the image below.

test

Also if you zoom out farther, the main content detaches from the side of the screen:

zoomout2

@codecov-io
Copy link

codecov-io commented Mar 12, 2018

Codecov Report

Merging #4801 into develop will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4801      +/-   ##
===========================================
- Coverage    44.72%   44.71%   -0.01%     
===========================================
  Files          385      385              
  Lines        23473    23476       +3     
  Branches      3793     3793              
===========================================
  Hits         10498    10498              
- Misses       12975    12978       +3
Impacted Files Coverage Δ
...ates/dev/head/pages/landing/fractions/Fractions.js 8.33% <0%> (-2.78%) ⬇️

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 e9c5983...783d514. Read the comment docs.

@nithusha21
Copy link
Contributor Author

Deleted all the unused assets and also fixed the large screen styling. In my opinion the page looks nice upto laptop view and doesn't break at higher sizes but doesn't look as appealing 😅. Maybe it's just because I am viewing it at 50% zoom.

</div>
<div class="col-sm-6">
<h2 class="oppia-fractions-landing-h2" style="color: #242424; text-align: right; right: 80px">With Oppia, we make it easy to go through the lessons and learn something new!
<br><br>Students get to work through stories and apply their knowledge of real-world problems.
Copy link
Member

Choose a reason for hiding this comment

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

Let's change this to "knowledge to".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed this

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 @nithusha21 -- thanks, looks good! One very small wording change and it's good to go.

@seanlip
Copy link
Member

seanlip commented Mar 13, 2018

Thanks, LGTM!

@seanlip seanlip merged commit 6b9d750 into oppia:develop Mar 13, 2018
@seanlip
Copy link
Member

seanlip commented Mar 13, 2018

@BenHenning, FYI -- this needs cherrypicking!

BenHenning pushed a commit that referenced this pull request Mar 17, 2018
* added new fractions landing pages and removed old landing pages

* Fixed linting errors

* made review changes

* linting fixes

* linting fixes

* Some changes

* made the landing page responsive

* linting fixes

* changed image for mobile display on teacher page

* made review changes and bug fixes

* changed of -> to
giritheja added a commit to giritheja/oppia that referenced this pull request Mar 23, 2018
* upstream/develop:
  Fix part of oppia#3905: Add check for period at comment and docstring end (oppia#4759)
  Remove numpy as a dependency. (oppia#4808)
  Fix part of oppia#3905: Add check for keyword arguments (oppia#4752)
  Fix oppia#4056:There is no way to add an exploration/collection into "play-later" list for mobile users. (oppia#4709)
  Fixes part of oppia#4374: Add docstring to user_query_services.py & user_services.py (oppia#4796)
  Fix oppia#4776: possible race condition in audio preview in editor tab. (oppia#4802)
  Fix oppia#4773: Add responsive behavior to the landing page (oppia#4801)
  Fix part of oppia#4364 : Enhancements to the correctness footer (oppia#4770)
ctao5660 pushed a commit to ctao5660/oppia that referenced this pull request Nov 23, 2018
* added new fractions landing pages and removed old landing pages

* Fixed linting errors

* made review changes

* linting fixes

* linting fixes

* Some changes

* made the landing page responsive

* linting fixes

* changed image for mobile display on teacher page

* made review changes and bug fixes

* changed of -> to
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.

4 participants