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

[frontend/theme] script for bootswatch theme compilation #931

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
cce463f
new bootswatch theme compilation
Ananas120 Apr 3, 2023
2b535fc
Merge branch 'UCL-INGI:master' into master
Ananas120 Apr 26, 2023
252ccaa
update PR themes modification
Ananas120 Apr 26, 2023
6e58302
Merge branch 'UCL-INGI:master' into master
Ananas120 May 10, 2023
9ff71ff
update PR + new codemirror themes
Ananas120 May 25, 2023
aad5c64
Merge branch 'UCL-INGI:master' into master
Ananas120 Jun 1, 2023
d7831c9
Merge branch 'master' of https://github.com/Ananas120/INGInious
Ananas120 Jun 1, 2023
dd7dacf
[frontend/task_dispenser] Adding "hidden" config item to Section (#917)
Drumor Jun 14, 2023
af0cee6
[base_containers] Move containers to GitHub registry (#921)
nrybowski Jun 15, 2023
161d4a5
[frontend] init logging before get_app call (#960)
Drumor Jul 6, 2023
541c0cf
[course_admin/edit_task] Allow operations on hidden dir/files
anthonygego Jul 28, 2023
a0674f2
[task_dispensers/combinatory_test] fix missing template field"
anthonygego Jul 31, 2023
61ead04
[frontend/task_dispenser] fix regression due to bootstrap update
anthonygego Aug 1, 2023
fa24e8a
[course_admin/task_list] add support for automated task settings migr…
anthonygego Aug 1, 2023
4f40a72
[frontend/task_dispensers] fix tooltip issue in task buttons
anthonygego Aug 4, 2023
3cc8327
[task_dispensers] grouped actions : setting selection and preview
anthonygego Aug 4, 2023
b8bcd6e
[task_dispensers] move setting filter bar to util.html
anthonygego Aug 7, 2023
7408cb6
[task_dispensers] grouped actions: allow for group selections
anthonygego Aug 7, 2023
0f33120
[task_dispensers] allow settings change for group of tasks
anthonygego Aug 7, 2023
1a1901c
[task_dispensers] allow grouped task deletion
anthonygego Aug 8, 2023
98212de
[task_dispensers] allow to move multiple tasks to one section
anthonygego Aug 8, 2023
e53e6c4
[task_dispensers] apply rendering for new and existing tasks
anthonygego Aug 8, 2023
0991e81
[task_dispensers] allow dispenser settings for new tasks
anthonygego Aug 9, 2023
d05168a
[task_dispensers] enhance error handling in task list
anthonygego Aug 9, 2023
1cca275
[task_dispensers] enable compact view by default
anthonygego Aug 9, 2023
c42d44f
[task_dispensers] remove categories specific code from main code
anthonygego Aug 9, 2023
fa501dd
Update minified js
anthonygego Aug 9, 2023
408bc78
[tasksets] rename course to taskset in the backend files
anthonygego Aug 14, 2023
d37d234
[tasksets] courses built on top of tasksets
anthonygego Aug 16, 2023
93e301d
[tasksets] update tests
anthonygego Aug 21, 2023
0b206d6
[courses] remove taskset edition capability from courses
anthonygego Aug 20, 2023
d601628
[courses] merge admins and tutors at the course level
anthonygego Aug 21, 2023
48ebcec
[task_dispensers] allow course templating from tasksets
anthonygego Aug 21, 2023
b6366da
[task_dispensers] improve performance by reducing html/js code
anthonygego Aug 21, 2023
5472789
Update minified js
anthonygego Aug 22, 2023
94e47ff
[task_dispenser/toc] init config dict if empty
anthonygego Aug 22, 2023
6826dbd
[courses/user_settings] clearly distinguish user settings from course…
anthonygego Aug 22, 2023
f53b98f
[courses] distinguish courses from tasksets using fa icons
anthonygego Aug 22, 2023
dedbdbd
[i18n] fix jinja2 imports for Jinja3+
anthonygego Aug 22, 2023
fb5adb1
[i18n] update french translations
anthonygego Aug 22, 2023
218facb
update PR before rebase
Ananas120 Sep 14, 2023
b15462c
[frontend/flask] fix session_cookie_name deprecation
anthonygego May 5, 2023
c2ce8c8
[setup] temporarily restrict to requests<2.2.29
anthonygego May 5, 2023
9a45e31
[frontend/themes] [1/2] main files update
Ananas120 Sep 25, 2023
70691bc
[frontend/themes] [2/2] second theme files update
Ananas120 Sep 25, 2023
9202efd
Update demo tasks repo URL to new organisation (#947)
nrybowski May 25, 2023
595680e
update PR before rebase
Ananas120 Sep 14, 2023
e771838
Merge branch 'master' of https://github.com/Ananas120/INGInious
Ananas120 Sep 25, 2023
244004d
new bootswatch theme compilation
Ananas120 Apr 3, 2023
d879278
update PR themes modification
Ananas120 Apr 26, 2023
fde4fac
[frontend/themes] [1/2] main files update
Ananas120 Sep 25, 2023
0533452
[frontend/themes] [2/2] second theme files update
Ananas120 Sep 25, 2023
3f5a7bb
update PR before rebase
Ananas120 Sep 14, 2023
094de20
update PR + new codemirror themes
Ananas120 May 25, 2023
8e42845
update PR before rebase
Ananas120 Sep 14, 2023
567d98f
Merge branch 'master' of https://github.com/Ananas120/INGInious
Ananas120 Sep 25, 2023
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ venv
inginious/tasks
# Default backup directory
inginious/backup
# The (possibly) cloned bootswatch
inginious/frontend/static/css/themes/bootswatch

# Build files
build/lib
build/scripts-*

16 changes: 16 additions & 0 deletions inginious/frontend/static/css/themes/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
BOOTSWATCH_URL = https://github.com/thomaspark/bootswatch.git
BASE_THEME = yeti

compile:
if [ ! -d "bootswatch" ]; then make install; fi
Copy link
Member

Choose a reason for hiding this comment

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

It would be more convenient if all these steps could be carried out by grunt to avoid adding development dependencies. In case the yeti sources are provided in our repo the build configuration file should be provided too and can be modified to place the file in the appropriate locations.

cd bootswatch; ./node_modules/grunt/bin/grunt swatch:$(theme)
mv bootswatch/dist/$(theme)/bootstrap.css $(theme).css

install:
git clone $BOOTSWATCH_URL
Copy link
Member

Choose a reason for hiding this comment

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

In this case we do not use a fixed version as discussed before. @nrybowski suggested to use a submodule to include the source at a given commit stage. We can probably add a third-party folder at the source root to store the submodule.

Besides, as discussed previously, it would probably be better to store the source files for yeti and the modified yeti dark mode into our repository (keeping their copyright of course) and only keep a submodule to bootstrap.

In all case we need to be able to rebuild the dark_mode.css file from the sources.

cd bootswatch
npm install
npm install grunt-cli

help:
echo "Usage : make theme={your_theme_name}"
Loading