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

Bootstrap 5 #375

Draft
wants to merge 115 commits into
base: dev
Choose a base branch
from
Draft

Bootstrap 5 #375

wants to merge 115 commits into from

Conversation

benjaminfaure
Copy link
Member

Fixes # .

Changes proposed in this PR:

pengyin-shan and others added 30 commits November 8, 2022 15:00
@pengyin-shan
add error message and update saving message for plan writing
35fb4a4
@pengyin-shan
use yellow or warnign for saving process
ade7f8c
@pengyin-shan
Merge branch 'development' into add_error_message
e9148b3
@pengyin-shan
Merge branch 'development' into add_error_message
d8cd8d4
@pengyin-shan
update github action to use node 16 only
2295d49
@pengyin-shan
merge development branch
66522fe
@pengyin-shan
add changelog
60e0a09
@pengyin-shan
Merge branch 'add_error_message' of github.com:DMPRoadmap/roadmap int…
ae24901 
…o add_error_message
@briri
Merge branch 'development' into add_error_message
5c893ad
@briri
added .gitkeep file to assets/builds to address issues in production …
e4f8830 
…deployments. see https://github.com/rails/cssbundling-rails#why-do-i-get-applicationcss-not-in-asset-pipeline-in-production
@briri
Merge pull request DMPRoadmap#3312 from DMPRoadmap/main
d7d64e6 
Merge latest from main into development
@briri
added note to CHANGELOG
927e885
@briri
Merge branch 'development' into cssbundling-deploy-fix
9b73b34
@benjaminfaure
Solved issue where spring was loaded in production mode
1c7a126
@benjaminfaure
Updated CHANGELOG
df693dc
@nicolasfranck
fix typo, probably introduced by v1 code
b2d55c6
@benjaminfaure
Updated fontawesome to V6
b0cbb37
@gjacob24
Added JS constants to be used in the Research Outputs feature
76c53a5
@dstuckey-uoe
Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic…
488072a 
…a, Sans-Serif' to 'Roboto, Arial, Sans-Serif'.
@dstuckey-uoe
Added entry to in Fixed section for this change.
06bd855
@dstuckey-uoe
Moved the fixed-entry for this issue to the top the CHANGELOG.md file.
5d1281b
@nicolasfranck
update CHANGELOG.md as requested by closed PR DMPRoadmap#3333
7d163b0
@benjaminfaure
Updated missing icons to fontawesome v6
3e417e2
@martaribeiro
Merge pull request DMPRoadmap#3339 from DMPRoadmap/issue_3337_default…
05a5223 
…_font_download_page

Updated the font_face value in DEFAULT_SETTINGS from 'Arial, Helvetic…
@martaribeiro
Merge branch 'development' into add_js_constants_for_research_outputs
fbcd2c9
@martaribeiro
Merge pull request DMPRoadmap#3334 from DMPRoadmap/add_js_constants_f…
a9e5d8b 
…or_research_outputs

Added JS constants to be used in the Research Outputs feature
@martaribeiro
Merge branch 'development' into fontawesome-v6
78e7349
@martaribeiro
Merge pull request DMPRoadmap#3329 from DMPRoadmap/fontawesome-v6
292019e 
Updated fontawesome to V6
@martaribeiro
Merge branch 'development' into main
a0980f4
@martaribeiro
Merge pull request DMPRoadmap#3325 from nicolasfranck/main
83ad549 
fix typo, probably introduced by v1 code
@benjaminfaure
refactor: removed & renamed sass variables & migrated some of the sas…
b750679 
…s code to bootstrap 5
@benjaminfaure
refactor: further views & helpers migration to bootstrap 5
a3d2dac
@benjaminfaure
refactor: migrated to bootstrap 5 data attributes
2485da2
@benjaminfaure
refactor: migrated dmp video to bootstrap 5
d5e3d63
@benjaminfaure
refactor: site navigation to bootstrap 5
76aa892
@benjaminfaure
fix: link class declaration
572cae2
@benjaminfaure
fix: improved dropdown display when hovering
ba22bc7
@benjaminfaure
fix: button secondary css
5481ad5
@benjaminfaure
fix: improved sign in dropdown indentation
8a9e7e0
@benjaminfaure
fix: migrated missin btn classes
9709a96
@benjaminfaure
fix: improved display of tables following bootstrap upgrade
cd908ec
@benjaminfaure
fix: link classes on org admin templates list & user menu
bbcaafe
@benjaminfaure
fix: removed useless div tags
1ff4b45
@benjaminfaure
refactor: fixed tables line colors
a0134f4
@benjaminfaure
Merge branch 'dev' into feat/bootstrap5
fdb4bdd
@benjaminfaure
Merge branch 'dev' into feat/bootstrap5
e6ce930
@benjaminfaure
Merge branch 'dev' into feat/bootstrap5
b25bfc7
@benjaminfaure
refactor: CSS fixes following dev merge
10489ca
@benjaminfaure
chore: removed duplicated net-stmp gem
0ed66a1
@benjaminfaure
refactor: removed unused import plan code
77d95ad
@benjaminfaure
fix: added missing margin bottom in form fields
34cd27c
@benjaminfaure
Merge branch 'dev' into feat/bootstrap5
dc4da2a
@benjaminfaure
Merge branch 'dev' into feat/bootstrap5
07afa03
@benjaminfaure
fix: module html & welcome page CSS following dev merge
337763e
@benjaminfaure
fix: (bootstrap 5) dropdowns in super admin & static page tabs
cad1dd8
@benjaminfaure benjaminfaure marked this pull request as draft January 24, 2025 10:55
@github-actions GitHub Actions
Copy link

1 Warning
⚠️ This PR is too big! Consider breaking it down into smaller PRs.

Generated by 🚫 Danger

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@benjaminfaure @pengyin-shan @briri @nicolasfranck @gjacob24 @dstuckey-uoe @martaribeiro @aaronskiba