diff --git a/app/app.vue b/app/app.vue index 56302ca..86f6369 100755 --- a/app/app.vue +++ b/app/app.vue @@ -1,5 +1,7 @@ diff --git a/app/assets/styles/button.css b/app/assets/styles/button.css index 2373e67..be84428 100755 --- a/app/assets/styles/button.css +++ b/app/assets/styles/button.css @@ -93,6 +93,19 @@ } } + &.search-button { + --background: var(--color-lightest); + --color: var(--color-main-darkest); + border-radius: 100%; + padding: var(--padding); + font-size: 1.1em; + + &:hover { + scale: 1.2; + --background: var(--color-light); + } + } + &.mini-button { padding: .5rem 1.5rem; display: flex; diff --git a/app/assets/styles/buttonGroup.css b/app/assets/styles/buttonGroup.css index f36e007..4b46732 100644 --- a/app/assets/styles/buttonGroup.css +++ b/app/assets/styles/buttonGroup.css @@ -1,7 +1,6 @@ .ButtonGroup { display: flex; background: var(--color-main); - box-shadow: var(--box-shadow-z2); & button { --color: var(--color-light); diff --git a/app/assets/styles/fonts.css b/app/assets/styles/fonts.css new file mode 100755 index 0000000..e4a4fec --- /dev/null +++ b/app/assets/styles/fonts.css @@ -0,0 +1,24 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + font-stretch: 100%; + font-display: swap; + src: url('/fonts/opensans.woff2') format('woff2'); +} + +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/fonts/roboto_con_reg.woff2') format('woff2'); +} + +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/fonts/roboto_con_bold.woff2') format('woff2'); +} diff --git a/app/assets/styles/formInput.css b/app/assets/styles/form/input.css similarity index 100% rename from app/assets/styles/formInput.css rename to app/assets/styles/form/input.css diff --git a/app/assets/styles/form/search.css b/app/assets/styles/form/search.css new file mode 100644 index 0000000..5a30772 --- /dev/null +++ b/app/assets/styles/form/search.css @@ -0,0 +1,15 @@ +.Search { + border-radius: 9999px; + background: var(--color-lightest); + padding: 0 1rem; + display: flex; + align-items: center; + justify-content: space-between; + gap: 1rem; + + & > input { + all: unset; + flex-grow: 1; + padding: .5rem 0; + } +} \ No newline at end of file diff --git a/app/assets/styles/general.css b/app/assets/styles/general.css index 5b917b1..5c77913 100755 --- a/app/assets/styles/general.css +++ b/app/assets/styles/general.css @@ -58,6 +58,7 @@ body { height: 100%; overflow-x: hidden; font-family: sans-serif; + background: var(--color-main-darkest); } .dot { @@ -103,10 +104,6 @@ body { box-shadow: var(--box-shadow-z2); } -.content { - min-height: 100dvh; -} - .flex-col { display: flex; flex-direction: column; diff --git a/app/assets/styles/header.css b/app/assets/styles/header.css index a59130e..8db1384 100755 --- a/app/assets/styles/header.css +++ b/app/assets/styles/header.css @@ -3,20 +3,20 @@ align-items: center; justify-content: space-between; padding: var(--padding-default); - background-color: rgba(255 255 255 / .8); - backdrop-filter: blur(10px); - box-shadow: var(--box-shadow-z2); - color: var(--color-darkest); + background: var(--color-main-darkest); position: sticky; top: 0; z-index: 100; + font-family: 'Roboto', sans-serif; + font-weight: bold; - & strong { - font-size: 2em; + & a { + text-decoration: none; + color: var(--color-lightest); + } - & span { - color: var(--color-main-dark); - } + & .header-text { + font-size: 1.5em; } & input[type="checkbox"] { diff --git a/app/assets/styles/page.css b/app/assets/styles/page.css new file mode 100644 index 0000000..8538a05 --- /dev/null +++ b/app/assets/styles/page.css @@ -0,0 +1,34 @@ +.filter-bar { + background: var(--color-lightest); + display: flex; + justify-content: space-between; + padding: 1rem; + + & > button { + all: unset; + cursor: pointer; + color: var(--color-main-darkest); + font-weight: bolder; + font-family: 'Roboto', sans-serif; + + &.active { + color: var(--color-main-darkest); + } + + &:not(.active) { + opacity: .5; + } + } +} + +.search-bar { + padding: 0 1rem 1rem 1rem; +} + +.content { + min-height: 100dvh; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + overflow: hidden; + background: var(--color-lightest); +} \ No newline at end of file diff --git a/app/assets/styles/priceCard.css b/app/assets/styles/priceCard.css index b108971..a922b25 100755 --- a/app/assets/styles/priceCard.css +++ b/app/assets/styles/priceCard.css @@ -3,6 +3,7 @@ width: 100%; color: var(--color-darkest); border-bottom: 1px solid var(--color-light); + font-family: 'Roboto', sans-serif; .bottom { position: absolute; @@ -78,6 +79,10 @@ margin-right: .5rem; color: var(--color-middle); } + + & > span:nth-child(2) { + font-family: 'Roboto Condensed', sans-serif; + } } & .wrapper { @@ -86,6 +91,7 @@ width: 100%; gap: 1rem; justify-content: space-between; + font-family: 'Roboto Condensed', sans-serif; & > .info { flex-grow: 0; @@ -104,7 +110,7 @@ } & > .pro { - font-size: .6rem; + font-size: .5rem; color: var(--color-middle); font-weight: lighter; } diff --git a/app/components/Pp/FormInput.vue b/app/components/Pp/Form/Input.vue similarity index 100% rename from app/components/Pp/FormInput.vue rename to app/components/Pp/Form/Input.vue diff --git a/app/components/Pp/Form/Search.vue b/app/components/Pp/Form/Search.vue new file mode 100755 index 0000000..db72ba8 --- /dev/null +++ b/app/components/Pp/Form/Search.vue @@ -0,0 +1,25 @@ + + + diff --git a/app/components/Pp/Header.vue b/app/components/Pp/Header.vue index 63018c4..d52d4a1 100755 --- a/app/components/Pp/Header.vue +++ b/app/components/Pp/Header.vue @@ -1,7 +1,7 @@