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.

Sign up for GitHub

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

Jump to bottom

Implement suggested features for Sorting Algorithms interactive #1196

Merged
merged 28 commits into from
Dec 4, 2019
Merged

Implement suggested features for Sorting Algorithms interactive #1196

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
735c43b
WIP: try add peek button for box weigts
eAlasdair Nov 18, 2019
3e0d695
add more data unsorting methods
eAlasdair Nov 18, 2019
d080da6
minor improvement
eAlasdair Nov 18, 2019
45378a4
fix peek mode with temporary assets
eAlasdair Nov 19, 2019
05fb697
add proper number icons
eAlasdair Nov 20, 2019
07cbda0
add initial teacher note explaining url parameters
eAlasdair Nov 20, 2019
f1d8164
add sorting algorithms configurator
eAlasdair Nov 20, 2019
74bd5e6
minor improvs
eAlasdair Nov 20, 2019
9b79bd5
improve consistency
eAlasdair Nov 20, 2019
5d2af00
Merge branch 'develop' into issue/972/suggestions
eAlasdair Nov 20, 2019
786f737
various improvements
eAlasdair Nov 20, 2019
7738a55
another minor fix
eAlasdair Nov 20, 2019
da04586
add eye-con (geddit?) to configurator
eAlasdair Nov 21, 2019
33f7662
add toggle functionality to eye-cons
eAlasdair Nov 21, 2019
96a72eb
simplify peek functionality + minor improvs
eAlasdair Nov 21, 2019
07262d5
fix bug when hiding the second row of boxes
eAlasdair Nov 21, 2019
7b30585
fix comparison bug
eAlasdair Nov 25, 2019
86256e6
Enable configurator as an interactive
eAlasdair Nov 26, 2019
1ffd610
minor fix
eAlasdair Nov 26, 2019
9bfad85
Merge branch 'issue/972/suggestions' of https://github.com/uccser/cs-…
eAlasdair Nov 26, 2019
33a998e
Merge branch 'develop' into issue/972/suggestions
courtneycb Dec 3, 2019
f47e723
Merge branch 'develop' into issue/972/suggestions
courtneycb Dec 3, 2019
af6050e
changes from review
eAlasdair Dec 4, 2019
a6e545b
minor fix
eAlasdair Dec 4, 2019
3f656a9
fix interactive in whole-page mode
eAlasdair Dec 4, 2019
86ef3e7
Merge branch 'develop' into issue/972/suggestions
courtneycb Dec 4, 2019
e0853b2
use better style to simplify interactive
eAlasdair Dec 4, 2019
8bc522d
Merge branch 'issue/972/suggestions' of https://github.com/uccser/cs-…
eAlasdair Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ic/interactives/sorting-algorithms-configurator/scss/sorting-algorithms-configurator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// The interactive sticks awkwardly close to the left of a teacher panel
// for some unknown reason
#sorting-algorithms-configurator {
eAlasdair marked this conversation as resolved.
Show resolved Hide resolved
//position: absolute;
transform: translateX(10px);
}
2 changes: 1 addition & 1 deletion csfieldguide/templates/interactives/sorting-algorithms-configurator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% load static %}

{% block html %}
<div id="sorting-algorithms-configurator" class="row my-3 container-fluid justify-content-center">
<div id="sorting-algorithms-configurator" class="row my-3 container-fluid text-center justify-content-center">
<div class="row">
<div class="col-12">
<h4>{% trans 'Sorting Algorithms Configurator' %}</h4>
Expand Down