forked from SMILEConsortium/node-smile-server
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into dev
* origin/master: refs #47 Clean up the main readme.md refs #47 Bump release version to 0.3.2 and tag release. refs #26, #39 Fix the question layout, use <p> instead of <h4> which is block visibility. I may change this later because it looks nicer, but need to deal with the case where lines wrap past the end. Shouldn't happen in practice. refs #26, #39 Fix a number of new foundation 4 and general layout problems. Add reveal.js as this actually handles semi-normal layout. I'm a bit confused at how we are treating the data in #iq-area, but can work it out later. refs #26, #39 Was missing a div needed to display the "waiting to start making questions". Clean up some harmless js. refs #26, #39, #38 Undo the lint fixes .... refs #26, #39, #38 Take care of the majority of the lint errors, we'll leave the redefs and comma errors. refs #26, #39 Fix login state transition, all a result of foundation 4 getting rid of "tabs" in favor of html5 flavored sections. refs #26 #39 Add updated blockui version, add section.js from foundation, and fixed smilestudent.js issues with the tab handling. Also, get tabs working. refs #26 Fix the columns, use <size>-# . Not <# spelled out>. refs #26 Initial upgrade to foundation 4.3.2.
- Loading branch information
Showing
36 changed files
with
23,149 additions
and
12,321 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.