Browse Source

sync

master
manetta 3 years ago
parent
commit
36814624cb
  1. 9
      command-line/Makefile
  2. 233
      command-line/css/print.css
  3. 0
      command-line/js/multi-remix.js
  4. 53
      command-line/js/variable-geometry.js
  5. 3
      command-line/templates/template.html

9
command-line/Makefile

@ -1,5 +1,4 @@
STYLESHEET:=volumetric-regimes.css
MINIFIEDSHEET:= $(shell cat ./css/print.min.css)
.PHONY: css
@ -27,14 +26,6 @@ css:
./venv/bin/etherpump gettext $(STYLESHEET) > ./css/print.css
@echo "Saving CSS: $(STYLESHEET) (pad) --> print.css (file)"
# --- does not work :(
# csspad:
# @echo "Generating a minified CSS: print.css --> print.min.css"
# uglifycss css/print.css > css/print.min.css
# @echo "Saving the local CSS sheet to the pad: print.css (file) --> $(STYLESHEET) (pad)"
# @echo "$(MINIFIEDSHEET)"
# ./venv/bin/etherpump settext --limit $(STYLESHEET) < $(MINIFIEDSHEET)
upload:
scp -r Unfolded.html css js fonts varia:public_html/volumetric-regimes/

233
command-line/css/print.css

@ -236,12 +236,17 @@ html, body{
div.section{
page: section;
/* force an extra blank page before each section ... */
page-break-before: always;
page-break-before: left;
}
div.section.intro{
/* exception for the intro section, as there is no title page for this section */
page: contribution !important;
}
div.section.toc,
div.section.intro{
/* exception for the section of the toc and intro, as it needs to be on the right */
page-break-before: right !important;
}
div.section h1{
/* ... and make sure that each section starts on the right */
page-break-before: right;
@ -276,6 +281,12 @@ div.multi,
div.series{
page-break-after: always;
}
/* force extra page-break for section title pages to start on the left */
div.contribution.so-called-plants,
div.contribution.invasive-imagination,
div.contribution.interview-phil{
page-break-after: always;
}
div.appendix{
page-break-before: always;
}
@ -296,7 +307,7 @@ div.backcover{
}
div.cover,
div.cover ul li,
div.backcover h2{
div.backcover b{
font-size: 17pt;
font-family: "bitter_semi";
line-height: 1.4;
@ -304,10 +315,6 @@ div.backcover{
color: white;
font-weight: bold;
}
div.backcover h2{
position: relative !important;
margin-top: 0 !important;
}
div.backcover{
color: white;
}
@ -324,7 +331,7 @@ div.backcover{
}
div.backcover{
}
div.backcover h2{
div.backcover b{
margin-left: 0;
}
div.backcover p{
@ -516,6 +523,10 @@ h3{
div.contribution.bugged-report h3{
margin-bottom: var(--line-height) !important;
}
div.introduction + h3{
color: red;
margin-top: 0 !important;
}
h4{
/* Sub-sub-headers */
font-size: 100%;
@ -536,6 +547,7 @@ p{
padding: 0;
}
/* all exceptions on the text-indent */
div.title-wrapper + p,
div.note > p,
p.image + p,
div.list-without-markers p,
@ -559,6 +571,7 @@ p{
blockquote p,
table p,
pre + p,
div.quote + p,
blockquote + p,
ul + p,
ol + p{
@ -569,13 +582,13 @@ p{
div.series p{
margin-bottom: var(--line-height);
}
div.contribution.interview-phil h3 + p {
text-indent: var(--first-indent) !important;
}
div.contribution.information-for-users h2 + p + p + p > b,
div.contribution.ultrasonic-dreams h2 + p + p + p > b{
div.contribution.ultrasonic-dreams div.title-wrapper + p + p > b{
margin-left: -7mm;
}
div.title-wrapper + p + p{
text-indent: var(--first-indent);
}
ul{
margin: 18px 0 !important;
@ -640,10 +653,9 @@ ul > li {
text-indent: -1em;
margin-bottom: unset !important;
}
div.contribution.so-called-plants ol.references,
div.contribution.invasive-imagination ol.references,
div.contribution.interview-phil ol.references{
page-break-after: always;
div.contribution.densities ol.references,
div.contribution.ultrasonic-dreams ul.references{
/*margin-top: -18px !important;*/
}
div.note{
@ -684,7 +696,7 @@ img{
min-width: 60mm;
}
div.fullpage{
page: fullpage !important;
page: fullpage !important;
}
div.fullpage div.thumb{
margin: 0 !important;
@ -711,6 +723,9 @@ img{
div.fullpage.right div.thumb img{
margin-left: 0mm !important;
}
img[src="./images/Topology-typography-2B.svg"]{
page-break-after: always;
}
/* Exception for User Info large small image */
div.special_image_treatment.userinfo img{
@ -728,9 +743,7 @@ img{
div.invasive-imagination div.thumb img{
width: 100% !important;
}
/*div.invasive-imagination div.thumb img[src="./images/Figure06.png"]{
width: 365px !important;
}*/
/* Exception for Maria Dada's text on Beirut 82 */
div.enlarged-image img,
div.contribution.beirut-82 div.thumb img{
@ -743,19 +756,180 @@ img{
margin-top: -10mm;
margin-left: -22mm !important;
}
img[alt="Strategy and Tactics.jpg"]{
margin-left: -18mm !important;
img[src="./images/Strategy_and_Tactics.jpg"]{
margin-left: -17mm !important;
}
/* BASELINE FINAL TWEAKS */
img[src="./images/Imagen_2.png"]{
margin-top: 19px;
}
img[src="./images/Brk02.gif"]{
margin-bottom: 8px;
}
img[src="./images/Image20.png"]{
margin-top: 23px;
margin-bottom: 13px;
}
img[src="./images/DisintegrationEffect2.png"]{
margin-top: 23px;
}
img[src="./images/CollapseWoman1.jpg"]{
margin-top: 23px;
margin-bottom: 13px;
}
img[src="./images/AdvanceRig1.png"]{
margin-top: 22px;
}
img[src="./images/Rigonfour1.png"]{
margin-top: 23px;
}
img[src="./images/FKrig171.gif"]{
margin-top: -3px;
}
img[src="./images/DigestingDuck1.png"]{
margin-top: -2px;
}
img[src="./images/RiggingDan1.jpg"]{
margin-top: 20px;
}
img[src="./images/McKayRig1.jpg"]{
margin-top: -4px;
}
img[src="./images/TalismanRig1.jpg"]{
margin-top: -5px;
}
img[src="./images/Blender.jpg"]{
margin-top: 20px;
}
img[src="./images/MojoDallas01.jpg"]{
margin-top: -2px;
}
img[src="./images/Cunningham.jpg"]{
margin-top: 22px;
}
img[src="./images/Figure04.png"]{
margin-top: 27px;
}
img[src="./images/Figure09.png"]{
margin-top: -6px;
}
img[src="./images/Figure10.png"],
img[src="./images/Figure12.png"]{
margin-top: 25px;
}
img[src="./images/Figure13.jpg"]{
margin-top: 18px;
}
img[src="./images/Background_prominence.png"]{
margin-top: -4px;
}
img[src="./images/Inscriptions.jpg"],
img[src="./images/Inscriptions_2.jpg"]{
margin-top: -2px;
}
img[src="./images/Backlighting.jpg"],
img[src="./images/Overexposed.jpg"]{
margin-top: -2px;
}
img[src="./images/Fol_thefragilityoflife-2.jpeg"]{
margin-top: 20px;
margin-bottom: 12px;
}
img[src="./images/04_bertillon_identification_system.jpg"]{
margin-top: -4px;
}
img[src="./images/09_newsdirect.png"]{
margin-top: 26px;
}
img[src="./images/Simone1.jpg"]{
margin-top: 20px;
}
img[src="./images/06_imgf0016.png"]{
margin-top: 21px;
}
img[src="./images/Difficultforest.jpg"]{
margin-top: -2px;
}
img[src="./images/Makehuman.png"]{
margin-top: -4px;
}
img[src="./images/Leaflet.jpg"]{
margin-top: 15px;
}
img[src="./images/Continuum_brighton.svg"]{
margin-top: -13px;
}
img[src="./images/Image1.jpg"]{
margin-top: 17px;
}
img[src="./images/Image2.png"]{
margin-top: 15px;
}
img[src="./images/Image3.jpg"]{
margin-top: 28px;
}
img[src="./images/Image4.jpg"]{
margin-top: 26px;
}
img[src="./images/Image5.jpg"]{
margin-top: 23px;
}
img[src="./images/Image6.png"]{
margin-top: 15px;
}
img[src="./images/Datum.jpg"]{
margin-top: 21px;
}
img[src="./images/Gplates1.gif"]{
margin-top: 17px;
}
img[src="./images/Image01.png"]{
margin-top: -3px;
}
img[src="./images/Image02.png"]{
margin-top: 21px;
}
img[src="./images/Image03.png"]{
margin-top: 23px;
}
img[src="./images/Image04.png"]{
margin-top: -8px;
}
a[href="#File:Image04.png"] + .thumbcaption{
margin-bottom: -8px;
}
img[src="./images/Gplates1.gif"] {
margin-top: -1px;
}
img[src="./images/Gplates2.gif"] {
margin-top: 22px;
}
img[src="./images/Gplates3.gif"] {
margin-top: 21px;
}
img[src="./images/Gplates3.gif"] {
margin-top: 21px;
}
img[src="./images/Gplates5.gif"] {
margin-top: 24px;
}
img[src="./images/Gplates5.gif"] {
margin-top: 60px;
}
img[src="./images/Image02.png"] {
margin-top: 20px;
}
img[src="./images/Image05.png"] {
margin-top: 21px;
}
img[src="./images/File_manager_overview.png"]{
margin-top: 24px;
margin-bottom: 24px;
}
img[src="./images/Fol_thefragilityoflife-2.jpeg"]{
margin-top: 18px;
margin-bottom: 0;
}
.contribution.so-called-plants div.floatnone + p{
margin-left: var(--second-indent) !important;
text-indent: unset !important;
@ -772,7 +946,7 @@ pre{
line-height: var(--line-height);
hyphens: none;
white-space: pre-line;
margin: calc(var(--line-height) - 2px) 0 calc(var(--line-height) - 2px) var(--second-indent);
margin: calc(var(--line-height) - 1px) 0 calc(var(--line-height) - 1px) var(--second-indent);
border: 1px solid rgba(0,0,0,0.2);
padding: calc(var(--line-height) / 2) var(--line-height);
page-break-inside: avoid;
@ -785,6 +959,10 @@ pre{
white-space: pre-line;
word-wrap: break-word;
}
div.contribution.so-called-plants pre{
margin-top: 9px;
margin-bottom: 9px;
}
blockquote{
margin: 0 0 0 var(--second-indent);
font-style: italic;
@ -833,9 +1011,8 @@ sup{
}
canvas{
position: absolute;
top: 24mm;
top: 17mm;
left: -20mm;
/*border: 1px solid magenta;*/
}
a,
a:visited,

0
command-line/js/variable-geometry-cover.js → command-line/js/multi-remix.js

53
command-line/js/variable-geometry.js

@ -1,53 +0,0 @@
/*
The cover image is derived from Multi Remix,
an Open Source and cross-platform interpretation
by Winnie Soon and Geoff Cox of the software app
Multi by David Reinfurt. Multi updates the idea
of the multiple from industrial production to the
dynamics of the information age. Each cover
presents an iteration of a possible 1,728
arrangements, each a face built from minimal
typographic furniture, and from the same source
code.
https://o-r-g.com/apps/multi
https://aesthetic-programming.net/pages/2-variable-geometry.html
*/
/* --- Variable Geometry 1 (cover) --- */
/*Inspired by David Reinfurt's work - Multi*/
function setup() {
var c = createCanvas(600, 600);
c.parent('variable-geometry');
}
function draw() {
//left
noStroke()
fill(0);
// x, y, w, h
rect(77, 169, 100, 16);
//right
rect(395, 184, 32, 25);
fill(0);
beginShape();
vertex(395, 209);
vertex(427, 209);
vertex(407, 241);
vertex(383, 241);
endShape(CLOSE);
//bottom
noFill();
stroke(0);
strokeWeight(8);
ellipse(255, 400, 100, 100);
}

3
command-line/templates/template.html

@ -8,8 +8,7 @@
<link href="./css/print.css" rel="stylesheet" type="text/css" media="print">
<link href="./css/baseline.css" rel="stylesheet" type="text/css" media="print">
<script src="./js/p5.js" type="text/javascript"></script>
<script src="./js/variable-geometry-cover.js" type="text/javascript"></script>
<!-- <script src="./js/variable-geometry-inside.js"></script> -->
<script src="./js/multi-remix.js" type="text/javascript"></script>
</head>
<body>
<div id="wrapper">

Loading…
Cancel
Save