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

Bootstrap 4 #571

Merged
merged 44 commits into from Sep 8, 2018

Conversation

Projects
None yet
2 participants
@prateekkumarweb
Contributor

prateekkumarweb commented Jun 15, 2018

Signed-off-by: Prateek Kumar prateek@prateekkumar.in

Purpose

The following have been updated:

  • Navbar
  • Grid system (sm -> md, md -> lg, etc.)
  • Margin to <h1> headings
  • Hidden/visibility classes (e.g. hidden -> d-none)
  • Use outline buttons from Bootstrap 4
  • Hero Carousel widget
  • Pagination
  • Margins in buttons
  • Button sizes
  • Labels changed to Badges
  • Filter form in publications page

prateekkumarweb added some commits Jun 8, 2018

Started transition from bootstrap 3 to 4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix Grid system according to Bootstrap 4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix buttons in publications and talks
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix spacing in talk/single.html, publication/single.html
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Use inbuilt btn outline of bootstrap 4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix navbar collapse, scrollspy, dropdown menu
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Change classes in nav dropdown menu
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix margin and padding in dropdown menu of navbar
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Remove unnecessary console.log
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>

prateekkumarweb added some commits Jun 22, 2018

Add proper margin to h1 elements
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix pagination
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Center pagination, change &lt;, &gt; to &laquo;, &raquo;
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>

@gcushen gcushen added the help wanted label Jun 28, 2018

@gcushen

This comment has been minimized.

Show comment
Hide comment
@gcushen

gcushen Jun 28, 2018

Owner

Please can someone help review this? Thanks.

Owner

gcushen commented Jun 28, 2018

Please can someone help review this? Thanks.

prateekkumarweb added some commits Jul 2, 2018

Override default button sizes
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>

Default button size is big for academic theme. In this
commit the size is reduced.
Merge branch 'master' into bootstrap-4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Change select input as per bs4 in publication
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>

@gcushen gcushen added this to the v3.0.0 milestone Jul 15, 2018

@prateekkumarweb prateekkumarweb referenced this pull request Jul 15, 2018

Closed

Bootstrap 4 #509

prateekkumarweb added some commits Jul 15, 2018

Change bs3 label to bs4 badge
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Add margin to publication and talk links
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix margin in publication and talk links
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>

@gcushen gcushen added the enhancement label Jul 22, 2018

prateekkumarweb added some commits Jul 23, 2018

Merge branch 'master' into bootstrap-4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Merge branch 'master' into bootstrap-4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Change padding top of universal wrapper
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
@prateekkumarweb

This comment has been minimized.

Show comment
Hide comment
@prateekkumarweb

prateekkumarweb Jul 27, 2018

Contributor

A live site with changes from this PR can be found on my site, https://prateekkumar.in

Contributor

prateekkumarweb commented Jul 27, 2018

A live site with changes from this PR can be found on my site, https://prateekkumar.in

prateekkumarweb added some commits Jul 27, 2018

Fix cite modal body
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Merge branch 'master' into bootstrap-4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix color of button, toggler icon depending on color theme
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
@gcushen

This comment has been minimized.

Show comment
Hide comment
@gcushen

gcushen Aug 11, 2018

Owner

Thanks. I assume that the Bootstrap carousel code in the new widgets/hero_carousel.html is going to need converting too.

Owner

gcushen commented Aug 11, 2018

Thanks. I assume that the Bootstrap carousel code in the new widgets/hero_carousel.html is going to need converting too.

@prateekkumarweb

This comment has been minimized.

Show comment
Hide comment
@prateekkumarweb

prateekkumarweb Aug 11, 2018

Contributor

Sure, I will do that soon.

Contributor

prateekkumarweb commented Aug 11, 2018

Sure, I will do that soon.

prateekkumarweb added some commits Aug 12, 2018

Migrate Carousel to Bootstrap-4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Fix animation issue in carousel due to position:relative
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
@prateekkumarweb

This comment has been minimized.

Show comment
Hide comment
@prateekkumarweb
Contributor

prateekkumarweb commented Aug 12, 2018

@gcushen Done.

Change btn-large to btn-lg
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>

prateekkumarweb and others added some commits Aug 17, 2018

Fix code highlighting when chroma is used
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Merge branch 'master' into bootstrap-4
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
@gcushen

This comment has been minimized.

Show comment
Hide comment
@gcushen

gcushen Sep 2, 2018

Owner

Hopefully we can finalise this and merge it soon. I have not fully reviewed it yet, but some (minor) points so far are:

  1. pre tags and their associated styles should not have been removed - this is unrelated to converting the theme to Bootstrap v4. It has also broken some of the original styling of code boxes.
  2. the span class around back_to_top needs to be updated from pull-right - I believe the new notation is float-right?
  3. the button styles have not been fully updated - e.g. on-hover text color of buttons is not right
  4. the button on-hover styles for the dark theme (i.e. when color_theme = "dark") are also wrong
  5. in the dark theme, the search box text should not be black
  6. with dark theme, the color of tags is not using the right styles and difficult to read - the .dark .label-* styles should be applied
  7. what is the purpose of 66bb201 - why are we adding a margin to a few specific h1 elements? If we really need to do this, would it not be better defining a new h1 class for them?
Owner

gcushen commented Sep 2, 2018

Hopefully we can finalise this and merge it soon. I have not fully reviewed it yet, but some (minor) points so far are:

  1. pre tags and their associated styles should not have been removed - this is unrelated to converting the theme to Bootstrap v4. It has also broken some of the original styling of code boxes.
  2. the span class around back_to_top needs to be updated from pull-right - I believe the new notation is float-right?
  3. the button styles have not been fully updated - e.g. on-hover text color of buttons is not right
  4. the button on-hover styles for the dark theme (i.e. when color_theme = "dark") are also wrong
  5. in the dark theme, the search box text should not be black
  6. with dark theme, the color of tags is not using the right styles and difficult to read - the .dark .label-* styles should be applied
  7. what is the purpose of 66bb201 - why are we adding a margin to a few specific h1 elements? If we really need to do this, would it not be better defining a new h1 class for them?

prateekkumarweb added some commits Sep 3, 2018

Change pull-right to float-right
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
Remove background:inherit from pre block
Signed-off-by: Prateek Kumar <prateek@prateekkumar.in>
@prateekkumarweb

This comment has been minimized.

Show comment
Hide comment
@prateekkumarweb

prateekkumarweb Sep 3, 2018

Contributor

pre tags and their associated styles should not have been removed - this is unrelated to converting the theme to Bootstrap v4. It has also broken some of the original styling of code boxes.

I had added background-color: inherit; to pre tag in academic.css to fix chroma highlighter. But I didn't notice that it broke highlightjs. So, I have removed it.

There was some issue with cite modal after changing to bootstrap 4.
Using <pre><code class="modal-body tex"></code></pre> results in
image
Using <pre class="modal-body tex"></pre> fixed it.
image
I do not know the reason for this.

the span class around back_to_top needs to be updated from pull-right - I believe the new notation is float-right?

I changed to float-right

the button styles have not been fully updated - e.g. on-hover text color of buttons is not right
the button on-hover styles for the dark theme (i.e. when color_theme = "dark") are also wrong
in the dark theme, the search box text should not be black
with dark theme, the color of tags is not using the right styles and difficult to read - the .dark .label-* styles should be applied

I haven't checked on other themes properly yet. I will check and update soon.

what is the purpose of 66bb201 - why are we adding a margin to a few specific h1 elements? If we really need to do this, would it not be better defining a new h1 class for them?

With margin:
screenshot from 2018-09-03 10-40-40
Without margin:
screenshot from 2018-09-03 10-43-50

In bootstrap 3, h1 had default margin which was removed in bootstrap 4.

Contributor

prateekkumarweb commented Sep 3, 2018

pre tags and their associated styles should not have been removed - this is unrelated to converting the theme to Bootstrap v4. It has also broken some of the original styling of code boxes.

I had added background-color: inherit; to pre tag in academic.css to fix chroma highlighter. But I didn't notice that it broke highlightjs. So, I have removed it.

There was some issue with cite modal after changing to bootstrap 4.
Using <pre><code class="modal-body tex"></code></pre> results in
image
Using <pre class="modal-body tex"></pre> fixed it.
image
I do not know the reason for this.

the span class around back_to_top needs to be updated from pull-right - I believe the new notation is float-right?

I changed to float-right

the button styles have not been fully updated - e.g. on-hover text color of buttons is not right
the button on-hover styles for the dark theme (i.e. when color_theme = "dark") are also wrong
in the dark theme, the search box text should not be black
with dark theme, the color of tags is not using the right styles and difficult to read - the .dark .label-* styles should be applied

I haven't checked on other themes properly yet. I will check and update soon.

what is the purpose of 66bb201 - why are we adding a margin to a few specific h1 elements? If we really need to do this, would it not be better defining a new h1 class for them?

With margin:
screenshot from 2018-09-03 10-40-40
Without margin:
screenshot from 2018-09-03 10-43-50

In bootstrap 3, h1 had default margin which was removed in bootstrap 4.

@gcushen

This comment has been minimized.

Show comment
Hide comment
@gcushen

gcushen Sep 6, 2018

Owner

In bootstrap 3, h1 had default margin which was removed in bootstrap 4.

Would it not be better to add the margin to Academic's existing style definition for headers then, rather than adding an extra class to each instance of a header?

Owner

gcushen commented Sep 6, 2018

In bootstrap 3, h1 had default margin which was removed in bootstrap 4.

Would it not be better to add the margin to Academic's existing style definition for headers then, rather than adding an extra class to each instance of a header?

gcushen added some commits Sep 8, 2018

Apply fixes from review feedback
- Fix Pre font size & border (Bootstrap defaults changed in v4)
- Fix modal layout and pre code
- Fix button outline styles for hover/active state
- Fix filter toolbar box shadow color (Bootstrap v4 added box shadow)
- Fix input text color for search box in dark theme
- Fix modal cross color in dark theme
- Rename dark label styles to dark badge (fixes tag label colors)

@gcushen gcushen merged commit 965a64f into gcushen:master Sep 8, 2018

@gcushen

This comment has been minimized.

Show comment
Hide comment
@gcushen

gcushen Sep 8, 2018

Owner

@prateekkumarweb thank you very much for all your hard work on this over the last few months!

I've just fixed the remaining issues that I listed in the above review and merged the PR into master :)

Owner

gcushen commented Sep 8, 2018

@prateekkumarweb thank you very much for all your hard work on this over the last few months!

I've just fixed the remaining issues that I listed in the above review and merged the PR into master :)

@prateekkumarweb prateekkumarweb deleted the prateekkumarweb:bootstrap-4 branch Sep 9, 2018

gcushen added a commit that referenced this pull request Sep 9, 2018

Add documentation/courses/tutorials layout
- Close #405
- See #681 (improve consistency after #571 Bootstrap 4 migration)
- Add `search_results` to language file
- example site: Add example `tutorial` folder
- example site: Set privacy page to hidden (draft)

gcushen added a commit that referenced this pull request Sep 10, 2018

@prateekkumarweb prateekkumarweb restored the prateekkumarweb:bootstrap-4 branch Sep 13, 2018

@prateekkumarweb prateekkumarweb deleted the prateekkumarweb:bootstrap-4 branch Sep 13, 2018

gcushen added a commit that referenced this pull request Sep 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment