diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c5402b9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,55 @@ +# Blue Oak Model License + +Version 1.0.0 + +## Purpose + +This license gives everyone as much permission to work with +this software as possible, while protecting contributors +from liability. + +## Acceptance + +In order to receive this license, you must agree to its +rules. The rules of this license are both obligations +under that agreement and conditions to your license. +You must not do anything with this software that triggers +a rule that you cannot or will not follow. + +## Copyright + +Each contributor licenses you to do everything with this +software that would otherwise infringe that contributor's +copyright in it. + +## Notices + +You must ensure that everyone who gets a copy of +any part of this software from you, with or without +changes, also gets the text of this license or a link to +. + +## Excuse + +If anyone notifies you in writing that you have not +complied with [Notices](#notices), you can keep your +license by taking all practical steps to comply within 30 +days after the notice. If you do not do so, your license +ends immediately. + +## Patent + +Each contributor licenses you to do everything with this +software that would otherwise infringe any patent claims +they can license or become able to license. + +## Reliability + +No contributor can revoke this license. + +## No Liability + +***As far as the law allows, this software comes as is, +without any warranty or condition, and no contributor +will be liable to anyone for any damages related to this +software or this license, under any kind of legal claim.*** diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 1e0278e..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,119 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES -NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE -AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION -ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE -OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS -LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION -OR WORKS PROVIDED HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer exclusive -Copyright and Related Rights (defined below) upon the creator and subsequent -owner(s) (each and all, an "owner") of an original work of authorship and/or -a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for the -purpose of contributing to a commons of creative, cultural and scientific -works ("Commons") that the public can reliably and without fear of later claims -of infringement build upon, modify, incorporate in other works, reuse and -redistribute as freely as possible in any form whatsoever and for any purposes, -including without limitation commercial purposes. These owners may contribute -to the Commons to promote the ideal of a free culture and the further production -of creative, cultural and scientific works, or to gain reputation or greater -distribution for their Work in part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any expectation -of additional consideration or compensation, the person associating CC0 with -a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright -and Related Rights in the Work, voluntarily elects to apply CC0 to the Work -and publicly distribute the Work under its terms, with knowledge of his or -her Copyright and Related Rights in the Work and the meaning and intended -legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be protected -by copyright and related or neighboring rights ("Copyright and Related Rights"). -Copyright and Related Rights include, but are not limited to, the following: - -i. the right to reproduce, adapt, distribute, perform, display, communicate, -and translate a Work; - -ii. moral rights retained by the original author(s) and/or performer(s); - -iii. publicity and privacy rights pertaining to a person's image or likeness -depicted in a Work; - -iv. rights protecting against unfair competition in regards to a Work, subject -to the limitations in paragraph 4(a), below; - -v. rights protecting the extraction, dissemination, use and reuse of data -in a Work; - -vi. database rights (such as those arising under Directive 96/9/EC of the -European Parliament and of the Council of 11 March 1996 on the legal protection -of databases, and under any national implementation thereof, including any -amended or successor version of such directive); and - -vii. other similar, equivalent or corresponding rights throughout the world -based on applicable law or treaty, and any national implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention of, -applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and -unconditionally waives, abandons, and surrenders all of Affirmer's Copyright -and Related Rights and associated claims and causes of action, whether now -known or unknown (including existing as well as future claims and causes of -action), in the Work (i) in all territories worldwide, (ii) for the maximum -duration provided by applicable law or treaty (including future time extensions), -(iii) in any current or future medium and for any number of copies, and (iv) -for any purpose whatsoever, including without limitation commercial, advertising -or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the -benefit of each member of the public at large and to the detriment of Affirmer's -heirs and successors, fully intending that such Waiver shall not be subject -to revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason be -judged legally invalid or ineffective under applicable law, then the Waiver -shall be preserved to the maximum extent permitted taking into account Affirmer's -express Statement of Purpose. In addition, to the extent the Waiver is so -judged Affirmer hereby grants to each affected person a royalty-free, non -transferable, non sublicensable, non exclusive, irrevocable and unconditional -license to exercise Affirmer's Copyright and Related Rights in the Work (i) -in all territories worldwide, (ii) for the maximum duration provided by applicable -law or treaty (including future time extensions), (iii) in any current or -future medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional purposes -(the "License"). The License shall be deemed effective as of the date CC0 -was applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder of -the License, and in such case Affirmer hereby affirms that he or she will -not (i) exercise any of his or her remaining Copyright and Related Rights -in the Work or (ii) assert any associated claims and causes of action with -respect to the Work, in either case contrary to Affirmer's express Statement -of Purpose. - -4. Limitations and Disclaimers. - -a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, -licensed or otherwise affected by this document. - -b. Affirmer offers the Work as-is and makes no representations or warranties -of any kind concerning the Work, express, implied, statutory or otherwise, -including without limitation warranties of title, merchantability, fitness -for a particular purpose, non infringement, or the absence of latent or other -defects, accuracy, or the present or absence of errors, whether or not discoverable, -all to the greatest extent permissible under applicable law. - -c. Affirmer disclaims responsibility for clearing rights of other persons -that may apply to the Work or any use thereof, including without limitation -any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims -responsibility for obtaining any necessary consents, permissions or other -rights required for any use of the Work. - -d. Affirmer understands and acknowledges that Creative Commons is not a party -to this document and has no duty or obligation with respect to this CC0 or -use of the Work. \ No newline at end of file diff --git a/backgrounds/10.gif b/backgrounds/10.gif new file mode 100644 index 0000000..2a651a8 Binary files /dev/null and b/backgrounds/10.gif differ diff --git a/backgrounds/11.gif b/backgrounds/11.gif new file mode 100644 index 0000000..34c7e05 Binary files /dev/null and b/backgrounds/11.gif differ diff --git a/backgrounds/12.gif b/backgrounds/12.gif new file mode 100644 index 0000000..338b829 Binary files /dev/null and b/backgrounds/12.gif differ diff --git a/backgrounds/13.gif b/backgrounds/13.gif new file mode 100644 index 0000000..c90aac3 Binary files /dev/null and b/backgrounds/13.gif differ diff --git a/backgrounds/14.gif b/backgrounds/14.gif new file mode 100644 index 0000000..76d6a83 Binary files /dev/null and b/backgrounds/14.gif differ diff --git a/backgrounds/15.gif b/backgrounds/15.gif new file mode 100644 index 0000000..c59bb3f Binary files /dev/null and b/backgrounds/15.gif differ diff --git a/backgrounds/16.gif b/backgrounds/16.gif new file mode 100644 index 0000000..f764c86 Binary files /dev/null and b/backgrounds/16.gif differ diff --git a/backgrounds/17.gif b/backgrounds/17.gif new file mode 100644 index 0000000..b1e486b Binary files /dev/null and b/backgrounds/17.gif differ diff --git a/backgrounds/18.gif b/backgrounds/18.gif new file mode 100644 index 0000000..8163b62 Binary files /dev/null and b/backgrounds/18.gif differ diff --git a/backgrounds/19.gif b/backgrounds/19.gif new file mode 100644 index 0000000..187bcdd Binary files /dev/null and b/backgrounds/19.gif differ diff --git a/backgrounds/20.gif b/backgrounds/20.gif new file mode 100644 index 0000000..e64a515 Binary files /dev/null and b/backgrounds/20.gif differ diff --git a/backgrounds/21.gif b/backgrounds/21.gif new file mode 100644 index 0000000..90601b2 Binary files /dev/null and b/backgrounds/21.gif differ diff --git a/backgrounds/22.gif b/backgrounds/22.gif new file mode 100644 index 0000000..14dc793 Binary files /dev/null and b/backgrounds/22.gif differ diff --git a/backgrounds/23.gif b/backgrounds/23.gif new file mode 100644 index 0000000..13a8be7 Binary files /dev/null and b/backgrounds/23.gif differ diff --git a/backgrounds/4.png b/backgrounds/4.png deleted file mode 100644 index b336f75..0000000 Binary files a/backgrounds/4.png and /dev/null differ diff --git a/index.html b/index.html index 59a3250..96017f6 100644 --- a/index.html +++ b/index.html @@ -2,10 +2,10 @@ - Comfitu.re - Sweet and Cozy + Comfitu.re :: Sweet and Cozy - - + + @@ -17,12 +17,12 @@ 
   ___            __ _ _
  / __|___ _ __  / _(_) |_ _  _   _ _ ___
-| (__/ _ \ '  \|  _| |  _| || |_| '_/ -_)   v1.2.2
- \___\___/_|_|_|_| |_|\__|\_,_(_)_| \___|   by Fristi IN A CAN.
+| (__/ _ \ '  \|  _| |  _| || |_| '_/ -_)   v1.3.0
+ \___\___/_|_|_|_| |_|\__|\_,_(_)_| \___|   by Fristi-brot.
Home | About - | Blogs + | Websites | Projects | Contact
@@ -52,15 +52,14 @@

- Hello, welcome to my cozy personal website! 0w0 + Hello, welcome to my cozy personal website! -w-

- I am a webdeveloper and general tinkerer from the Netherlands. - Most of my time is usually spent on PHP/Laravel projects. - In my free time I maintain my Linux server, running a number - of services including a Pleroma microblogging instance, a Nextcloud instance, - a Prosody XMPP instance, as well as some of my websites and some other small things. + I am a programmer and web developer from the Netherlands. + I spend most of my time programming in PHP, and I run a Linux server in my + free time as a hobby. It mainly runs the subcon.town services. I also enjoy + retro video games.

@@ -68,14 +67,14 @@

About me

Hi, my name is Fristi. - I am a webdeveloper, server admin and general tinkerer from the Netherlands. + I am a programmer, web developer and server admin from the Netherlands. I'm an easy-going guy with a love for old electronics, games and food. If you wish - to talk to me, hit me up on the fediverse! + to talk to me, hit me up on the fediverse!

Professional

- I am mainly a back-end webdeveloper, specializing in PHP and the Laravel Framework. + I am mainly a back-end web developer, specializing in PHP and the Laravel Framework. Besides that, I also do front-end work, usually focusing on creating simplistic user interfaces with pure Javascript (no frameworks or jQuery) and Sass/CSS. I believe that refraining from javascript frameworks results in cleaner, more optimized and more controllable code. @@ -92,20 +91,24 @@

-
-

Blogs

+
+

Websites & Blogs

- I'm momentarily working on two blogs: + I currently host the following websites:

+ - Comfiture: + my personal website, the one you're reading now. + Source
- Something Comfy: - a blog featuring my random thoughts on various things
+ a blog featuring my random thoughts on various things. + Source
- The Paperbin: - a blog where I rant about the things that annoy me -

-

- These blogs are currently offline pending some work that needs to be - done on them, so check back later! + a blog where I rant about the things that annoy me. + Source
+ - Subcon Town: + the main website of my personal server. + Source

@@ -118,30 +121,15 @@

Software

- - Console Writer: + - Console Writer: a small symfony/laravel package with improved console input/output handling.
- A few other things I need to make available on my git repositories, check back later!

-

Websites

-

- - Comfiture: - my personal website, the one you're reading now. Source
- - Something Comfy: - my blog where I post my random thoughts on various things. No source yet (still busy!) - - The Paperbin: - my personal blog, filled with rants. Source
- - A few others that require cleaning up, check back later! -

-

Services

- - Kartoffel Cafe: - a federated microblogging instance powered by Pleroma.
- - Subcon Cloud: - a cloud based file hosting solution powered by Nextcloud.
- - SubGit: - a git hosting solution powered by Gitea.
+ For a list of services that I currently host, + please view the Subcon Town website.

@@ -152,23 +140,25 @@

Email: fristi@subcon.town
- Fediverse: @fristi@kartoffel.cafe + Fediverse: @fristi@mk.toast.cafe

Copyright notice

- Unless otherwise specified, the Creative Commons Zero (CC0) - clause applies to this website, including its content - and source code. Please see the CC0 clause - and source code. + Unless otherwise specified below, the content and source code of this website are + licensed under the Blue Oak Model License 1.0.0. + A copy of this license may be viewed here. + Additionally, the website source code can be viewed + here.

Exceptions regarding media content

- The CC0 clause does not apply to the images, videos, audio and fonts used on - this website. The respective copyright licenses for these works apply. + The media used on this website, including images, videos, audio and fonts, fall + under their own respective copyright licenses, and are thus not subject to the + above mentioned Blue Oak Model License.

Complaints

@@ -181,6 +171,14 @@

Changelog

+

+ 1.3.0 Minor update:
+ - Updated site texts
+ - Fixed git links to now direct to vcs.subcon.town
+ - Updated personal contact info
+ - Fixed css issue causing scrollbars to appear when not needed
+ - Added more backgrounds +

1.2.2 Patch:
- Cleaned up javascript code
@@ -208,7 +206,7 @@

diff --git a/script.js b/script.js index 1c428e8..a542b70 100644 --- a/script.js +++ b/script.js @@ -5,8 +5,11 @@ var wallpapers = [ '1.gif', '2.gif', '3.gif', '4.gif', '5.gif', '6.gif', '7.gif', '8.gif', - '9.gif', - '1.png', '2.png', '3.png', '4.png', + '9.gif', '10.gif', '11.gif', '12.gif', + '13.gif', '14.gif', '15.gif', '16.gif', + '17.gif', '18.gif', '19.gif', '20.gif', + '21.gif', '22.gif', '23.gif', + '1.png', '2.png', '3.png', '5.png', '6.png', '7.png', '8.png', '9.png', ]; diff --git a/style.css b/style.css index aed009a..2c12d01 100644 --- a/style.css +++ b/style.css @@ -146,4 +146,8 @@ pre { margin:0; padding:0; font-family: IBMVGA8, monospace; +} + +.content p:last-child { + margin:0; } \ No newline at end of file