Resolve "Migrate to materialize.css" #427

Merged
hansegucker merged 19 commits from 58-migrate-to-materialize-css into master 2020-01-28 21:23:17 +01:00
Owner

Closes #58

Closes #58
Author
Owner

changed milestone to %"2.0a1"

changed milestone to %"2.0a1"
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>368915db - Migrate to materialize-css. Advances #58.</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1192&start_sha=dfba5000317d5df96a24187523b0a321aff08135)
Author
Owner

assigned to @hansegucker

assigned to @hansegucker
Author
Owner

Maybe @hansegucker can have a quick look at the materialize stuff to verify that everything that looks correct was done correctly ;)…

Maybe @hansegucker can have a quick look at the materialize stuff to verify that everything that looks correct was done correctly ;)…
Author
Owner

unmarked as a Work In Progress

unmarked as a **Work In Progress**
Author
Owner

added 3 commits

  • 368915db...b2b39def - 2 commits from branch master
  • c94f960d - Merge branch 'master' into 58-migrate-to-materialize-css

Compare with previous version

added 3 commits <ul><li>368915db...b2b39def - 2 commits from branch <code>master</code></li><li>c94f960d - Merge branch &#39;master&#39; into 58-migrate-to-materialize-css</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1197&start_sha=368915db6046cb50bed513a016fb2d78892dbef6)
Owner

Why did you remove the title?

Why did you remove the title?
Author
Owner
AlekSIS/AlekSIS#146
Author
Owner

resolved all threads

resolved all threads
Owner

After a first look, everything seems to be fine. I will test it later.

After a first look, everything seems to be fine. I will test it later.
Owner

That's not materialize.

That's not materialize.
Owner

Please add class green for optical feedback and add an text like Add filter.

Please add class `green` for optical feedback and add an text like `Add filter`.
Owner

I think instead of having one card Lessons we should have a card for every weekday and remove the heading Lessons.

I think instead of having one card `Lessons` we should have a card for every weekday and remove the heading `Lessons`.
Owner

It may look better with green-text.

It may look better with `green-text`.
Author
Owner

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1199&start_sha=c94f960d725e2b6957e9a882d8982dd0460cb1cf#ae8fc1ab551d7f832bbd8458fb52822d78f6ed06_9_8)
Author
Owner

added 1 commit

  • 2d86c87b - Merge branch 'master' into 58-migrate-to-materialize-css

Compare with previous version

added 1 commit <ul><li>2d86c87b - Merge branch &#39;master&#39; into 58-migrate-to-materialize-css</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1199&start_sha=c94f960d725e2b6957e9a882d8982dd0460cb1cf)
Author
Owner

added 1 commit

  • 08c7da5b - Merge branch 'master' into 58-migrate-to-materialize-css

Compare with previous version

added 1 commit <ul><li>08c7da5b - Merge branch &#39;master&#39; into 58-migrate-to-materialize-css</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1201&start_sha=2d86c87b0af97b6b33e9b4bfd14529241d5572de)
Author
Owner

We should use theme-based colours for the buttons because every school can choose their own colours.

We should use theme-based colours for the buttons because every school can choose their own colours.
Owner

It's the question: Is optical feedback on actions (green: add, red: delete, etc.) more important than theme colours? The way materialize buttons are used in AlekSIS until now is the first one.

It's the question: Is optical feedback on actions (green: add, red: delete, etc.) more important than theme colours? The way materialize buttons are used in AlekSIS until now is the first one.
Author
Owner

In bootstrap it looks much cleaner with only one card per week. Maybe you could post a screenshot from the week view later (I don't have working lessons, yet…).

In bootstrap it looks much cleaner with only one card per week. Maybe you could post a screenshot from the week view later (I don't have working lessons, yet…).
Author
Owner

Maybe you're right, yes. I will change that.

Maybe you're right, yes. I will change that.
Author
Owner

changed this line in version 5 of the diff

changed this line in [version 5 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1204&start_sha=08c7da5bfcff2925169a0c07b96c3e063e78366e#f5c7fdee830f412ccae6bf7c3c8709353c408335_10_10)
Author
Owner

added 1 commit

  • 9d21f053 - Merge branch 'master' into 58-migrate-to-materialize-css

Compare with previous version

added 1 commit <ul><li>9d21f053 - Merge branch &#39;master&#39; into 58-migrate-to-materialize-css</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1204&start_sha=08c7da5bfcff2925169a0c07b96c3e063e78366e)
Author
Owner

It is much clearer to use the background colour for the whole row.

It is much clearer to use the background colour for the whole row.
Author
Owner

What do you think, @nik?

What do you think, @nik?
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>fe70659b - Fix title in templates.</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1215&start_sha=9d21f053d2a53c4438f978e8b102b6d56459969b)
Owner

I have no clue. In case of doubt, @hansegucker makes better frontend decisions. But please post two screenshots.

I have no clue. In case of doubt, @hansegucker makes better frontend decisions. But please post two screenshots.
Owner

Please post screenshots.

Please post screenshots.
Author
Owner

Screenshot_20200124_215655

![Screenshot_20200124_215655](/uploads/4d2f75fde3c015f1958b8c279218ade6/Screenshot_20200124_215655.png)
Author
Owner

Screenshot_20200124_220949Screenshot_20200124_221059

Hmm… maybe we should use one card for every weekday ;)…

![Screenshot_20200124_220949](/uploads/60cac1bd1cf0158944d80a2301af6486/Screenshot_20200124_220949.png)![Screenshot_20200124_221059](/uploads/3d991101b2dd393ee2702d01e1c18b7e/Screenshot_20200124_221059.png) Hmm… maybe we should use one card for every weekday ;)…
Owner

I have to confess that I like the variant showed on 1 and 3, but the blue link is a little bit irritating. Maybe we should use a customized link colour.

I have to confess that I like the variant showed on 1 and 3, but the blue link is a little bit irritating. Maybe we should use a customized link colour.
Author
Owner

So you think that we shouldn't use the lighten-2 class?

So you think that we shouldn't use the lighten-2 class?
Author
Owner

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1218&start_sha=fe70659baad36b32eb3eda8710d2caea2f2f7f29#90d1e91de2dd8326bc6fb815753407a8df263023_39_32)
Author
Owner

added 3 commits

  • c94f960d - Merge branch 'master' into 58-migrate-to-materialize-css
  • 782bc9ad - Use one card per weekday.
  • 48e71279 - Merge branch '58-migrate-to-materialize-css' of...

Compare with previous version

added 3 commits <ul><li>c94f960d - Merge branch &#39;master&#39; into 58-migrate-to-materialize-css</li><li>782bc9ad - Use one card per weekday.</li><li>48e71279 - Merge branch &#39;58-migrate-to-materialize-css&#39; of...</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1218&start_sha=fe70659baad36b32eb3eda8710d2caea2f2f7f29)
Owner

1 and 3 are too intense. If we use a background, then 2 and 4.

1 and 3 are too intense. If we use a background, then 2 and 4.
Author
Owner

added 1 commit

  • fad76d47 - Remove superflous text class.

Compare with previous version

added 1 commit <ul><li>fad76d47 - Remove superflous text class.</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1219&start_sha=48e712795f43c058c467b11382f4ed01eb282d1f)
Author
Owner

I agree with @nik.

@hansegucker: Feel free to mark this discussion as resolved if you agree too.

I agree with @nik. @hansegucker: Feel free to mark this discussion as resolved if you agree too.
Owner

I have no problem with 2 and 4, but the link colour have to be changed definitely.

I have no problem with 2 and 4, but the link colour have to be changed definitely.
Owner

btn-dark?

btn-dark?
Owner

btn-dark? Maybe add waves? Icon?

btn-dark? Maybe add waves? Icon?
Owner

Red is correct here?

Red is correct here?
Owner

Looks like bootstrap.

Looks like bootstrap.
Author
Owner

Yup. With this button you can delete a filter.

Yup. With this button you can delete a filter.
Owner

Then the button shouldn't have the label "Add filter", should it? And the icon should be "delete".

Then the button shouldn't have the label "Add filter", should it? And the icon should be "delete".
Author
Owner

added 2 commits

  • dc9b0668 - fix tag.
  • d1d5f989 - Merge branch '58-migrate-to-materialize-css' of...

Compare with previous version

added 2 commits <ul><li>dc9b0668 - fix tag.</li><li>d1d5f989 - Merge branch &#39;58-migrate-to-materialize-css&#39; of...</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1222&start_sha=fad76d471caa3e1c2737dc7c6d8bd73a1a5fa729)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>82d7539e - Fix link and text.</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1223&start_sha=d1d5f98924a8bfbd6b66201091dfd701d1fd3699)
Author
Owner

btn-dark is the secondary colour so this button can be customized. I think we don't need an icon for the select button.

`btn-dark` is the secondary colour so this button can be customized. I think we don't need an icon for the select button.
Author
Owner

btn-dark is the secondary colour so this button can be customized.

`btn-dark` is the secondary colour so this button can be customized.
Author
Owner

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1227&start_sha=82d7539ec6fe9376261cfd7620824928cffaf56c#90d1e91de2dd8326bc6fb815753407a8df263023_15_15)
Author
Owner

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1227&start_sha=82d7539ec6fe9376261cfd7620824928cffaf56c#d87fc08482f6efa5af42bce3a6b41e1fba5c4985_56_56)
Author
Owner

added 2 commits

  • 17f7a5f7 - Fix templates.
  • 8fbd0847 - Merge branch '58-migrate-to-materialize-css' of...

Compare with previous version

added 2 commits <ul><li>17f7a5f7 - Fix templates.</li><li>8fbd0847 - Merge branch &#39;58-migrate-to-materialize-css&#39; of...</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1227&start_sha=82d7539ec6fe9376261cfd7620824928cffaf56c)
Owner

Where is this class defined? In Materialize?

Where is this class defined? In Materialize?
Owner

And the secondary colour is the default colour for buttons. It's unnecessary to add an extra CSS class for that.

And the secondary colour is the default colour for buttons. It's unnecessary to add an extra CSS class for that.
Owner

Yes, you are right, the icon isn't necessary here.

For btn-dark see above.

Yes, you are right, the icon isn't necessary here. For `btn-dark` see above.
Author
Owner

Maybe you want to look at the code again ;)...

Maybe you want to look at the code again ;)...
Author
Owner

Aaaah okay i will remove it.

Aaaah okay i will remove it.
Author
Owner

changed this line in version 12 of the diff

changed this line in [version 12 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1232&start_sha=8fbd0847eaee9a2446d7f8da06d0eb0badde325a#90d1e91de2dd8326bc6fb815753407a8df263023_22_22)
Author
Owner

added 1 commit

  • 36911718 - Remove unnecessary class btn-dark.

Compare with previous version

added 1 commit <ul><li>36911718 - Remove unnecessary class btn-dark.</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1232&start_sha=8fbd0847eaee9a2446d7f8da06d0eb0badde325a)
Author
Owner

Which colour should we use for links?

Which colour should we use for links?
Owner

In data tables, I think the links should not have a colour. The whole table row should be clickable (but the texts inside still need to be <a>s to make it work without JavaScript, but they should not look like links.

Opinion, @hansegucker

In data tables, I think the links should not have a colour. The whole table row should be clickable (but the texts inside still need to be `<a>`s to make it work without JavaScript, but they should not look like links. Opinion, @hansegucker
Owner
table.datatable a {
  color: inherit !important;
}
``` table.datatable a { color: inherit !important; } ```
Author
Owner

changed this line in version 13 of the diff

changed this line in [version 13 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1234&start_sha=36911718b04e528dec9eaf16205b0f24746d3c47#90d1e91de2dd8326bc6fb815753407a8df263023_51_51)
Author
Owner

added 1 commit

  • 978ecbb6 - Use colour classes from core.

Compare with previous version

added 1 commit <ul><li>978ecbb6 - Use colour classes from core.</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1234&start_sha=36911718b04e528dec9eaf16205b0f24746d3c47)
Owner

In timetable.css in Chronos is a similar case.

In timetable.css in Chronos is a similar case.
Owner
      <button type="submit" class="btn waves-effect waves-light">
```suggestion:-0+0 <button type="submit" class="btn waves-effect waves-light"> ```
Owner
      <a class="btn waves-effect waves-light" href="{% url 'full_register_group' group.id %}">
```suggestion:-0+0 <a class="btn waves-effect waves-light" href="{% url 'full_register_group' group.id %}"> ```
Author
Owner

changed this line in version 14 of the diff

changed this line in [version 14 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1235&start_sha=978ecbb6d9968f64e519dba3e3164f3dd082b44c#90d1e91de2dd8326bc6fb815753407a8df263023_15_15)
Author
Owner

added 1 commit

  • 8d1f276b - Apply suggestion to aleksis/apps/alsijil/templates/alsijil/week_view.html

Compare with previous version

added 1 commit <ul><li>8d1f276b - Apply suggestion to aleksis/apps/alsijil/templates/alsijil/week_view.html</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1235&start_sha=978ecbb6d9968f64e519dba3e3164f3dd082b44c)
Author
Owner

resolved all threads

resolved all threads
Author
Owner

changed this line in version 15 of the diff

changed this line in [version 15 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1236&start_sha=8d1f276bcb5589b897826239505dddd80b6be68b#90d1e91de2dd8326bc6fb815753407a8df263023_22_22)
Author
Owner

added 1 commit

  • e20f0de8 - Apply suggestion to aleksis/apps/alsijil/templates/alsijil/week_view.html

Compare with previous version

added 1 commit <ul><li>e20f0de8 - Apply suggestion to aleksis/apps/alsijil/templates/alsijil/week_view.html</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1236&start_sha=8d1f276bcb5589b897826239505dddd80b6be68b)
Author
Owner

added 2 commits

  • 127fdef9 - Add stylesheet for links in datatables.
  • 94145366 - Merge branch '58-migrate-to-materialize-css' of...

Compare with previous version

added 2 commits <ul><li>127fdef9 - Add stylesheet for links in datatables.</li><li>94145366 - Merge branch &#39;58-migrate-to-materialize-css&#39; of...</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1237&start_sha=e20f0de810e9215713530b2d5d50f932f91f717f)
Owner

bootstrap_form ?

`bootstrap_form` ?
Owner

I am not sure but if it's a form it should use material_form.

I am not sure but if it's a form it should use material_form.
Owner

I am certain that a form with only hidden input fields does not need a Material theme.

I am certain that a form with only hidden input fields does not need a Material theme.
Owner

That's correct.

That's correct.
Author
Owner

resolved all threads

resolved all threads
Author
Owner

changed this line in version 17 of the diff

changed this line in [version 17 of the diff](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1243&start_sha=94145366f23f74c9b16aa9cf5a3993126090858d#d87fc08482f6efa5af42bce3a6b41e1fba5c4985_37_37)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>d44ce23a - Use material_form.</li></ul> [Compare with previous version](/AlekSIS/AlekSIS-App-Alsijil/merge_requests/37/diffs?diff_id=1243&start_sha=94145366f23f74c9b16aa9cf5a3993126090858d)
Owner

mentioned in commit 02cd44ea72

mentioned in commit 02cd44ea72e5989358c4d8031e2eeeec5db76eb5
Owner

merged

merged
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
aleksis/AlekSIS-App-Alsijil!427
No description provided.