Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Styling #4

Merged
merged 61 commits into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2f01828
added config and code to access a Database
Oct 26, 2021
660d706
added new sites and title
Oct 26, 2021
e8d28e8
fixed config link
Jan 11, 2022
baa477f
show name and img
Jan 15, 2022
9fc6240
table added
Jan 15, 2022
3cde4a3
bugfixing
Jan 16, 2022
e2113c5
Merge pull request #1 from RandomProjekts/database-access
Jan 19, 2022
9aceb05
did some css
Jan 19, 2022
8836f6b
Added style for people.php
TenkouNoKitsune Jan 22, 2022
9233ac7
Linked stylesheet to people.css
TenkouNoKitsune Jan 23, 2022
9f35e1a
moved connection for better handling
Jan 28, 2022
d9cc020
formatting
Jan 28, 2022
0090170
moved query
Jan 28, 2022
b132c63
Dynamic Title
Jan 28, 2022
f41741c
automatic themecolor determination
TenkouNoKitsune Jan 30, 2022
1804c22
fixed links
Jan 30, 2022
ca9470c
dynamic icon
Jan 30, 2022
aa73de1
fixed file extensions
Jan 31, 2022
c8548fb
removed unnecessary debug
Jan 31, 2022
287ceb1
fixed image scaling
Feb 1, 2022
aa3c134
fixed empty row
Feb 1, 2022
d9ac790
reworked people.php
Feb 28, 2022
cbc0bc9
moved connection.php
Feb 28, 2022
4923e3e
added menu.php
Feb 28, 2022
5147a78
reworked menu
Feb 28, 2022
bfbc238
added images to menu
Mar 1, 2022
18c54ae
fixed config linking
Mar 1, 2022
8303a42
added icon to people menu
Mar 1, 2022
35a55b2
added gender
Mar 1, 2022
aba92f3
added height parameter
Mar 1, 2022
4e54cce
Merge pull request #2 from RandomProjekts/People-menu
TenkouNoKitsune Mar 1, 2022
843238a
Smaller image in table and popup
TenkouNoKitsune Mar 2, 2022
80ebb00
Merge branch 'styling' of https://github.com/RandomProjekts/world-bui…
TenkouNoKitsune Mar 2, 2022
cef0336
Update .gitignore
Mar 4, 2022
89515bb
moved people styling
Mar 4, 2022
02ca9f4
Fixed some bugs
TenkouNoKitsune Mar 5, 2022
4cd8a7f
Whitespace & Font
TenkouNoKitsune Mar 6, 2022
5ac1911
Added styling for people menu
TenkouNoKitsune Mar 6, 2022
dda742b
Update .gitignore
Mar 4, 2022
7820954
moved people styling
Mar 4, 2022
9fddd16
Fixed some bugs
TenkouNoKitsune Mar 5, 2022
89c4be3
Whitespace & Font
TenkouNoKitsune Mar 6, 2022
cb5c65c
Added styling for people menu
TenkouNoKitsune Mar 6, 2022
45f4020
changed icon.jpg to icon.png
Mar 6, 2022
6a47741
Create default_icon.png
Mar 9, 2022
af53515
added navigation links
Mar 9, 2022
a354fd9
added fonts and Licenses
Mar 9, 2022
a962b11
Merge branch 'styling' of https://github.com/RandomProjekts/world-bui…
TenkouNoKitsune Mar 10, 2022
4105708
formatting
Apr 10, 2022
380e4cf
syntax fixing
Apr 10, 2022
fa61255
Merge branch 'styling' into fonts
Apr 10, 2022
03878b7
Merge pull request #3 from RandomProjekts/fonts
Apr 10, 2022
64891b4
fixed quotation marks in config.php
Apr 10, 2022
6038359
fixed require
Apr 10, 2022
067abfe
changed to switch
Apr 10, 2022
96ccb0d
added doctypes
Apr 10, 2022
e0531da
fixed closing tags
Apr 10, 2022
4ef0f97
fixed a mistake
Apr 10, 2022
3e3207c
added non-breaking spaces
Apr 10, 2022
3bc62fd
Semicolons to js
Apr 11, 2022
704e880
Update scripts/people_styling.js
TenkouNoKitsune Apr 13, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
img/*
!img/default*
10 changes: 10 additions & 0 deletions config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php
// this is an example config
// this goes one directory higher than the other files
// just change this to your own credentials
return array(
'servername' => 'localhost',
'username' => 'username',
'password' => 'password',
'DBname' => 'worldDB',
);
9 changes: 9 additions & 0 deletions css/fonts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@font-face {
font-family: Titles;
src: url(../fonts/titles.ttf);
}

@font-face {
font-family: Body;
src: url(../fonts/body.ttf);
}
40 changes: 40 additions & 0 deletions css/menu_people.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
body {
font-family: 'Libre Baskerville', serif;
NoYavy marked this conversation as resolved.
Show resolved Hide resolved
}

section {
width: 86%;
margin: 7%;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}

section a {
flex: 0 0 15%;
margin: 2vw 4%;
text-align: center;
background-color: #f5f5f5;
border: 0.4vw solid #f5f5f5;
text-decoration: none;
color: purple;
font-size: 1.5vw;
}

img {
width: 100%;
background-color: white;
}

@media all and (max-aspect-ratio: 3/5) {
section {
margin-top: 13%;
}

section a {
flex-basis: 35%;
margin-bottom: 4vw;
border-width: 1vw;
font-size: 4vw;
}
}
101 changes: 101 additions & 0 deletions css/people.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
:root {
--rowcolor: #f5f5f5;
--rowcolor-transparent: #f5f5f500;
}

body {
margin: 0;
width: 100%;
font-family: 'Body', serif;
}

h1 {
font-size: 3.5vw;
padding-top: 2vw;
margin: 1vw 0 2vw 0;
font-family: 'Titles', sans-serif;
}

table {
width: 86%;
margin-left: 7%;
}

tr {
width: 100%;
display: flex;
padding: 1% 0;
font-size: 1.3vw;
}

tr:nth-child(2n) {
background-color: #f5f5f5;
background-color: var(--rowcolor);
}

th {
flex: 0 1 15%;
text-align: left;
padding-left: 3%;
}

td {
flex: 0 1 85%;
padding-right: 3%;
width: 100%;
}

table img {
max-width: 22.33%;
position: absolute;
margin-left: 63%;
}

td.shorten {
max-height: 30vw;
overflow: hidden;
}

td.shorten::before {
content: '';
margin: 0;
position: absolute;
width: 77%;
height: calc(30vw + 1px);
background: linear-gradient(to top, #fff 0%, #ffffff00 30%);
}

tr:nth-child(2n) td.shorten::before {
background: linear-gradient(to top, #f5f5f5 0%, #f5f5f500 30%);
background: linear-gradient(to top, var(--rowcolor) 0%, var(--rowcolor-transparent) 30%);
}

tr.aside {
width: 70%;
}

tr.aside th {
flex-basis: 22%;
padding-left: 4.2%
}

tr.aside td {
flex-basis: 78%;
}

#popup {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100vh;
display: flex;
justify-content: center;
align-items: center;
background-color: #000000bb;
}

#popup img {
max-width: 90vw;
max-height: 90vh;
}
47 changes: 47 additions & 0 deletions css/peopleSmall.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
h1 {
font-size: 7vw;
margin: 6vw 0 3vw 0;
}

tr {
font-size: 2.5vw;
flex-direction: column;
}

th {
padding-right: 3%;
width: 94%;
}

td {
padding-left: 3%;
width: 94%;
}

table img {
max-width: 60%;
position: relative;
margin: 0 0 1.5vw 0;
}

td.shorten {
max-height: 50vw;
}

td.shorten::before {
width: 90%;
height: calc(50vw + 1px)
}

tr.aside {
width: 100%;
}

tr.aside th {
flex-basis: 15%;
padding-left: 3%;
}

tr.aside td {
flex-basis: 85%;
}
10 changes: 10 additions & 0 deletions css/rowFix.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
tr:first-child {padding: 0; height: 0}

@media all and (max-aspect-ratio: 3/5) {
tr:first-child {padding: 1% 0; height: auto}

tr:first-child td {
display: flex;
justify-content: center;
}
}
94 changes: 94 additions & 0 deletions fonts/Body_License.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
Copyright (c) 2012, Pablo Impallari (www.impallari.com|impallari@gmail.com),
Copyright (c) 2012, Rodrigo Fuenzalida (www.rfuenzalida.com|hello@rfuenzalida.com), with Reserved Font Name Libre Baskerville.

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

## PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

## DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

## PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1. Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2. Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3. No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5. The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

## TERMINATION
This license becomes null and void if any of the above conditions are
not met.

## DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
11 changes: 11 additions & 0 deletions fonts/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Fonts

## Default fonts
* Titles: Great Vibes
* Body: Libre Baskerville

## How to replace fonts
* delete old font
* insert new font
* rename exactly the same
* done