Merged
Conversation
vw allows for more responsive text design because it changes the font-size based on the size of the viewport. (1vw = 1% viewport width.)
vw allows for more responsive text design because it changes the font-size based on the size of the viewport. (1vw = 1% viewport width.)
Conflicts: kalite/distributed/templates/distributed/exercise.html kalite/static/js/khan-exercises/khan-exercise.js kalite/static/js/khan-exercises/utils/answer-types.js
Conflicts: kalite/distributed/static/css/distributed/khan-lite.css
Allows toggling of keypad, with auto-toggled off if modernizr.touch is false. Conflicts: kalite/distributed/static/css/distributed/khan-lite.css
Changes TODOs to TODO-BLOCKERs.
TODO-BLOCKER (rtibbles): Undo these commits before 0.13.
Numpad release
Also, use SECURESYNC_PROTOCOL to generate endpoint for download.
Fallback for vw
Fallback for vw
Added the missing white-space property and a vertical-align hack-fix for IE6 & IE7 One more thing, since IE6 doesn't support min-height and max-height, max-height is treated as height.
Conflicts: kalite/distributed/static/css/distributed/khan-lite.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
New features:
- Numpad for exercises
Fixes:
- Fix for the Mac OS X startup script
- Fix for empty language names in the dubbed video mapping json
- Some UI tweaks: see #2264