Project-Pro/crmPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update layout files to change font styles and include style.css; enhance style.scss with new variables and tag styles

Browse Source
This commit is contained in:
Jacek Pyziak
2024-11-17 22:55:50 +01:00
parent d2daa98f7e
commit 22f1b84cd8
8 changed files with 141 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
.vscode/ftp-kr.sync.cache.json vendored
View File

@@ -13,7 +13,59 @@
"lmtime": 0,
"modified": false
},
"autoload": {},
"autoload": {
"class.Cache.php": {
"type": "-",
"size": 1006,
"lmtime": 0,
"modified": false
},
"class.Chunk.php": {
"type": "-",
"size": 7304,
"lmtime": 0,
"modified": false
},
"class.Cron.php": {
"type": "-",
"size": 8901,
"lmtime": 1731744712286,
"modified": false
},
"class.DbModel.php": {
"type": "-",
"size": 1392,
"lmtime": 0,
"modified": false
},
"class.Excel.php": {
"type": "-",
"size": 4319,
"lmtime": 0,
"modified": false
},
"class.Html.php": {
"type": "-",
"size": 2105,
"lmtime": 0,
"modified": false
},
"class.S.php": {
"type": "-",
"size": 7575,
"lmtime": 1731744360591,
"modified": false
},
"class.Tpl.php": {
"type": "-",
"size": 1746,
"lmtime": 0,
"modified": false
},
"controls": {},
"factory": {},
"view": {}
},
"ceidg.php": {
"type": "-",
"size": 3862,

4
autoload/factory/class.Finances.php
View File

@@ -326,13 +326,13 @@ class Finances
else
{
$results2 = $mdb -> query( 'SELECT SUM(amount) FROM finance_operations WHERE category_id = ' . $row['id'] . ' AND date >= \'' . $date_from . '\' AND date <= \'' . $date_to . '\' AND amount < 0' ) -> fetchAll();
$row['costs'] = (int)$results2[0][0];
$row['costs'] = $results2[0][0];
$results2 = $mdb -> query( 'SELECT COUNT(0) FROM finance_operations WHERE category_id = ' . $row['id'] . ' AND date >= \'' . $date_from . '\' AND date <= \'' . $date_to . '\' AND amount < 0' ) -> fetchAll();
$row['costs_count'] = (int)$results2[0][0];
$results2 = $mdb -> query( 'SELECT SUM(amount) FROM finance_operations WHERE category_id = ' . $row['id'] . ' AND date >= \'' . $date_from . '\' AND date <= \'' . $date_to . '\' AND amount > 1' ) -> fetchAll();
$row['income'] = (int)$results2[0][0];
$row['income'] = $results2[0][0];
$results2 = $mdb -> query( 'SELECT COUNT(0) FROM finance_operations WHERE category_id = ' . $row['id'] . ' AND date >= \'' . $date_from . '\' AND date <= \'' . $date_to . '\' AND amount > 1' ) -> fetchAll();
$row['income_count'] = (int)$results2[0][0];

2
layout/style.css
View File

File diff suppressed because one or more lines are too long

2
layout/style.css.map
View File

File diff suppressed because one or more lines are too long

80
layout/style.scss
View File

@@ -1,6 +1,7 @@
$cBlue: #6690F4;
$cRed: #aa0505;
$cGreen: #43833f;
$cBlack: #4e5e6a;
.animate {
animation: mymove 3s infinite;
@@ -74,7 +75,7 @@ table {
}
body {
font-family: "Open Sans", sans-serif;
font-family: "Roboto", sans-serif;
margin: 0;
padding: 0;
font-size: 15px;
@@ -587,7 +588,7 @@ input[type="checkbox"] {
margin-bottom: 10px;
display: flex;
.label {
>.label {
width: 300px;
display: inline-flex;
align-items: flex-start;
@@ -1083,4 +1084,79 @@ input[type="checkbox"] {
}
}
}
}
.bootstrap-tagsinput {
.tag {
background: $cBlue;
font-size: 13px;
padding: 5px 10px;
border-radius: 12px;
[data-role="remove"] {
color: #FFF !important;
&:hover {
box-shadow: none !important;
color: #000 !important
}
}
}
}
.finance-tags {
display: flex;
flex-wrap: wrap;
gap: 5px;
a:not(.btn) {
display: flex;
width: 100%;
text-decoration: none;
color: $cBlack;
&.zoom-100 {
font-size: 100%;
}
&.zoom-90 {
font-size: 90%;
}
&.zoom-80 {
font-size: 90%;
}
&.zoom-70 {
font-size: 85%;
}
&.zoom-60 {
font-size: 85%;
}
&.zoom-50 {
font-size: 80%;
}
&.zoom-40 {
font-size: 80%;
}
&.zoom-30 {
font-size: 75%;
}
&.zoom-20 {
font-size: 75%;
}
&.zoom-10 {
font-size: 70%;
}
&.zoom-0 {
font-size: 70%;
}
}
}

4
templates/site/layout-cron.php
View File

@@ -8,10 +8,9 @@
<meta name="keywords" content="">
<meta name="description" content="">
<meta name="robots" content="all">
<link rel="stylesheet" type="text/css" href="/layout/style.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Amatic+SC:wght@400;700&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Rowdies:wght@300;400;700&display=swap" rel="stylesheet">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script type="text/javascript" src="/libraries/framework/vendor/jquery/jquery_ui/jquery-ui.min.js"></script>
<script type="text/javascript" src="/libraries/framework/vendor/plugins/datepicker/js/bootstrap-datetimepicker.js"></script>
@@ -28,6 +27,7 @@
<link rel="stylesheet" type="text/css" href="/libraries/datepicker/css/datepicker.min.css">
<link rel="Stylesheet" type="text/css" href="/libraries/daterange/daterangepicker.css">
<link rel="stylesheet" type="text/css" href="/libraries/jquery-confirm/jquery-confirm.min.css">
<link rel="stylesheet" type="text/css" href="/layout/style.css">
</head>
<body class="logged">
<div class="top">

4
templates/site/layout-logged.php
View File

@@ -8,10 +8,9 @@
<meta name="keywords" content="">
<meta name="description" content="">
<meta name="robots" content="all">
<link rel="stylesheet" type="text/css" href="/layout/style.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Amatic+SC:wght@400;700&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Rowdies:wght@300;400;700&display=swap" rel="stylesheet">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
<script type="text/javascript" src="/libraries/framework/vendor/jquery/jquery_ui/jquery-ui.min.js"></script>
@@ -34,6 +33,7 @@
<link rel="stylesheet" type="text/css" href="/libraries/select2/css/select2.min.css">
<link rel="stylesheet" type="text/css" href="/libraries/select2/css/select2-bootstrap-5-theme.min.css">
<link rel="stylesheet" type="text/css" href="/libraries/jquery.contextMenu/context-menu.css">
<link rel="stylesheet" type="text/css" href="/layout/style.css">
</head>
<body class="logged">
<div class="top">

4
templates/site/layout-unlogged.php
View File

@@ -8,11 +8,11 @@
<meta name="keywords" content="">
<meta name="description" content="">
<meta name="robots" content="all">
<link rel="stylesheet" type="text/css" href="/layout/style.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Amatic+SC:wght@400;700&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Rowdies:wght@300;400;700&display=swap" rel="stylesheet">
<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
<link rel="stylesheet" type="text/css" href="/layout/style.css">
</head>
<body class="unlogged">
<?= $this -> content;?>