From f6e83a6b17a52a25aab342ec9fff598f0dd9613e Mon Sep 17 00:00:00 2001 From: Lazer Date: Fri, 8 May 2015 11:46:03 +0200 Subject: [PATCH 1/5] css changes + img added --- web/css/style.css | 6 +++ web/css/style_projectpage.css | 82 ++++++++++++++++++++++++++++++----- web/img/arrowa.svg | 71 ------------------------------ web/img/arrowb.svg | 71 ------------------------------ web/img/white_PZI_logo.svg | 70 ++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 152 deletions(-) delete mode 100644 web/img/arrowa.svg delete mode 100644 web/img/arrowb.svg create mode 100644 web/img/white_PZI_logo.svg diff --git a/web/css/style.css b/web/css/style.css index ea99dca..c5b35df 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -115,6 +115,12 @@ body { font-family: "texgyreheroscnbold", monospace; } +.colophon a { + color: white; + text-decoration: none; + border-bottom: 3px solid white; +} + #sortArea label{ margin-right: 6px; } diff --git a/web/css/style_projectpage.css b/web/css/style_projectpage.css index 6c242b4..ce517f5 100644 --- a/web/css/style_projectpage.css +++ b/web/css/style_projectpage.css @@ -12,6 +12,9 @@ h2 { font-family: "inconsolata", monospace; font-weight: normal; margin: 0; +} + +#creator { border-bottom: 0; padding-bottom: 0; } @@ -21,6 +24,8 @@ h2 { width: 80%; float: right; position:relative; + height: 100%; + display: table; } .zwartAreaText{ @@ -45,7 +50,6 @@ h2 { color: white; } - .colophon, .highlight{ color: white; } @@ -56,17 +60,33 @@ h2 { #sideBarDescInfo{ border-bottom: 3px solid white; - /*height: 60px;*/ + padding: 10px; +} + +#sideBarDescInfo p{ + display: initial; } -#sideBarDescInner p:first-of-type{ - padding-top: 0; +.hightlightSidebar { + word-wrap: break-word; } #sideBarDescInner p{ border-bottom: 3px double white; } +#bio { + line-height: 22px; + font-size: 16px; + font-family: "inconsolata", monospace; + padding: 10px; + border-bottom: 3px double white; +} + +#title { + padding-top: 0 !important; +} + #sideBarDescInner a, #sideBarDescInner a:active, #sideBarDescInner a:visited, @@ -152,6 +172,39 @@ h2 { max-height: 600px; } +.project h1, +.project h2, +.project h3 { + font-family: 'texgyreheroscnbold'; + +} + +.project h1 { + font-size: 25px; + padding-left: 10px; + text-indent: 50px; +} + +.project h2 { + font-size: 23px; + padding-left: 10px; + text-indent: 50px; +} + +.project h3 { + font-size: 21px; + padding-left: 10px; + text-indent: 50px; +} + +#thumnail { + display: none; +} + +iframe { + border: none; +} + @media only screen and (max-width:1600px){ .project { @@ -179,11 +232,9 @@ h2 { } @media only screen and (max-width:1280px){ - .project { width: 90%; } - } @media only screen and (max-width: 768px){ @@ -201,9 +252,20 @@ h2 { } .project { - width: 100%; - margin-top: 50px; - } + width: 100%; + margin-top: 50px; + } + + .project img { + max-width: 100%; + padding: 10px 0 10px 0; + } + + iframe { + border: none; + max-width: 100%; + padding: 10px 0 10px 0; + } .sidebarBorderLeft { border-left: 0; @@ -213,7 +275,7 @@ h2 { -webkit-box-shadow: inset 0px -3px 0px 0px white; -moz-box-shadow: inset 0px -3px 0px 0px white; box-shadow: inset 0px -3px 0px 0px white; - } + } .hoverBackA { display: none !important; diff --git a/web/img/arrowa.svg b/web/img/arrowa.svg deleted file mode 100644 index 9ebcfaf..0000000 --- a/web/img/arrowa.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/web/img/arrowb.svg b/web/img/arrowb.svg deleted file mode 100644 index 86334c7..0000000 --- a/web/img/arrowb.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/web/img/white_PZI_logo.svg b/web/img/white_PZI_logo.svg new file mode 100644 index 0000000..3355c46 --- /dev/null +++ b/web/img/white_PZI_logo.svg @@ -0,0 +1,70 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + From b506967bd68ac664a7fdad69188d7c4f163b14a3 Mon Sep 17 00:00:00 2001 From: Lazer Date: Fri, 8 May 2015 11:50:54 +0200 Subject: [PATCH 2/5] small change to page template --- web/css/style_projectpage.css | 4 ++++ web/page-template.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/css/style_projectpage.css b/web/css/style_projectpage.css index ce517f5..d00f030 100644 --- a/web/css/style_projectpage.css +++ b/web/css/style_projectpage.css @@ -251,6 +251,10 @@ iframe { border-bottom: 3px solid white; } + #sideBarDescInfo p { + padding: 0; + } + .project { width: 100%; margin-top: 50px; diff --git a/web/page-template.html b/web/page-template.html index dbb47cb..fc9b2c9 100644 --- a/web/page-template.html +++ b/web/page-template.html @@ -48,7 +48,7 @@
-

{title}

+

{title}

From a6420004b7d62f57e4367f057eda35a0915abfa4 Mon Sep 17 00:00:00 2001 From: Lazer Date: Fri, 8 May 2015 12:08:08 +0200 Subject: [PATCH 3/5] readme updated --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 67f5fa4..9233a2e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Or index all the gaduation works: web/page-template.html -1) SCRIPTS in buttom of generated pages does not close proberly. And non-relevant scripts are also still in. +1) SCRIPTS in bottom of generated pages does not close proberly. And non-relevant scripts are also still in. should be: ========= @@ -31,15 +31,19 @@ is now: + + + diff --git a/web/2015-Henk-Jelle_de_Groot.html b/web/2015-Henk-Jelle_de_Groot.html index 4f980f1..eb690a0 100644 --- a/web/2015-Henk-Jelle_de_Groot.html +++ b/web/2015-Henk-Jelle_de_Groot.html @@ -2,7 +2,7 @@ - Title + U ntitled @@ -20,21 +20,21 @@
- +

Henk-Jelle de Groot

-

Title 2015

+

U ntitled 2015

- +

Untitled is a work about visualizing non audible and non visual acoustic properties of a space. Every space has a certain acoustic reverberation, a property that can't be heard or seen on it's own. With this project I aim to visualize that property trough data visualization. Untitled contains a (few) examples of spaces that have been mapped and visualized in a new form and material. These sculptures are presented in a way that the viewer may contextualize on it's own what the nature of the sculpture is

-
+

Henk-Jelle de Groot is a Rotterdam based sound designer and musician. After graduating with an Audio / Visual design bachelor Henk-Jelle setup a sound studio in Rotterdam to work in the Audio / Visual industry. After 7 years of working he returned to the Piet Zwart Institute to graduate in a Master of comm design something something. In addition to working in the Audio / Visual industry, he is muscian and builder of electronic instruments.

+
-

+

@@ -48,7 +48,7 @@
-

Title

+

U ntitled

@@ -56,7 +56,7 @@
- +
@@ -64,12 +64,10 @@
- + + + diff --git a/web/2015-Lucia_Dossin.html b/web/2015-Lucia_Dossin.html index 59d05cd..eb62720 100644 --- a/web/2015-Lucia_Dossin.html +++ b/web/2015-Lucia_Dossin.html @@ -2,7 +2,7 @@ - Title + Mina @@ -20,19 +20,19 @@
- +

Lucia Dossin

-

Title 2015

+

Mina 2015

- +

Mina is a smart chat bot, a commercial project designed by a promising startup to fulfill humans' need of talking to someone else in a world where communication has become almost completely mediated by social media services. To keep the illusion alive, the software aims to be invisible.

-
hoi
+

The bio is coming soon.

+

www.example.com

@@ -48,7 +48,7 @@
-

Title

+

Mina

@@ -71,13 +71,11 @@
- + + + - \ No newline at end of file + diff --git a/web/2015-Luther_Blisset.html b/web/2015-Luther_Blisset.html index d03906b..2f03cbb 100644 --- a/web/2015-Luther_Blisset.html +++ b/web/2015-Luther_Blisset.html @@ -2,7 +2,7 @@ - Title + Qq @@ -20,19 +20,19 @@
- +

Luther Blisset

-

Title 2015

+

Qq 2015

- +

The novel Q was written by four Bologna-based members of the LBP, as a final contribution to the project, and published in Italy in 1999. So far, it has been translated into English (British and American), Spanish, German, Dutch, French, Portuguese (Brazilian), Danish, Polish, Greek, Czech, Russian, Turkish, Basque and Korean. In August 2003 the book was nominated for the Guardian First Book Prize.

-
Oh
+

Luther Blissett is a multiple-use name, an open pop star informally adopted and shared by hundreds of artists and activists all over Europe and the Americas since 1994. The pseudonym first appeared in Bologna, Italy, in mid-1994, when a number of cultural activists began using it for staging a series of urban and media pranks and to experiment with new forms of authorship and identity. From Bologna the multiple-use name spread to other European cities, such as Rome and London, as well as countries such as Germany, Spain, and Slovenia.[1] Sporadic appearances of Luther Blissett have been also noted in Canada, the United States, and Brazil.

+

https://en.wikipedia.org/wiki/Luther_Blissett_(nom_de_plume)

@@ -48,7 +48,7 @@
-

Title

+

Qq

@@ -76,7 +76,8 @@ - + + - \ No newline at end of file + diff --git a/web/2015-Max_Dovey.html b/web/2015-Max_Dovey.html index c4618f9..39564b9 100644 --- a/web/2015-Max_Dovey.html +++ b/web/2015-Max_Dovey.html @@ -2,7 +2,7 @@ - Title + User:Max Dovey/maxgradbio @@ -20,19 +20,19 @@
- +

Max Dovey

-

Title 2015

+

User:Max Dovey/maxgradbio 2015

- +

How to be more or less human.

-
+

My Bio

+

http://maxdovey.com

@@ -48,7 +48,7 @@
-

Title

+

User:Max Dovey/maxgradbio

@@ -65,12 +65,10 @@
- + + + diff --git a/web/index.html b/web/index.html index 50d992a..7751cba 100644 --- a/web/index.html +++ b/web/index.html @@ -1,8 +1,8 @@ - - - + + + Piet Zwart Institute: Master Media Design & Communication @@ -70,7 +70,7 @@
- +
@@ -102,7 +102,7 @@ <div class="item video flash"><img src="img/project_roel2.png"></div> <div class="item narrative"><img src="img/project_andre.jpeg"></div--> -
+
diff --git a/web/page-template.html b/web/page-template.html index fc9b2c9..cc8ea6d 100644 --- a/web/page-template.html +++ b/web/page-template.html @@ -22,13 +22,13 @@
- +

{creator}

{title} {date}

- +
{description}
@@ -64,10 +64,10 @@
- - - - + + + + From 3fc8785398edec6f46a32ee92b01f1d185c690a2 Mon Sep 17 00:00:00 2001 From: Castro0o Date: Fri, 8 May 2015 16:02:50 +0200 Subject: [PATCH 5/5] small adjustments --- README.md | 10 +++++++++- mmdc_wiki2web.py | 2 +- web/2015-Lucia_Dossin.html | 10 +++++----- web/2015-Luther_Blisset.html | 10 +++++----- web/css/style.css | 3 ++- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9233a2e..66d39f7 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,18 @@ Or index all the gaduation works: `python mmdc_wiki2web.py --category Graduation_work` +## Thumbnails +thumbnails in work pages are hidden. this can be changed. + +style_projectpage.css: + +`#thumnail { +display: none; +}` + ## template files web/page-template.html - 1) SCRIPTS in bottom of generated pages does not close proberly. And non-relevant scripts are also still in. should be: diff --git a/mmdc_wiki2web.py b/mmdc_wiki2web.py index 9b83229..1745e4c 100755 --- a/mmdc_wiki2web.py +++ b/mmdc_wiki2web.py @@ -66,7 +66,7 @@ for member in memberpages: workpage_mw = replace_gallery(workpage_mw) workpage_mw = replace_video(workpage_mw) workdict = parse_work(member, workpage_mw) # create dictionary workpage_mw template - if len(workdict['Creator'])>1 and len(workdict['Title'])>1 and len(workdict['Description'])>1: + if len(workdict['Creator'])>1 and len(workdict['Title'])>1 and len(workdict['Description'])>1 and len(workdict['Thumbnail'])>1: for key in workdict.keys(): # convert Extra, Description, Bio to HTML if key in ['Extra', 'Description', 'Bio'] and workdict[key]: workdict[key] = pandoc2html( (workdict[key].decode('utf-8'))) diff --git a/web/2015-Lucia_Dossin.html b/web/2015-Lucia_Dossin.html index eb62720..143714c 100644 --- a/web/2015-Lucia_Dossin.html +++ b/web/2015-Lucia_Dossin.html @@ -71,11 +71,11 @@ - - - - + + + + - + \ No newline at end of file diff --git a/web/2015-Luther_Blisset.html b/web/2015-Luther_Blisset.html index 2f03cbb..03330e7 100644 --- a/web/2015-Luther_Blisset.html +++ b/web/2015-Luther_Blisset.html @@ -73,11 +73,11 @@ - - - - + + + + - + \ No newline at end of file diff --git a/web/css/style.css b/web/css/style.css index c5b35df..00405fb 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -295,7 +295,8 @@ label{ max-width: 100%; max-height: 100%; vertical-align: middle; - + width:500px; + -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); -ms-filter: grayscale(100%);