From 775805808ef0ee78b9356b7a252845c85ec87de0 Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 25 Feb 2020 10:03:30 -0500 Subject: [PATCH] Site layout changes and more flexbox experiements with CSS. --- about/index.php | 35 ++-- admin/auth.php | 154 ++++++++--------- admin/index.php | 82 +++++++-- admin/login.php | 49 +++--- admin/users.php | 1 - assets/css/normalize.css | 349 ++++++++++++++++++++++++++++++++++++++ assets/css/stylesheet.css | 170 ++++++++++++------- assets/css/themes.css | 138 +++++++++++++++ index.php | 85 +++++++--- policy/index.php | 62 +++---- sirius/index.php | 26 +-- 11 files changed, 894 insertions(+), 257 deletions(-) create mode 100644 assets/css/normalize.css create mode 100755 assets/css/themes.css diff --git a/about/index.php b/about/index.php index 44a7390..82246ce 100755 --- a/about/index.php +++ b/about/index.php @@ -1,26 +1,29 @@ - - -Quartznet | FAQ + + + Quartznet | About + + + -
-
-

Frequently Asked Questions

-
-

Who are we?

-

A small team that enjoys tinkering with software and making games and tools.

-
-

Contact

-

Feel free to contact us via email if you want to get in touch.

-
-

Insert content here

-
-
+
+
+

Frequently Asked Questions

+

Who are we?

+

A small team developing games and software.

+

Why the name Quartznet

+

Naming things is hard. Over time we came up with the name quartz. Then when we made a server for ourselves we named it quartznet and decided that would be a better name.

+

Not only that but it has the letter q and the letter z in it but is also simple to remember, pronounce and write. So it is clearly a great name for us! :) +

Contact

+

Feel free to contact us via email if you want to get in touch.

+
+
+ diff --git a/admin/auth.php b/admin/auth.php index 884f55f..01b05e1 100755 --- a/admin/auth.php +++ b/admin/auth.php @@ -1,91 +1,91 @@ - + diff --git a/admin/index.php b/admin/index.php index d5332d7..11fe3ef 100755 --- a/admin/index.php +++ b/admin/index.php @@ -1,24 +1,78 @@ - -Quartznet | Admin + + + Quartznet | Admin - + -
-
-

Admin area

- Logout -
- Users -
-

For admins of quartznet. Ignore the fire. Everything is fine now! :)

- cats -
-
+ +
+
+ +
+
+ +
+
+

Admin

+

Welcome to the super special admin page where you can manage the different parts of quartznet.

+

UNLIMITED POWER

+

Also cats!

+ cats +
+ +
+

Users

+ + + + + + + + + + + + + + + + + + + + +
IdNamePassword
+ + +
+
+ + +
+
+
+ +
+ diff --git a/admin/login.php b/admin/login.php index c55703d..796360e 100755 --- a/admin/login.php +++ b/admin/login.php @@ -1,6 +1,7 @@ - - - + @@ -9,35 +10,35 @@ -
-
+
+
-
Log in
- -
- - -
- - -
- +
- \ No newline at end of file + diff --git a/admin/users.php b/admin/users.php index 6299480..e7ffb2f 100644 --- a/admin/users.php +++ b/admin/users.php @@ -45,7 +45,6 @@ $rows = pg_num_rows($result); -
diff --git a/assets/css/normalize.css b/assets/css/normalize.css new file mode 100644 index 0000000..192eb9c --- /dev/null +++ b/assets/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/assets/css/stylesheet.css b/assets/css/stylesheet.css index 170201b..ce1fe91 100755 --- a/assets/css/stylesheet.css +++ b/assets/css/stylesheet.css @@ -1,93 +1,118 @@ -/* Quartznet - Main stylesheet */ -html, body { - margin: 0px; - padding: 0px; - border: 0px; - width:100%; - height:100vh; +/* Quartznet main stylesheet */ + +/* +* Base rules +*/ + +html { + box-sizing: border-box; } -h1, h2, h3 { - line-height: 1.2; +*, *:before, *:after { + box-sizing: inherit; } body { - background: url(/assets/textures/blue.jpg); font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Segoe UI Symbol", "Segoe UI Emoji", "Apple Color Emoji", Roboto, Helvetica, Arial, sans-serif; font-size: 18px; font-display: swap; line-height: 1.8; } +h1, h2, h3, h4, h5, h6 { + font-weight: bold; + line-height: 1.2; + padding: 0; +} + +p { + margin: 15px 0; +} + +/* +https://stackoverflow.com/questions/36229356/whats-the-equivalent-of-the-container-bootstrap-class-in-purecss-io +bootstrap container code +*/ +.container { + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; + /* max-width: 80%; */ +} + +img { + max-width: 100%; +} + + +/* +* Layout starts here! +*/ + header { min-height: 50px; - padding: 10px 0px; + /* text-align: center; */ + border-bottom: 5px solid gray; } .title { - font-size: 48px; - padding-left: 10px; - padding-right: 10px; + font-size: 3em; + text-decoration: none; + margin: 0; + padding: 0; + display: inline-block; + line-height: 80px; } /* flexbox navbar test*/ -.menu { - padding-left: 0; +nav ul { display: flex; - flex-flow: row wrap; + padding: 0; + margin: 0; } -.info { - flex: 1 1 100%; - font-size: 20px; - padding-left: 10px; - padding-right: 10px; +nav ul li { + font-size: 1.2em; text-align: center; } -.item { - flex: 0 1 100px; - font-size: 18px; - padding-left: 10px; - padding-right: 10px; - text-align: center; -} - -li { +nav li { list-style-type: none; } -li a:hover { +/* Change color on hover */ +nav li a { + margin-right: 50px; + text-decoration: none; +} + +nav li a:hover { text-decoration: underline; } -li a:visited { - text-decoration: underline; -} - -/* Main content box */ +/* Contains all content */ main { - margin-top: 30px; - margin-bottom: 30px; - margin-top: 30px; - min-height: 70vh; + padding-top: 20px; /*Extra space to push footer to the bottom when there is not much content*/ - min-height: calc(100vh - (60px + 215px)); + /* @TODO fix height calculation. No way to get height of window as far as I know. Only the vertical height...*/ + /* min-height: calc(100vh - 340px); */ + min-height: 710px; } -h1, h2, h3 { - line-height: 1.2; -} -/* Different content box types*/ +/* +* Content types +*/ + section { border-radius: 5px; min-height: 380px; - margin-bottom: 20px; - padding: 20px; + margin-bottom: 2em; + padding: 5px 20px; } -/* Login test */ +/* Login form styling. Work in progress. */ .login-form { margin: 0 auto; width: 50%; @@ -151,18 +176,49 @@ section { padding-top: calc(var(--input-padding-y) / 3); padding-bottom: calc(var(--input-padding-y) / 3); } -/*end login test */ -/* Footer at bottom of page */ footer { font-size: 18px; - height: 60px; - line-height: 60px; + padding: 5px; text-align: center; - vertical-align: middle; } -footer > p { - margin: 0 auto; - text-align: center; +/* +* Responsice design(tablet/mobile) +*/ + +@media (min-width: 768px) { + .container { + width: 750px; + } +} + +@media (min-width: 992px) { + .container { + width: 970px; + } +} + +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} + +/* Responsive layout - when the screen is less than 700px wide, make the two columns stack on top of each other instead of next to each other */ +@media screen and (max-width: 700px) { + .title { + display: block; + text-align: center; + } + + nav ul { + flex-direction: column; + margin: 0 auto; + } + + nav ul li a { + text-align: center; + margin: 0 auto; + } } diff --git a/assets/css/themes.css b/assets/css/themes.css new file mode 100755 index 0000000..6d98597 --- /dev/null +++ b/assets/css/themes.css @@ -0,0 +1,138 @@ + + +/* Themes(light and dark) */ + + +/* Light theme */ +html { + --background-color: #383c4a; + --section-color: #2a2e3a; + --text-color: #C8C8C8; + --headings-color: #ffffff; + --header-color: #2e323e; + --site-name-color: #ffffff;; + --site-description-color: #ffffff; + --nav-link-color: #57cc8a; + --nav-link-hover-color: #ffffff; + --link-color: #8bb8df; + --link-color-hover: 8bb8df; + --border-color: #808080; + --footer-color: #2e323e; +} + +@media (prefers-color-scheme:light) { + body { + background-color: var(--background-color); + color: var(--text-color); + } + + h1, h2, h3, h4, h5, h6 { + color: var(--headings-color); + } + + header { + background-color: var(--header-color); + } + + .menu { + color: white; + } + + a { + color: #CC99FF; + } + + a:hover { + color: white; + text-decoration: underline; + } + + .content { + background-color: #ffffff; + } + + main p { + color: black; + } + + section { + background-color: #ffffff; + } + + footer { + background-color: #182329; + color: #C8C8C8; + } +} + + +/* Dark theme */ +html[data-theme='dark'] { + --background-color: #383c4a; + --section-color: #2a2e3a; + --text-color: #C8C8C8; + --headings-color: #ffffff; + --header-color: #2e323e; + --site-name-color: #ffffff;; + --site-description-color: #ffffff; + --nav-link-color: #57cc8a; + --nav-link-hover-color: #ffffff; + --link-color: #8bb8df; + --link-color-hover: 8bb8df; + --border-color: #808080; + --footer-color: #2e323e; +} + +@media (prefers-color-scheme:dark) { + body { + background-color: #383c4a; + color: var(--text-color); + } + + h1, h2, h3 { + color: white; + } + + header { + /* background-color: #182329; */ + background-color: #2e323e; + } + + main { + color: #ffffff; + } + + .title { + color: #ffffff; + } + + .menu { + color: #ffffff; + } + + a { + color: #CC99FF; + } + + a:hover { + color: white; + } + + .content { + background-color: #182329; + } + + main p { + color: #C8C8C8; + } + + section { + background-color: #2a2e3a; + } + + footer { + background-color: #2e323e; + border-top: 1px solid var(--border-color); + color: #C8C8C8; + } +} diff --git a/index.php b/index.php index f5ad5e7..4ab082f 100755 --- a/index.php +++ b/index.php @@ -1,37 +1,68 @@ - - -Quartznet - + + + + + + + + + + + + + + + Quartznet + + + + + + + + + + + + + + + + + + + + -
-
-

Sirius

- -

A 2D sci-fi game about wannabe space captain trying to find their path.

-

Stores: Steam, Itch

-

Platforms: Windows, Mac, Linux

-
+
+
+

Sirius

+ +

A 2D sci-fi game about wannabe space captain trying to find their path.

+

Stores: Steam, Itch

+

Platforms: Windows, Mac, Linux

+
-
-

Coming soon

- - -
-
-

More text here soonTM.

-
-
-

Stores: Steam, Itch

-

Platforms: Windows, Mac, Linux

-
-
-
-
+
+

quartz wave real name TBA

+ +

More text here soonTM.

+

Stores: Steam, Itch

+

Platforms: Windows, Mac, Linux

+
+
+ diff --git a/policy/index.php b/policy/index.php index dfe2c2e..9ae40d6 100755 --- a/policy/index.php +++ b/policy/index.php @@ -1,50 +1,52 @@ - - -Quartznet | Policy + + + Quartznet | Policy + + + -
-
+
+
+

Privacy Policy

+ Last updated: 20/12/2019 -

Privacy Policy

- Last updated: 20/12/2019 +

Quartznet ("I", "My", or "Me") operates *GameCompanySite* (the "Site"). This page informs you of my policies regarding the collection, use and disclosure of Personal Information I receive from users of the Site.

-

Quartznet ("I", "My", or "Me") operates *GameCompanySite* (the "Site"). This page informs you of my policies regarding the collection, use and disclosure of Personal Information I receive from users of the Site.

+

I use your Personal Information only for providing and improving the Site. By using the Site, you agree to the collection and use of information in accordance with this policy.

-

I use your Personal Information only for providing and improving the Site. By using the Site, you agree to the collection and use of information in accordance with this policy.

+

Log Data

-

Log Data

- -

Like many site operators, I collect information that your browser sends whenever you visit my Site ("Log Data"). - This Log Data may include information such as your computer's Internet Protocol ("IP") address, browser type, browser version, the pages of my Site that you visit, the time and date of your visit, the time spent on those pages and other statistics.

+

Like many site operators, I collect information that your browser sends whenever you visit my Site ("Log Data"). + This Log Data may include information such as your computer's Internet Protocol ("IP") address, browser type, browser version, the pages of my Site that you visit, the time and date of your visit, the time spent on those pages and other statistics.

+ +

In addition, I may use third party services such as Google Analytics that collect, monitor and analyze this.

+
-

In addition, I may use third party services such as Google Analytics that collect, monitor and analyze this.

+
+

Cookies Policy

+ Last updated: 20/12/2019 -
- -

Cookies Policy

-
Last updated: 20/12/2019
+

Quartznet ("I", "My") uses cookies on Quartznet (the "Service"). By using the Service, you consent to the use of cookies.

-

Quartznet ("I", "My") uses cookies on Quartznet (the "Service"). By using the Service, you consent to the use of cookies. -

+

What are cookies

+

Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows the Service or a third-party to recognize you and make your next visit easier and the Service more useful to you.

-

What are cookies

-

Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows the Service or a third-party to recognize you and make your next visit easier and the Service more useful to you.

+

How Quartznet uses cookies

+

When you use and access the Service, I may place a number of cookies files in your web browser.

-

How Quartznet uses cookies

-

When you use and access the Service, I may place a number of cookies files in your web browser.

+

I use cookies for the following purposes: to enable certain functions of the Service, to provide analytics, and to store your preferences.

-

I use cookies for the following purposes: to enable certain functions of the Service, to provide analytics, and to store your preferences.

- -

What are your choices regarding cookies

-

If you'd like to delete cookies or instruct your web browser to delete or refuse cookies, please visit the help pages of your web browser.

-
-
+

What are your choices regarding cookies

+

If you'd like to delete cookies or instruct your web browser to delete or refuse cookies, please visit the help pages of your web browser.

+
+
+ diff --git a/sirius/index.php b/sirius/index.php index d90f66d..cb24291 100755 --- a/sirius/index.php +++ b/sirius/index.php @@ -1,20 +1,24 @@ - - -Quartznet - + + Quartznet | Sirius + + + + + -
-
-

Sirius game

-

Sirius game. Work in progress

-

Presskit

-
-
+
+
+

Sirius game

+

Sirius game. Work in progress

+ Presskit +
+
+