SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing conflicts

Browse Source
This commit is contained in:
knighthawk4227 committed 2025-05-21 16:54:17 -07:00
1 parent 0672981e69
commit d2e69f230f
4 files changed
+12 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/dashboard.ejs
+3 -4
View File
@@ -5,9 +5,9 @@
<!-- Buttons -->
<div class="flex justify-end gap-4 px-5 py-6">
<a href="/assets?popup"
class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
id="addAss" class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
type="button">Add Asset</a>
<a href="/newPlan"
<a href="/plans?openModal=true"
class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
type="button">Create new plan </a>
</div>
@@ -21,8 +21,7 @@
<div class="mt-4 flex justify-center">
<a href="/plans" class="cursor-pointer border-2 border-blue-600 bg-blue-600 text-white py-2 px-6
rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold
transition-colors duration-200 focus:outline-none focus:ring-2
focus:ring-blue-500 focus:ring-offset-2">Make one</a>
transition-colors duration-200 focus:outline-none ">Make one</a>
</div>
</div>
</div>