Free Software Foundation - FSF FY2018 Annual Report

- [TOC] -

Free software community members at [LibrePlanet 2017](https://lp).

Credit: Kori Feener, CC BY 4.0

+[TOC] +

Free software community members at [LibrePlanet 2017](https://lp).

Credit: Kori Feener, CC BY 4.0

- ## Licensing and Compliance The FSF's Licensing and Compliance Lab defends free software through license enforcement and enforcement support, a rigorous product certification, and educational resources. @@ -110,8 +111,8 @@ The DMCA is a particularly egregious example of legislative endorsement of DRM. Along with our own comments, we rallied the free software community to submit their own comments in favor of anti-circumvention exemptions â and passionate critiques of the entire process.

### EME in Web standards Encrypted Media Extensions (EME) is just another way to dress up DRM. The FSF and the free software community organized to oppose a proposal by the World Wide Web Consortium (W3C) to make EME a Web standard. We called and wrote W3C president Tim Berners-Lee, asking him to keep the Web free. While we lost this battle, and EME became a Web standard, we're looking at our options for next steps. We are not giving up hope for a free Web, even if its inventor did. @@ -119,11 +120,9 @@ Encrypted Media Extensions (EME) is just another way to dress up DRM. The FSF an ### Free people, free net Internet freedom in the United States found itself on the national stage in 2017. Over the course of the year, Ajit Pai became chairman of the Federal Communications Commission (FCC) and instigated a war against net neutrality. The FSF joined with dozens of other organizations to raise awareness and organize in support of net neutrality. -

- ### Free Software Supporter subscribers 119,299 @@ -159,8 +158,7 @@ Credit: Kori Feener, CC-BY 4.0 "quote": "To fight the dystopia of a DRM-overgrown world." }%} -

- +

## Tech ### Infrastructure for free software development and activism @@ -203,7 +201,6 @@ Credit: Kori Feener, CC-BY 4.0

- ### Defending user freedom with free software FSF and GNU infrastructure includes: @@ -224,8 +221,8 @@ over 100 : Amazon EC2 instances

### Working Together for Free Software [![GNU Guix logo](images/guix.svg)](https://my.fsf.org/civicrm/contribute/transact?reset=1&id=50){.logos} @@ -325,8 +322,6 @@ Fundraising | $65,639 ## Donors - - ### Institutional Support

@@ -403,7 +398,6 @@ Fundraising | $65,639 ### $500-$999 -

* Jean-Louis Abraham * Ben Abrams @@ -496,10 +490,10 @@ Fundraising | $65,639 This list includes our patrons, in-kind supporters, and those who receive ThankGNUs for donations totaling over $500 in a year. The FSF appreciates and thanks the thousands of individual donors, members, and corporate patrons worldwide who make our work possible. -

-![An image of a keyboard](images/donors-opener.jpg) +![An image of a keyboard](images/donors-opener.jpg){.colortone}

## Associate Membership @@ -511,11 +505,10 @@ Our mission is to promote computer user freedom and defend the rights of all sof ## Leadership and Staff -

### Board of Directors -![Richard M. Stallman](images/richard-stallman_grad.jpg){.width-50} +![Richard M. Stallman](images/richard-stallman_grad.jpg){.width-50 .colortone} #### Richard M. Stallman Founder and President #### Gerald J. Sussman @@ -532,8 +525,7 @@ President and Distinguished Technologist, Software Freedom Conservancy Attorney

- -

### Leadership

diff --git a/content/extra/custom.css b/content/extra/custom.css new file mode 100644 index 0000000..a9ecbfa --- /dev/null +++ b/content/extra/custom.css @@ -0,0 +1,19 @@ + +/* 2017 colors */ +:root { + --background: #fffff6; + --brightaccent: #ece1bd; + --darkaccent: #ac4f30; + --lightaccent: #d1b661; + --colortone: -40deg; +} + +/* Blue tones */ +:root { + --background: #f6faff; + --brightaccent: #bde3ec; + --darkaccent: #2870cc; + --lightaccent: #79b4f2; + --colortone: 195deg; +} + diff --git a/content/extra/favicon.ico b/content/extra/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a616bdcbc046cf80e6a70a52bf0056509e66c41 GIT binary patch literal 873 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wk0|T?P zr;B5VhA5)|^ZP$QHKYMXpz{C!{}ZW+k&zMP8f0*5@yd5st|N<}u~BSzuxb0QkXUvh zA$9?NpgM%j|NqPTdRXvd$@?2>`5mo*MuF literal 0 HcmV?d00001 diff --git a/content/images/corner.svg b/content/images/corner.svg new file mode 100644 index 0000000..786147f --- /dev/null +++ b/content/images/corner.svg @@ -0,0 +1,73 @@ + + + + diff --git a/output/author/free-software-foundation.html b/output/author/free-software-foundation.html index 0ca6843..76e0c7b 100644 --- a/output/author/free-software-foundation.html +++ b/output/author/free-software-foundation.html @@ -4,8 +4,9 @@ Free Software Foundation - FSF FY2018 Annual Report + - +

diff --git a/output/custom.css b/output/custom.css new file mode 100644 index 0000000..a9ecbfa --- /dev/null +++ b/output/custom.css @@ -0,0 +1,19 @@ + +/* 2017 colors */ +:root { + --background: #fffff6; + --brightaccent: #ece1bd; + --darkaccent: #ac4f30; + --lightaccent: #d1b661; + --colortone: -40deg; +} + +/* Blue tones */ +:root { + --background: #f6faff; + --brightaccent: #bde3ec; + --darkaccent: #2870cc; + --lightaccent: #79b4f2; + --colortone: 195deg; +} + diff --git a/output/favicon.ico b/output/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a616bdcbc046cf80e6a70a52bf0056509e66c41 GIT binary patch literal 873 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wk0|T?P zr;B5VhA5)|^ZP$QHKYMXpz{C!{}ZW+k&zMP8f0*5@yd5st|N<}u~BSzuxb0QkXUvh zA$9?NpgM%j|NqPTdRXvd$@?2>`5mo*MuF literal 0 HcmV?d00001 diff --git a/output/fy2018.html b/output/fy2018.html index 0d582d7..4419266 100644 --- a/output/fy2018.html +++ b/output/fy2018.html @@ -4,8 +4,9 @@ FY2018 Annual Report - FSF FY2018 Annual Report + - +

@@ -49,8 +50,9 @@

The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free "as in freedom" software.

This annual report highlights the Foundation's activities and achievements in fiscal year 2017 (October 1, 2016 â September 30, 2017) and includes a detailed financial statement.

Table of Contents

Licensing and Compliance
Campaigns

Credit: Kori Feener, CC BY 4.0

Licensing and Compliance

The FSF's Licensing and Compliance Lab defends free software through license enforcement and enforcement support, a rigorous product certification, and educational resources.

@@ -96,7 +99,7 @@

The FSF's Respects Your Freedom product certification program encourages the creation and sale of hardware that will do as much as possible to respect your freedom and privacy.

In FY17, fifteen devices from Technoethical became RYF certified: six laptops, two docking stations, a mainboard, three WiFi USB adapters, two internal WiFI devices, and a Bluetooth USB adapter. RYF certification was also awarded to three devices from Vikings: a USB stereo sound adapter, a mainboard, and a laptop, bringing the total number of RYF certified devices to twenty-seven (at the time).

Why I joined the FSF

"To fight the dystopia of a DRM-overgrown world."

Why I joined the FSF

"To fight the dystopia of a DRM-overgrown world."

A photo of a wall in Florida. Spraypainted on the wall is 'DRM' with a red circle and crossed out.

34th Street Wall, Gainesville, Florida

Credit: Gavin Baker, CC-BY-SA 4.0

@@ -138,8 +141,8 @@ International Day Against DRM

hours of streamed and recorded videos

Why I joined the FSF

"To fight the dystopia of a DRM-overgrown world."

Why I joined the FSF

"To fight the dystopia of a DRM-overgrown world."

Tech

Infrastructure for free software development and activism

This year, the FSF's tech team made some crucial infrastructure upgrades that improve both the Foundation's daily operations and the GNU Project. The changes included running more services on hardware that is Respects Your Freedom certified, including a Librebooted BIOS and running Trisquel GNU/Linux, proving that complex software projects and modern nonprofit organizations can succeed relying on free software.

@@ -356,7 +359,7 @@ International Day Against DRM

Why I joined the FSF

"I simply use GNU tools every day."

Why I joined the FSF

"I simply use GNU tools every day."

Donors

Institutional Support

@@ -526,7 +529,7 @@ International Day Against DRM

This list includes our patrons, in-kind supporters, and those who receive ThankGNUs for donations totaling over $500 in a year. The FSF appreciates and thanks the thousands of individual donors, members, and corporate patrons worldwide who make our work possible.

An image of a keyboard

Associate Membership

@@ -536,7 +539,7 @@ International Day Against DRM

Leadership and Staff

Board of Directors

Richard M. Stallman

Founder and President

Gerald J. Sussman

@@ -552,7 +555,7 @@ International Day Against DRM

Kat Walsh

Attorney

Leadership

John Sullivan

diff --git a/output/images/corner.svg b/output/images/corner.svg new file mode 100644 index 0000000..786147f --- /dev/null +++ b/output/images/corner.svg @@ -0,0 +1,73 @@ + + + + diff --git a/output/index.html b/output/index.html index 2aff0a7..9c1b6a0 100644 --- a/output/index.html +++ b/output/index.html @@ -4,8 +4,9 @@ FSF FY2018 Annual Report + - +

diff --git a/output/theme/css/b-side-base.css b/output/theme/css/b-side-base.css index 21d09be..33b9cfb 100644 --- a/output/theme/css/b-side-base.css +++ b/output/theme/css/b-side-base.css @@ -17,17 +17,6 @@ */ -:root { - --background: #fffff6; - --brightaccent: #ece1bd; - --darkaccent: #ac4f30; - --lightaccent: #d1b661; - --colortone: -40deg; -} - - - - /*****************************************************************************/ /* Some basic settings */ @@ -969,7 +958,6 @@ border-top:3px solid black; table{ width:100%; border-spacing:0; -max-width: 30vw !important; } h1{ @@ -1019,8 +1007,11 @@ min-width:500px .grid{ -display:block; +display:inline-flex; +align-items: flex-start; +flex-flow: wrap; margin-top:1rem; +gap:2% } .grid h4{ @@ -1029,15 +1020,12 @@ padding: 0.5rem; background-color: var(--darkaccent); letter-spacing: 1px; font-size:1.1rem; -width:80%; margin-bottom:0.5rem; } .grid p{ line-height:1.2rem; padding:0; -width:80%!important; -margin:0 0 3rem } .grid a{ @@ -1047,26 +1035,26 @@ margin:0 0 3rem } .column{ -float:left; -width: 25%; +margin: 0 auto; +width: 22%; } .column p {width:80%} .column5{ float:left; -width: 18% !important; +width: 18%; margin:0 1% 0 1%; } .column3{ float:left; -width: 28% !important; +width: 28%; margin:0 1% 0 1%; } .column2{ float:left; -width: 48% !important; +width: 48%; margin:0 1% 0 1%; } @@ -1089,6 +1077,14 @@ footer{ } #toc{ + border-bottom: 1rem solid var(--lightaccent); + display:inline-grid; + width:100%; + margin:0; + padding:0; +} + +#tocbg{ display:block; width:100%; background-repeat:no-repeat !important; @@ -1097,10 +1093,9 @@ footer{ -moz-background-size: cover !important; -o-background-size: cover !important; background-size: cover!important; - border-bottom: 1rem solid var(--lightaccent); } -#tocimage{ +#toctext{ padding-top:12rem; padding-left: 10%; /*backdrop-filter: brightness(50%) sepia(100%) saturate(150%) hue-rotate(var(--colortone)); @@ -1140,7 +1135,9 @@ footer{ color: black; font-size:70%; margin:0; - padding:0 + padding:0; + position:relative; + top: -1rem; } #toc .caption{ @@ -1163,13 +1160,20 @@ a{ .credit { font-size: 70%; opacity: 0.7; - margin-top:0; + margin:0; padding-top:0; - padding-bottom: 0.65rem; text-transform: uppercase; letter-spacing: 1px; - color:var(--darkaccent) + color:var(--darkaccent); + position:relative; + top: -0.5rem; +} + +p + .quote-box-top{ +height:3rem; +clear:both; } + .quote-box { clear:both; margin: 0 auto; @@ -1181,17 +1185,24 @@ a{ .quote-box h4 { font-size: 120%; + padding-top: 3rem; color: var(--lightaccent); } .quote-box blockquote { font-size: 180%; line-height: 1.3; font-weight: 700; - padding-top: 1rem; + padding:0; + margin:0; text-align: center; border:none; } +.quote-box p{ + padding:0; + margin:0 0 3rem 0; +} + .subtitle p{ font-weight:bold; } @@ -1274,7 +1285,15 @@ dd{ margin:0; padding:0; font-size:0.8rem; +} +dl{ + width:fit-content; + padding:.5rem; + background-image: url(/images/corner.svg), url(/images/corner.svg), url(/images/corner.svg), url(/images/corner.svg); + background-size: 10px 10px; + background-position: bottom left, bottom right, top left, top right; + background-repeat: no-repeat; } .logos{ @@ -1296,8 +1315,8 @@ vertical-align:middle display: inline-block; margin: 0 0.5rem 0.65rem; - color: #ac4f30; - border-bottom: 2px solid #ece1bd; + color: var(--darkaccent); + border-bottom: 2px solid var(--lightaccent); } @@ -1328,6 +1347,19 @@ padding-left:10% .staffcolumn h3{ width:100%; -border-bottom:1px solid var(--lightaccent); -margin-bottom:2rem +border-bottom:1px solid var(--lightaccent) +} + + +p { +margin-top:0 +} + +p:empty{ +margin:0} + + + +.staff img, .colortone, .matplotlib, #tocbg{ +filter: hue-rotate(var(--colortone)) grayscale(50%) } diff --git a/output/theme/css/b-side-base.css.css b/output/theme/css/b-side-base.css.css new file mode 100644 index 0000000..e69de29 diff --git a/output/theme/css/b-side-post.css b/output/theme/css/b-side-post.css index a92b446..52dc1ce 100644 --- a/output/theme/css/b-side-post.css +++ b/output/theme/css/b-side-post.css @@ -66,13 +66,14 @@ img { padding-right:5%; }*/ -.document, #head p, h1, .fsflogo, .grid{ +.document, #head p, h1, .fsflogo{ margin-left:2%; margin-right:2%; width:96% } + #head, .quote-box, #toc{ width:106%!important; padding:0!important; @@ -80,6 +81,32 @@ position:relative; right:2% } +@media (max-width: 899px) { +.column2 { +width:100% +} + +.column3, .column5 { +width:47%!important +} + +.staffcolumn{ +padding:0 !important; +width:100% +} + +html{font-size:22px} + +.grid{ +width:95%; +margin-left:2%; +margin-right:2%; +} + +.grid .column{ +width:49%} + +} /* * if width wide enough, then put asides in wide right-hand margin @@ -109,11 +136,17 @@ margin-right:10%; width: 80% } + + #head, .quote-box, #toc{ width:100vw!important; padding:0!important; position:relative; right:10vw; +} + +.staffcolumn{ +width:60% } /* diff --git a/pelicanconf.py b/pelicanconf.py index 7a6616b..d4c2a78 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -3,7 +3,19 @@ SITENAME = 'FSF FY2018 Annual Report' SITEURL = '' PATH = 'content' -STATIC_PATHS = ['images'] + +STATIC_PATHS = [ + 'images', + 'extra', +] +EXTRA_PATH_METADATA = { + 'extra/custom.css': {'path': 'custom.css'}, + 'extra/robots.txt': {'path': 'robots.txt'}, + 'extra/favicon.ico': {'path': 'favicon.ico'}, # and this + 'extra/CNAME': {'path': 'CNAME'}, + 'extra/LICENSE': {'path': 'LICENSE'}, + 'extra/README': {'path': 'README'}, +} TIMEZONE = 'US/Eastern' diff --git a/plugins/comment.py b/plugins/comment.py index 35ee108..a15a770 100644 --- a/plugins/comment.py +++ b/plugins/comment.py @@ -35,8 +35,9 @@ def image_parser(preprocessor, tag, markup): @LiquidTags.register("separator") def separator_parser(preprocessor, tag, markup): data = loads(markup) - return '

\ + return '

\ +

%s

\ -

"%s"

' % (data['title'], data['quote']) +

"%s"

' % (data['title'], data['quote']) from .liquid_tags import register # noqa diff --git a/theme/static/css/b-side-base.css b/theme/static/css/b-side-base.css index 0e58804..33b9cfb 100644 --- a/theme/static/css/b-side-base.css +++ b/theme/static/css/b-side-base.css @@ -17,17 +17,6 @@ */ -:root { - --background: #fffff6; - --brightaccent: #ece1bd; - --darkaccent: #ac4f30; - --lightaccent: #d1b661; - --colortone: -40deg; -} - - - - /*****************************************************************************/ /* Some basic settings */ @@ -969,7 +958,6 @@ border-top:3px solid black; table{ width:100%; border-spacing:0; -max-width: 30vw !important; } h1{ @@ -1019,8 +1007,11 @@ min-width:500px .grid{ -display:block; +display:inline-flex; +align-items: flex-start; +flex-flow: wrap; margin-top:1rem; +gap:2% } .grid h4{ @@ -1029,15 +1020,12 @@ padding: 0.5rem; background-color: var(--darkaccent); letter-spacing: 1px; font-size:1.1rem; -width:80%; margin-bottom:0.5rem; } .grid p{ line-height:1.2rem; padding:0; -width:80%!important; -margin:0 0 3rem } .grid a{ @@ -1047,26 +1035,26 @@ margin:0 0 3rem } .column{ -float:left; -width: 25%; +margin: 0 auto; +width: 22%; } .column p {width:80%} .column5{ float:left; -width: 18% !important; +width: 18%; margin:0 1% 0 1%; } .column3{ float:left; -width: 28% !important; +width: 28%; margin:0 1% 0 1%; } .column2{ float:left; -width: 48% !important; +width: 48%; margin:0 1% 0 1%; } @@ -1089,6 +1077,14 @@ footer{ } #toc{ + border-bottom: 1rem solid var(--lightaccent); + display:inline-grid; + width:100%; + margin:0; + padding:0; +} + +#tocbg{ display:block; width:100%; background-repeat:no-repeat !important; @@ -1097,10 +1093,9 @@ footer{ -moz-background-size: cover !important; -o-background-size: cover !important; background-size: cover!important; - border-bottom: 1rem solid var(--lightaccent); } -#tocimage{ +#toctext{ padding-top:12rem; padding-left: 10%; /*backdrop-filter: brightness(50%) sepia(100%) saturate(150%) hue-rotate(var(--colortone)); @@ -1140,7 +1135,9 @@ footer{ color: black; font-size:70%; margin:0; - padding:0 + padding:0; + position:relative; + top: -1rem; } #toc .caption{ @@ -1163,13 +1160,20 @@ a{ .credit { font-size: 70%; opacity: 0.7; - margin-top:0; + margin:0; padding-top:0; - padding-bottom: 0.65rem; text-transform: uppercase; letter-spacing: 1px; - color:var(--darkaccent) + color:var(--darkaccent); + position:relative; + top: -0.5rem; +} + +p + .quote-box-top{ +height:3rem; +clear:both; } + .quote-box { clear:both; margin: 0 auto; @@ -1181,17 +1185,24 @@ a{ .quote-box h4 { font-size: 120%; + padding-top: 3rem; color: var(--lightaccent); } .quote-box blockquote { font-size: 180%; line-height: 1.3; font-weight: 700; - padding-top: 1rem; + padding:0; + margin:0; text-align: center; border:none; } +.quote-box p{ + padding:0; + margin:0 0 3rem 0; +} + .subtitle p{ font-weight:bold; } @@ -1274,7 +1285,15 @@ dd{ margin:0; padding:0; font-size:0.8rem; +} +dl{ + width:fit-content; + padding:.5rem; + background-image: url(/images/corner.svg), url(/images/corner.svg), url(/images/corner.svg), url(/images/corner.svg); + background-size: 10px 10px; + background-position: bottom left, bottom right, top left, top right; + background-repeat: no-repeat; } .logos{ @@ -1296,8 +1315,8 @@ vertical-align:middle display: inline-block; margin: 0 0.5rem 0.65rem; - color: #ac4f30; - border-bottom: 2px solid #ece1bd; + color: var(--darkaccent); + border-bottom: 2px solid var(--lightaccent); } @@ -1330,3 +1349,17 @@ padding-left:10% width:100%; border-bottom:1px solid var(--lightaccent) } + + +p { +margin-top:0 +} + +p:empty{ +margin:0} + + + +.staff img, .colortone, .matplotlib, #tocbg{ +filter: hue-rotate(var(--colortone)) grayscale(50%) +} diff --git a/theme/static/css/b-side-base.css.css b/theme/static/css/b-side-base.css.css new file mode 100644 index 0000000..e69de29 diff --git a/theme/static/css/b-side-post.css b/theme/static/css/b-side-post.css index a92b446..52dc1ce 100644 --- a/theme/static/css/b-side-post.css +++ b/theme/static/css/b-side-post.css @@ -66,13 +66,14 @@ img { padding-right:5%; }*/ -.document, #head p, h1, .fsflogo, .grid{ +.document, #head p, h1, .fsflogo{ margin-left:2%; margin-right:2%; width:96% } + #head, .quote-box, #toc{ width:106%!important; padding:0!important; @@ -80,6 +81,32 @@ position:relative; right:2% } +@media (max-width: 899px) { +.column2 { +width:100% +} + +.column3, .column5 { +width:47%!important +} + +.staffcolumn{ +padding:0 !important; +width:100% +} + +html{font-size:22px} + +.grid{ +width:95%; +margin-left:2%; +margin-right:2%; +} + +.grid .column{ +width:49%} + +} /* * if width wide enough, then put asides in wide right-hand margin @@ -109,11 +136,17 @@ margin-right:10%; width: 80% } + + #head, .quote-box, #toc{ width:100vw!important; padding:0!important; position:relative; right:10vw; +} + +.staffcolumn{ +width:60% } /* diff --git a/theme/templates/partials/head-meta.html b/theme/templates/partials/head-meta.html index 9917d09..daff149 100644 --- a/theme/templates/partials/head-meta.html +++ b/theme/templates/partials/head-meta.html @@ -1,2 +1,2 @@ - + diff --git a/theme/templates/partials/head-style-base.html b/theme/templates/partials/head-style-base.html index 64e7b28..e9d841b 100644 --- a/theme/templates/partials/head-style-base.html +++ b/theme/templates/partials/head-style-base.html @@ -1 +1,2 @@ + -- 2.25.1