summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2021-04-11 00:37:24 +0200
committerRicardo Wurmus <rekado@elephly.net>2021-04-11 01:07:21 +0200
commit863897a90a98b3d4e99281be4c132e0387f42666 (patch)
treead2f530cdcd23c5224354d0bf6b0868ae488f03f
parentwebsite: Add big-letter heading on the front page. (diff)
website: Rearrange intro text.
* website/haunt.scm (read-markdown-page): Move intro text from here... (base-layout): ...to here. * website/static/css/main.css: Adjust header styles. * website/static/images/noise-bg.png: New file. * website/index.md: Remove tag line.
-rw-r--r--website/haunt.scm30
-rw-r--r--website/index.md2
-rw-r--r--website/static/css/main.css36
-rw-r--r--website/static/images/noise-bg.pngbin0 -> 3101 bytes
4 files changed, 26 insertions, 42 deletions
diff --git a/website/haunt.scm b/website/haunt.scm
index bb02010..289d0b5 100644
--- a/website/haunt.scm
+++ b/website/haunt.scm
@@ -68,9 +68,19 @@
68 (src ,(image-url (if front-page? 68 (src ,(image-url (if front-page?
69 "/logo.svg" 69 "/logo.svg"
70 "/logo-small.svg")))))) 70 "/logo-small.svg"))))))
71 ,@(if front-page? 71
72 '((div (@ (class "baseline")) 72 ;; Add the large-font welcoming message on the
73 "Software for human empowerment.")) 73 ;; front page.
74 ,@(if (assoc-ref meta 'frontpage)
75 `((p (@ (id "heading")
76 (class "front-page-heading"))
77 "Welcome to the GNU Assembly! We write "
78 (a (@ (href "/en/documents/free-software"))
79 (emph "free software"))
80 " — software that empowers users, "
81 "giving them individual and collective control "
82 "over their computing, from the operating "
83 "system to applications."))
74 '()))) 84 '())))
75 (div (@ (id "menubar") 85 (div (@ (id "menubar")
76 (class "width-control")) 86 (class "width-control"))
@@ -103,19 +113,7 @@ representation."
103 (base-layout `(div (@ (class "post")) 113 (base-layout `(div (@ (class "post"))
104 (div (@ (class "post-body")) 114 (div (@ (class "post-body"))
105 115
106 ;; Add the large-font welcoming message on the 116
107 ;; front page.
108 ,@(if (assoc-ref meta 'frontpage)
109 `((p (@ (id "heading")
110 (class "front-page-heading"))
111 "Welcome to the GNU Assembly! We write "
112 (a (@ (href "/en/documents/free-software"))
113 (emph "free software"))
114 " — software that empowers users, "
115 "giving them individual and collective control "
116 "over their computing, from the operating "
117 "system to applications."))
118 '())
119 ,body)) 117 ,body))
120 #:title (string-append "The GNU Assembly — " 118 #:title (string-append "The GNU Assembly — "
121 (assoc-ref meta 'title)) 119 (assoc-ref meta 'title))
diff --git a/website/index.md b/website/index.md
index 30056aa..f012840 100644
--- a/website/index.md
+++ b/website/index.md
@@ -1,4 +1,4 @@
1title: The GNU Assembly — Software for human empowerment 1title: The GNU Assembly
2frontpage: yes 2frontpage: yes
3--- 3---
4 4
diff --git a/website/static/css/main.css b/website/static/css/main.css
index 89ff430..2acd5ef 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -38,15 +38,11 @@
38@media all and (max-width:800px){html {font-size: 16px;}} 38@media all and (max-width:800px){html {font-size: 16px;}}
39@media all and (max-width:760px){html {font-size: 16px;}} 39@media all and (max-width:760px){html {font-size: 16px;}}
40 40
41.front-page-heading {
42 font-size: 175%;
43 line-height: 150%;
44}
45 41
46/*#ffbf2d*/ 42/*#ffbf2d*/
47 43
48body,html { 44body,html {
49 background-color: #fff; 45 background-color: #fafafa;
50 color: #073b4c; 46 color: #073b4c;
51 width: 100%; 47 width: 100%;
52 height: 100%; 48 height: 100%;
@@ -95,7 +91,7 @@ p + p {
95} 91}
96 92
97#header { 93#header {
98 background: #fff; 94 background: url('../images/noise-bg.png');
99 height: 90px; 95 height: 90px;
100 width: 100%; 96 width: 100%;
101 box-shadow: 0 3px 8px #ccc; 97 box-shadow: 0 3px 8px #ccc;
@@ -104,7 +100,8 @@ p + p {
104#header .logo { 100#header .logo {
105 padding: 10px; 101 padding: 10px;
106 display: block; 102 display: block;
107 height: 15rem; 103 height: 25rem;
104 margin-bottom: 2em;
108} 105}
109 106
110#header .logo:focus { 107#header .logo:focus {
@@ -115,24 +112,11 @@ p + p {
115 height: 4.5rem; 112 height: 4.5rem;
116} 113}
117 114
118#header .baseline {
119 color: #073b4c;
120 font-size: 16px;
121 font-family: 'Roboto', sans-serif;
122 font-weight: bold;
123 display: none; /* overridden below */
124 padding: 10px;
125 padding-top: 2px;
126}
127
128#header .members { 115#header .members {
129 float: right; 116 float: right;
130} 117}
131 118
132@media screen and (min-width: 640px) { 119@media screen and (min-width: 640px) {
133 #header .baseline {
134 display: block;
135 }
136 #header { 120 #header {
137 height: 110px; 121 height: 110px;
138 } 122 }
@@ -146,16 +130,19 @@ p + p {
146 padding-bottom: 1rem; 130 padding-bottom: 1rem;
147} 131}
148 132
133#header.frontpage .front-page-heading {
134 font-size: 175%;
135 line-height: 150%;
136 text-align: left;
137 padding-top: 0.5em;
138}
139
149#header.frontpage .logo { 140#header.frontpage .logo {
150 padding: 0; 141 padding: 0;
151 margin: 0 auto; 142 margin: 0 auto;
152 max-width: 100%; 143 max-width: 100%;
153} 144}
154 145
155#header.frontpage .baseline {
156 padding-top: 1rem;
157}
158
159#menubar { 146#menubar {
160 margin: auto; 147 margin: auto;
161 padding: 0px; 148 padding: 0px;
@@ -197,7 +184,6 @@ p + p {
197} 184}
198 185
199.post { 186.post {
200 background: #ffffff;
201 padding: 10px; 187 padding: 10px;
202 margin-bottom: 25px; 188 margin-bottom: 25px;
203} 189}
diff --git a/website/static/images/noise-bg.png b/website/static/images/noise-bg.png
new file mode 100644
index 0000000..df511d7
--- /dev/null
+++ b/website/static/images/noise-bg.png
Binary files differ