diff --git a/img/oglc.png b/img/oglc.png new file mode 100644 index 0000000..f1ff660 Binary files /dev/null and b/img/oglc.png differ diff --git a/makefile b/makefile index 3da051a..dca2fae 100644 --- a/makefile +++ b/makefile @@ -1,19 +1,25 @@ SRC_DIR = src +IMG_DIR = img OUT_DIR = site ROOT_DIR = $(SRC_DIR)/root -INC_HTML = $(SRC_DIR)/inc_html -INC_CSS = $(SRC_DIR)/inc_css PAGES = $(shell find $(ROOT_DIR) -wholename "$(ROOT_DIR)*.html") -HTML_INCLUDES = $(shell find $(INC_HTML) -name *.html) -HTML_TARGETS = $(PAGES:$(ROOT_DIR)/%.html=$(OUT_DIR)/%.html) - STYLES = $(shell find $(ROOT_DIR) -wholename "$(ROOT_DIR)*.css") -CSS_INCLUDES = $(shell find $(INC_CSS) -name *.css) + +IMAGES = $(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.png") +#IMAGES = $(IMAGES:$(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.jpg")) +#IMAGES = $(IMAGES:$(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.gif")) + +HTML_INCLUDES = $(shell find $(SRC_DIR)/inc_html -name *.html) +CSS_INCLUDES = $(shell find $(SRC_DIR)/inc_css -name *.css) + +HTML_TARGETS = $(PAGES:$(ROOT_DIR)/%.html=$(OUT_DIR)/%.html) CSS_TARGETS = $(STYLES:$(ROOT_DIR)/%.css=$(OUT_DIR)/%.css) +PNG_TARGETS = $(IMG_DIR)/%.png=$(OUT_DIR)/%.png run: $(HTML_TARGETS) $(CSS_TARGETS) + cp $(IMG_DIR)/*.png $(OUT_DIR)/ $(OUT_DIR)/%.html: $(ROOT_DIR)/%.html $(HTML_INCLUDES) mkdir -p $(OUT_DIR) diff --git a/src/inc_css/demos.css b/src/inc_css/demos.css new file mode 100644 index 0000000..fc6afb2 --- /dev/null +++ b/src/inc_css/demos.css @@ -0,0 +1,18 @@ +.demoTile { + opacity: 0.3; + transition: opacity 0.3s; + max-width: 15vw; + display: inline; +} + +.demoTile:hover { + opacity: 1.0; +} + +.demoTiles { + position: absolute; + background-color:white; + left:27.5%; + top: var(--title-height); + margin-top:40px; +} diff --git a/src/root/portfolio.html b/src/root/portfolio.html index 06e742b..67d1060 100644 --- a/src/root/portfolio.html +++ b/src/root/portfolio.html @@ -8,8 +8,13 @@

ktyl@website/portfolio

- #include sidebar.html +#include sidebar.html + +
+ + + +
- diff --git a/src/root/styles.css b/src/root/styles.css index 33c1a9b..98357e1 100644 --- a/src/root/styles.css +++ b/src/root/styles.css @@ -162,4 +162,5 @@ a.fsText:hover { transition: color 0.3s; } +#include demos.css #include planets.css