diff --git a/18-expenses-chart/Makefile b/18-expenses-chart/Makefile index cc8de80..ba21c60 100644 --- a/18-expenses-chart/Makefile +++ b/18-expenses-chart/Makefile @@ -25,4 +25,4 @@ run: $(GENERATED_FILES) $(OUTPUT_CSS) # and then do `go run .` to rebuild all else .PHONY: run/live run/live: - wgo -verbose -file=.go -file=.templ make run + wgo -verbose -file=.go -file=.templ -file=$(INPUT_CSS) -file=$(TAILWIND_CONFIG) make run diff --git a/18-expenses-chart/input.css b/18-expenses-chart/input.css index b5c61c9..475f6a7 100644 --- a/18-expenses-chart/input.css +++ b/18-expenses-chart/input.css @@ -1,3 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; + +html { + font-size: 18px; +} diff --git a/18-expenses-chart/main.go b/18-expenses-chart/main.go index 602ddc4..e006c91 100644 --- a/18-expenses-chart/main.go +++ b/18-expenses-chart/main.go @@ -9,7 +9,7 @@ import ( ) func main() { - component := templates.Hello("some name") + component := templates.IndexPage() http.Handle("/", templ.Handler(component)) diff --git a/18-expenses-chart/notes.org b/18-expenses-chart/notes.org index be3e33b..5ff4e67 100644 --- a/18-expenses-chart/notes.org +++ b/18-expenses-chart/notes.org @@ -34,3 +34,25 @@ how would i commit to subtree upstream if there are conflicting changes? maybe i'll just get denied, as simple as that. allright! let's add exercise specific data (again) + +* so, starting dev + +old process: +1. open second browser and open png with style + first mobile +2. enable view C-S-m in firefox + the responsive mode + +i suppose next is adding colors to tailwind configuration? +from the styleguide file + +also +3. check desktop style, whether any big rearrangements are required + so that i'd start mobile with way to rearrange things + +do i have a separate note with all of these things? +i've also used some commands to vertically center my stuff + +** TODO allright, tailwind config go +font, size, colors + diff --git a/18-expenses-chart/tailwind.config.js b/18-expenses-chart/tailwind.config.js index 6eb134e..286cd0a 100644 --- a/18-expenses-chart/tailwind.config.js +++ b/18-expenses-chart/tailwind.config.js @@ -1,8 +1,28 @@ /** @type {import('tailwindcss').Config} */ module.exports = { - content: ["./**/*.templ"], + content: ["./templates/index.templ"], theme: { - extend: {}, + extend: { + fontFamily: { + 'sans': ['DM Sans', 'sans-serif'], + }, + fontWeight: { + 'normal': 400, + 'bold': 700, + } + }, + colors: { + primary: { + 'soft-red': 'hsl(10, 79%, 65%)', + cyan: 'hsl(186, 34%, 60%)', + }, + neutral: { + 'dark-brown': 'hsl(25, 47%, 15%)', + 'medum-brown': 'hsl(28, 10%, 53%)', + cream: 'hsl(27, 66%, 92%)', + 'very-pale-orange': 'hsl(33, 100%, 98%)', + }, + } }, plugins: [], } diff --git a/18-expenses-chart/templates/hello.templ b/18-expenses-chart/templates/hello.templ deleted file mode 100644 index 9338eaf..0000000 --- a/18-expenses-chart/templates/hello.templ +++ /dev/null @@ -1,16 +0,0 @@ -package templates - -var myVar string = "some string, changed. and more" -var anotherVar string = "hoho, cool" - -templ Hello(name string) { - -
-This is an example paragraph. Anything in the body tag will appear on the page, just like this p tag and its contents.
- - -} diff --git a/18-expenses-chart/templates/index.html b/18-expenses-chart/templates/index.html deleted file mode 100644 index 6177a84..0000000 --- a/18-expenses-chart/templates/index.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - -