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

Change style of bouquet to me more consistent with Lunaria and NFT Sender #51

Merged
merged 37 commits into from
Aug 20, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f2b28e4
Footer and Navbar new style
0xjimmy Jul 16, 2023
f1eefee
Buttons and Settings modal style
0xjimmy Jul 17, 2023
b9cac3e
Error handling clean, inputs for import better, new style
0xjimmy Jul 17, 2023
eda98eb
Styling
0xjimmy Jul 18, 2023
c2b647a
Can check, but need to avoid checking gass diff and funding
0xjimmy Jul 18, 2023
d117973
Calculate correct funding amounts
0xjimmy Jul 23, 2023
df3c434
Transaction list shows diff warning and correct funding amount
0xjimmy Jul 24, 2023
c52450f
Get address utils
0xjimmy Jul 24, 2023
6008a8d
Apply suggestions from code review
0xjimmy Jul 25, 2023
a622099
Merge pull request #56 from DarkFlorist/transactions-and-import-diff
0xjimmy Jul 25, 2023
3984fa6
Merge pull request #52 from DarkFlorist/import-fixes
0xjimmy Jul 25, 2023
ec0fc09
Add Import btn to warning card
0xjimmy Aug 1, 2023
954c299
Split components into 2
0xjimmy Aug 1, 2023
1769c4d
Fix #50, new styling
0xjimmy Aug 1, 2023
c110425
Burner section css
0xjimmy Aug 1, 2023
2fb4256
Update app/ts/components/Warns.tsx
0xjimmy Aug 3, 2023
48c7c3e
Merge pull request #59 from DarkFlorist/feat/click-to-sync
0xjimmy Aug 3, 2023
ffba358
Can withdraw funds
0xjimmy Aug 8, 2023
a7d852f
Make some responsive changes
0xjimmy Aug 8, 2023
214d770
Update app/ts/components/ConfigureFunding.tsx
0xjimmy Aug 8, 2023
0ff95ec
Fix quote formatting
0xjimmy Aug 8, 2023
1315b1c
Merge branch 'style' into configure
0xjimmy Aug 8, 2023
6cdf094
Merge pull request #60 from DarkFlorist/configure
0xjimmy Aug 8, 2023
ce64307
Move to validate, then parse on save. Fix disabled button style
0xjimmy Aug 9, 2023
2a3a681
Block callback pass number
0xjimmy Aug 9, 2023
96ce1e4
Display simulation outcomes
0xjimmy Aug 9, 2023
acc65cb
Bundle inclusion detection
0xjimmy Aug 9, 2023
e8f04d7
Complete desgin of successful bundle
0xjimmy Aug 9, 2023
4bc5997
Fix bug where it wouldn't show or hide success when it should
0xjimmy Aug 9, 2023
ed35b0d
Apply suggestions from code review
0xjimmy Aug 13, 2023
ab3c230
Merge pull request #61 from DarkFlorist/fix-settings-signals
0xjimmy Aug 13, 2023
e7915de
Update app/ts/library/provider.ts
0xjimmy Aug 13, 2023
11f0516
Merge pull request #62 from DarkFlorist/simulate-submit-clearer-respo…
0xjimmy Aug 15, 2023
d12c037
Wrong unit label
0xjimmy Aug 15, 2023
b214ae6
Fix #63
0xjimmy Aug 15, 2023
5f0f298
Update app/ts/components/Settings.tsx
0xjimmy Aug 15, 2023
974d611
Merge branch 'main' into style
0xjimmy Aug 20, 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
194 changes: 158 additions & 36 deletions app/css/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
/*
! tailwindcss v3.2.7 | MIT License | https://tailwindcss.com
*/
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}

input[type='number'] {
-moz-appearance: textfield;
/* Firefox */
}

/* ! tailwindcss v3.2.7 | MIT License | https://tailwindcss.com */

/*
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
Expand Down Expand Up @@ -535,10 +544,18 @@ video {
margin-bottom: 0.5rem;
}

.ml-2 {
margin-left: 0.5rem;
}

.mt-4 {
margin-top: 1rem;
}

.mt-auto {
margin-top: auto;
}

.block {
display: block;
}
Expand All @@ -551,12 +568,20 @@ video {
display: flex;
}

.h-4 {
height: 1rem;
.hidden {
display: none;
}

.h-12 {
height: 3rem;
}

.h-16 {
height: 4rem;
}

.h-6 {
height: 1.5rem;
.h-4 {
height: 1rem;
}

.h-8 {
Expand Down Expand Up @@ -613,14 +638,27 @@ video {
width: max-content;
}

.max-w-screen-lg {
max-width: 1024px;
.w-min {
width: -moz-min-content;
width: min-content;
}

.w-screen {
width: 100vw;
}

.max-w-full {
max-width: 100%;
}

.max-w-screen-sm {
max-width: 640px;
}

.max-w-screen-xl {
max-width: 1280px;
}

@keyframes spin {
to {
transform: rotate(360deg);
Expand All @@ -643,6 +681,10 @@ video {
flex-direction: column-reverse;
}

.items-end {
align-items: flex-end;
}

.items-center {
align-items: center;
}
Expand All @@ -655,6 +697,10 @@ video {
justify-content: space-between;
}

.justify-around {
justify-content: space-around;
}

.gap-1 {
gap: 0.25rem;
}
Expand All @@ -675,6 +721,16 @@ video {
gap: 2rem;
}

.overflow-hidden {
overflow: hidden;
}

.truncate {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.break-all {
word-break: break-all;
}
Expand Down Expand Up @@ -704,10 +760,6 @@ video {
border-width: 2px;
}

.border-b {
border-bottom-width: 1px;
}

.border-r-2 {
border-right-width: 2px;
}
Expand All @@ -730,16 +782,20 @@ video {
border-color: rgb(255 255 255 / var(--tw-border-opacity));
}

.bg-accent {
--tw-bg-opacity: 1;
background-color: rgb(108 207 246 / var(--tw-bg-opacity));
.border-white\/50 {
border-color: rgb(255 255 255 / 0.5);
}

.bg-background {
--tw-bg-opacity: 1;
background-color: rgb(22 22 29 / var(--tw-bg-opacity));
}

.bg-black {
--tw-bg-opacity: 1;
background-color: rgb(0 0 0 / var(--tw-bg-opacity));
}

.bg-black\/50 {
background-color: rgb(0 0 0 / 0.5);
}
Expand All @@ -757,11 +813,23 @@ video {
background-color: rgb(152 206 0 / 0.1);
}

.bg-transparent {
background-color: transparent;
}

.bg-white {
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}

.bg-white\/10 {
background-color: rgb(255 255 255 / 0.1);
}

.bg-white\/20 {
background-color: rgb(255 255 255 / 0.2);
}

.p-2 {
padding: 0.5rem;
}
Expand All @@ -770,6 +838,10 @@ video {
padding: 1rem;
}

.p-6 {
padding: 1.5rem;
}

.px-2 {
padding-left: 0.5rem;
padding-right: 0.5rem;
Expand All @@ -780,19 +852,19 @@ video {
padding-right: 1rem;
}

.px-6 {
padding-left: 1.5rem;
padding-right: 1.5rem;
.px-8 {
padding-left: 2rem;
padding-right: 2rem;
}

.py-1 {
padding-top: 0.25rem;
padding-bottom: 0.25rem;
}

.py-2 {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
.py-4 {
padding-top: 1rem;
padding-bottom: 1rem;
}

.py-8 {
Expand Down Expand Up @@ -872,6 +944,11 @@ video {
color: rgb(219 84 97 / var(--tw-text-opacity));
}

.text-gray-400 {
--tw-text-opacity: 1;
color: rgb(156 163 175 / var(--tw-text-opacity));
}

.text-primary {
--tw-text-opacity: 1;
color: rgb(255 255 252 / var(--tw-text-opacity));
Expand All @@ -887,6 +964,10 @@ video {
color: rgb(255 255 255 / var(--tw-text-opacity));
}

.text-white\/50 {
color: rgb(255 255 255 / 0.5);
}

.underline {
text-decoration-line: underline;
}
Expand All @@ -899,6 +980,11 @@ video {
opacity: 0.75;
}

.outline-none {
outline: 2px solid transparent;
outline-offset: 2px;
}

.filter {
filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
}
Expand All @@ -907,39 +993,75 @@ video {
transition-duration: 200ms;
}

.placeholder\:text-gray-600::-moz-placeholder {
--tw-text-opacity: 1;
color: rgb(75 85 99 / var(--tw-text-opacity));
}

.placeholder\:text-gray-600::placeholder {
--tw-text-opacity: 1;
color: rgb(75 85 99 / var(--tw-text-opacity));
}

.focus-within\:border-white\/80:focus-within {
border-color: rgb(255 255 255 / 0.8);
}

.focus-within\:bg-white\/5:focus-within {
background-color: rgb(255 255 255 / 0.05);
}

.hover\:rotate-45:hover {
--tw-rotate: 45deg;
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
}

.hover\:bg-accent\/80:hover {
background-color: rgb(108 207 246 / 0.8);
.hover\:underline:hover {
text-decoration-line: underline;
}

.hover\:bg-white\/80:hover {
background-color: rgb(255 255 255 / 0.8);
.focus\:border-white\/90:focus {
border-color: rgb(255 255 255 / 0.9);
}

.active\:text-background\/70:active {
color: rgb(22 22 29 / 0.7);
.focus\:bg-white\/20:focus {
background-color: rgb(255 255 255 / 0.2);
}

.disabled\:cursor-not-allowed:disabled {
cursor: not-allowed;
.active\:text-background\/70:active {
color: rgb(22 22 29 / 0.7);
}

.disabled\:bg-slate-600:disabled {
--tw-bg-opacity: 1;
background-color: rgb(71 85 105 / var(--tw-bg-opacity));
.disabled\:opacity-50:disabled {
opacity: 0.5;
}

@media (min-width: 640px) {
.sm\:block {
display: block;
}

.sm\:flex-row {
flex-direction: row;
}

.sm\:px-6 {
padding-left: 1.5rem;
padding-right: 1.5rem;
.sm\:p-4 {
padding: 1rem;
}

.sm\:px-0 {
padding-left: 0px;
padding-right: 0px;
}

.sm\:py-6 {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}
}

@media (min-width: 768px) {
.md\:pt-24 {
padding-top: 6rem;
}
}
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="./css/index.css" />
</head>

<body>
<body class="w-full bg-black flex justify-center">
<script type="importmap">
{
"imports": {
Expand Down
6 changes: 3 additions & 3 deletions app/ts/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import { Transactions } from './Transactions.js'
import { connectBrowserProvider } from '../library/provider.js'
import { Navbar } from './Navbar.js'
import { createGlobalState } from '../stores.js'
import { Footer } from './Footer.js'

export function App() {
const state = createGlobalState()

return (
<main class='bg-background text-primary w-full min-h-screen sm:px-6 font-serif flex flex-col items-center'>
<article className='p-4 max-w-screen-lg w-full'>
<main class='bg-black text-primary w-screen max-w-screen overflow-hidden min-h-screen sm:p-4 p-6 gap-4 font-serif flex flex-col items-center max-w-screen-xl'>
<Navbar {...state} />
<div className='p-4 mt-4 flex flex-col gap-8'>
{!state.provider.value && state.bundle.value ? (
Expand All @@ -33,7 +33,7 @@ export function App() {
</>
)}
</div>
</article>
<Footer />
</main>
)
}
Loading