initial CSS changes (WIP)

This commit is contained in:
Christine Slotty 2020-05-20 10:55:31 +02:00
parent 085d3bb72e
commit 35a5449a3a
25 changed files with 5658 additions and 431 deletions

768
composer.lock generated

File diff suppressed because it is too large Load Diff

@ -1 +1 @@
Subproject commit 21d4a0a5e9a19f251e26c0ae07ce74be2fa99bbf
Subproject commit a04d4769974b9d93ba72e490ed7dca3fbaed768c

View File

@ -1,6 +1,6 @@
<?php
use Cake\Routing\Router;
/*
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
@ -11,16 +11,11 @@ if(isset($user)) {
}
$this->assign('title', __('Willkommen') . '&nbsp;' . $user['first_name'] . '&nbsp;' . $user['last_name']);
?>
<style type="text/css">
.table-row {
display:table-row;
}
</style>
<?php if(isset($requestTime)) : ?>
<span class='grd-second-timer'><?= round($requestTime * 1000.0) ?> ms</span>
<?php endif; ?>
<div class="grd_container_small">
<fieldset>
<h3>Gradido ...</h3>
<?= $this->Html->link(
@ -29,8 +24,8 @@ $this->assign('title', __('Willkommen') . '&nbsp;' . $user['first_name'] . '&nbs
['class' => 'grd-nav-bn grd-nav-bn-large']
);?>
<?= $this->Html->link(
__('überweisen'),
['controller' => 'TransactionSendCoins', 'action' => 'create'],
__('überweisen'),
['controller' => 'TransactionSendCoins', 'action' => 'create'],
['class' => 'grd-nav-bn grd-nav-bn-large']
); ?>
</fieldset>
@ -58,7 +53,7 @@ $this->assign('title', __('Willkommen') . '&nbsp;' . $user['first_name'] . '&nbs
<fieldset class="grd-margin-top-10 admin-border">
<legend>Statistik</legend>
<?= $this->Html->link(
__('Anmeldungen'),
__('Anmeldungen'),
['controller' => 'Users', 'action' => 'statistics'],
['class' => 'grd-nav-bn grd-nav-bn-large']
);?>
@ -88,5 +83,5 @@ $this->assign('title', __('Willkommen') . '&nbsp;' . $user['first_name'] . '&nbs
</div>
</fieldset>
<?php endif; ?>
</div>

View File

@ -1,24 +1,19 @@
<?php
/*
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
//$class = 'grd-negative-currency';
$class = '';
//$title = '' . $number;
/*if($number == 0) $class = "grd-default-currency";
else if($number > 0) $class = "grd-positive-currency";*/
if($number < 0) {
$class = 'grd-negative-currency';
$class = 'grd-negative-currency';
}
?><?php if(isset($raw) && true == $raw): ?>
<?= $this->Number->format(intval($number) / 10000.0, ['precision' => 2]) . ' GDD';?>
<?= 'Kontoübersicht (' . $this->Number->format(intval($number) / 10000.0, ['precision' => 2]) . ' GDD)';?>
<?php else : ?>
<span class="<?php echo $class;?>">
<?= $this->Number->format(intval($number) / 10000.0, ['precision' => 2]) . ' GDD';?>
<?= 'Kontoübersicht (' . $this->Number->format(intval($number) / 10000.0, ['precision' => 2]) . ' GDD)';?>
</span>
<?php endif; ?>

View File

@ -1,6 +1,5 @@
<?php
use Cake\Routing\Router;
/**
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
@ -14,20 +13,14 @@ use Cake\Routing\Router;
* @since 0.10.0
* @license https://opensource.org/licenses/mit-license.php MIT License
*/
$cakeDescription = 'Gradido';
$session = $this->getRequest()->getSession();
$transactionPendings = $session->read('Transactions.pending');
$errorCount = intval($session->read('StateUser.errorCount'));
$balance = $session->read('StateUser.balance');
//echo "balance: $balance<br>";
if(!isset($balance)) {
$balance = 0;
}
//echo "balance: $balance<br>";
//echo "transactions pending: " . $transactionPendings;
?>
<!DOCTYPE html>
<html>
@ -39,36 +32,60 @@ if(!isset($balance)) {
<?= $this->fetch('title') ?>
</title>
<?= $this->Html->meta('icon') ?>
<!--<?= $this->Html->css('base.css') ?>-->
<?= $this->Html->css('styles.css') ?>
<?= $this->Html->css('main.css') ?>
<?= $this->Html->script('fa-all.min.js') ?>
<?= $this->fetch('meta') ?>
<?= $this->fetch('css') ?>
<?= $this->fetch('script') ?>
</head>
<body>
<div class="versionstring dev-info">
<p class="grd_small">Community Server in Entwicklung</p>
<p class="grd_small">Alpha 0.9.0</p>
<div class="page">
<div class="header">
<?= $this->Html->image(
'logo_schrift.png',
['alt' => 'Gradido'],
['class' => 'logo']
)
?>
<h1><?= $this->fetch('title') ?></h1>
<nav class="nav-top nav-horizontal">
<ul>
<li @click="showProfile">Mein Profil XXX</li>
</ul>
</nav>
</div>
<nav class="grd-left-bar expanded" data-topbar role="navigation">
<div class="grd-left-bar-section">
<ul class="grd-no-style">
<?php if($errorCount > 0) : ?>
<div class="sidebar1">
<div>
<div class="sidebar1-header">
Navigation
</div>
<div class="nav-vertical">
<ul>
<?php if($errorCount > 0) : ?>
<li>
<?= $this->Html->Link(__('Fehler '). "($errorCount)", ['controller' => 'StateErrors', 'action' => 'showForUser'], ['class' => 'grd-nav-bn grd-nav-bn-discard']) ?>
<?= $this->Html->Link(
__('Fehler '). "($errorCount)",
['controller' => 'StateErrors',
'action' => 'showForUser'],
['class' => 'grd-nav-bn grd-nav-bn-discard']) ?>
</li>
<?php endif; ?>
<?php if(isset($balance)) : ?>
<li><?= $this->Html->link($this->element('printGradido', ['number' => $balance]),
['controller' => 'StateBalances', 'action' => 'overview'], ['class' => 'grd-nav-bn', 'escape' => false])
<li><i class="fa fa-list nav-icon"></i>
<?= $this->Html->link(
$this->element('printGradido', ['number' => $balance]),
['controller' => 'StateBalances', 'action' => 'overview'],
['class' => 'grd-nav-bn', 'escape' => false])
?>
</li>
<?php endif; ?>
<li><?= $this->Html->link(__('Startseite'), ['controller' => 'Dashboard', 'action' => 'index'], ['class' => 'grd-nav-bn'])?></li>
<!--<li><?= $this->Html->link(__('Kontostand'), ['controller' => 'StateBalances', 'action' => 'overview'], ['class' => 'grd-nav-bn']) ?>-->
<li>
<li><i class="fa fa-home nav-icon"></i>
<?= $this->Html->link(
__('Startseite'),
['controller' => 'Dashboard', 'action' => 'index'],
['class' => 'grd-nav-bn'])?>
</li>
<li><i class="fa fa-user-friends nav-icon"></i>
<a href="https://elopage.com/s/gradido/sign_in" target="_blank" class="grd-nav-bn">
<?= __("Mitgliederbereich") ?>
</a>
@ -80,20 +97,37 @@ if(!isset($balance)) {
</a>
</li>
<?php else: ?>
<li><a href="<?= Router::url('./', true) ?>account/logout" class="grd-nav-bn"><?= __("Logout"); ?></a></li>
<li><i class="fa fa-sign-out-alt nav-icon"></i>
<a href="<?= Router::url('./', true) ?>account/logout" class="grd-nav-bn"><?= __("Logout"); ?></a>
</li>
<?php endif; ?>
</ul>
</ul>
</div>
</nav>
<div class="grd_container">
<h1><?= $this->fetch('title') ?></h1>
</div>
</div>
<div class="content">
<!-- ??? flash-messages ??? -->
<div class="flash-messages"><?= $this->Flash->render() ?></div>
<?= $this->fetch('content') ?>
</div>
<?php if(isset($timeUsed)) : ?>
<div class="grd-time-used dev-info">
<?= round($timeUsed * 1000.0, 4) ?> ms
</div>
<?php endif; ?>
<div class="sidebar2">
Rechter Navigationsbereich
</div>
<div class="nav-bottom">
<p>Community Server in Entwicklung</p>
<p>Alpha 0.9.0</p>
<?php if(isset($timeUsed)) : ?>
<p>
<?=round($timeUsed * 1000.0, 4)?> ms
</p>
<?php endif; ?>
</div>
<div class="footer nav-horizontal">
<ul>
<li><a href="https://gradido.net/de/datenschutz/" target="_blank">Datenschutzerklärung</a></li>
<li><a href="https://gradido.net/de/impressum/" target="_blank">Impressum</a></li>
</ul>
</div>
</div>
</body>
</html>

30
webroot/css/center.css Normal file
View File

@ -0,0 +1,30 @@
/* ============================================================
Screen styles for center part.
Datei : center.css
Datum : 2020-04-30
Autor : Christine Slotty
Copyright : Gradio
============================================================*/
@media screen {
.content {
display: flex;
justify-content: center;
overflow: auto;
line-height: 1.5em;
padding: 1.5em;
background-color: #f9fafb;
}
@media (max-width:619px) {
.content {
flex-direction: column;
}
}
}
/* Ende @media screen */

4463
webroot/css/fontawesome.css vendored Normal file

File diff suppressed because it is too large Load Diff

18
webroot/css/gradido.css Normal file
View File

@ -0,0 +1,18 @@
/* ============================================================
Screen styles.
Datei : gradido.css
Datum : 2020-05-20
Autor : einhornimmond / Christine Slotty
Copyright : Gradio
============================================================*/
@media screen {
.gdt-text-color {
color: #a27824;
}
}
/* Ende @media screen */

28
webroot/css/layout.css Normal file
View File

@ -0,0 +1,28 @@
/* ============================================================
Grid Layout Page
Datei : layout.css
Datum : 2020-04-30
Autor : Christine Slotty
Copyright : Gradio
============================================================*/
.page {
display: grid;
grid-template-rows: 12vh 70vh 10vh 5vh;
grid-template-columns: 1fr 5fr 1fr;
grid-gap: .25em;
margin: 0;
padding: 0;
}
.header,
.nav-bottom,
.footer {
grid-column-start: 1;
grid-column-end: 4;
}

36
webroot/css/main.css Normal file
View File

@ -0,0 +1,36 @@
@charset "UTF-8";
/* ============================================================
Common CSS file, importing other files.
Datei : main.css
Datum : 2020-04-30
Autor : Christine Slotty
Copyright : Gradio
============================================================*/
/*
Farbwirkung
grau / schwarz: seriös (aber auch dominant / durchgreifen)
blau: seriös, stark, verlässlich - indigo, heller = leichter
grün: positiv, ruhig, heilend
*/
@import url(normalize.css);
@import url(layout.css);
@import url(screen.css);
@import url(gradido.css);
@import url(center.css);
/*
@import url(print.css);
*/
/*! debug.css v0.0.3 | MIT License | https://gist.github.com/zaydek/6b2e55258734deabbd2b4a284321d6f6 */
[debug],
[debug] * {
color: hsla(210, 100%, 100%, 0.9) !important;
background: hsla(210, 100%, 50%, 0.5) !important;
outline: solid 0.25rem hsla(210, 100%, 100%, 0.5) !important;
box-shadow: none !important;
filter: none !important;
}

17
webroot/css/nav.css Normal file
View File

@ -0,0 +1,17 @@
/* ============================================================
Navigation styles.
Datei : nav.css
Datum : 2020-04-30
Autor : Christine Slotty
Copyright : Gradio
============================================================*/
@media screen {
.tablinks.active {
background-color: inherit;
}
}

349
webroot/css/normalize.css vendored Normal file
View File

@ -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;
}

48
webroot/css/print.css Normal file
View File

@ -0,0 +1,48 @@
/* ============================================================
Print styles.
Datei : print.css
Datum : 2020-04-30
Autor : Christine Slotty
Copyright : Gradio
============================================================*/
/* ---------------------------------------------------------
Print styles
---------------------------------------------------------*/
@media print {
* {
color:#000 !important;
box-shadow:none !important;
text-shadow:none !important;
background:transparent !important;
}
html { background-color:#fff; }
/* Hide navigation */
nav { display:none; }
/* Show link destinations in brackets after the link text */
a[href]:after { content: " (" attr(href) ") "; }
a[href] {
font-weight:bold;
text-decoration:underline;
color:#06c;
border:none;
}
/* Don't show link destinations for JavaScript or internal links */
a[href^="javascript:"]:after, a[href^="#"]:after { content:""; }
/* Show abbr title value in brackets after the text */
abbr[title]:after { content: " (" attr(title) ")"; }
figure {
margin-bottom:1em;
overflow:hidden;
}
figure img { border:1px solid #000; }
}

192
webroot/css/screen.css Normal file
View File

@ -0,0 +1,192 @@
/* ============================================================
Screen styles.
Datei : screen.css
Datum : 2020-04-30
Autor : Christine Slotty
Copyright : Gradio
============================================================*/
@font-face {
font-family: 'cakefont';
src: url('../font/cakedingbats-webfont.eot');
src: url('../font/cakedingbats-webfont.eot?#iefix') format('embedded-opentype'),
url('../font/cakedingbats-webfont.woff2') format('woff2'),
url('../font/cakedingbats-webfont.woff') format('woff'),
url('../font/cakedingbats-webfont.ttf') format('truetype'),
url('../font/cakedingbats-webfont.svg#cake_dingbatsregular') format('svg');
font-weight: normal;
font-style: normal;
}
@media screen {
/* =======================
Basis
=======================*/
html,
body {
font-family: 'Roboto', sans-serif;
font-size: 87.5%; /* macht aus den Standard 16px 14px */
line-height: 27px;
color: #404041;
background-color: white;
margin: 0;
overflow: hidden;
}
/* =======================
Kopfbereich
=======================*/
.header {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
padding: 1em;
-webkit-box-shadow: 0px 5px 2px 0px rgba(0, 0, 0, 0.04);
-moz-box-shadow: 0px 5px 2px 0px rgba(0, 0, 0, 0.04);
box-shadow: 0px 5px 2px 0px rgba(0, 0, 0, 0.04);
}
.header img {
vertical-align: middle;
width: 150px;
}
.nav-horizontal > ul {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: center;
align-items: baseline;
list-style-type: none;
gap: 5%;
padding: 1em;
}
.nav-horizontal li {
padding: .5em;
}
.nav-vertical > ul {
display: flex;
flex-direction: column;
list-style-type: none;
gap: 5%;
padding: 1em;
}
.nav-vertical li {
padding: .5em;
}
.nav-top > ul {
padding: 0;
padding-right: 2em;
}
.nav-bottom {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
list-style-type: none;
gap: 5%;
padding: 1em;
}
.nav-bottom p {
margin: 0;
font-size: .9em;
color: grey;
}
@media (max-width:619px) {
}
/* =======================
Hauptbereich
=======================*/
.sidebar1,
.sidebar2 {
padding: 1em;
}
.sidebar1 {
color: #4F4F4F;
font-weight: 700;
line-height: 2.5em;
}
.nav-icon {
font-size: 1.2em;
padding-right: 1em;
color: grey;
}
.sidebar1-header {
font-size: .75em;
font-style: italic;
color: grey;
}
@media (max-width:619px) {
}
/* =======================
Fußbereich
=======================*/
.footer {
display: flex;
justify-content: center;
align-items: center;
padding-top: 10px;
font-size: 70%;
font-style: italic;
}
/* =======================
Sonstige
=======================*/
/* Hyperlinks */
a {
text-decoration: none;
color: inherit;
}
main a {
text-decoration: underline;
font-style: italic;
}
a:link {
color: inherit;
/*color: #020202;*/
}
a:visited {
color: inherit;
/*color: #020202;*/
}
a:hover,
a:focus {
text-decoration: none;
}
a:active {
background-color: #fff;
color: black;
}
a:focus,
a:active {
outline: none;
}
}
/* Ende @media screen */

View File

@ -38,3 +38,4 @@ $server = new Server(new Application(dirname(__DIR__) . '/config'));
// Run the request/response through the application and emit the response.
$server->emit($server->run());

5
webroot/js/fa-all.min.js vendored Normal file

File diff suppressed because one or more lines are too long