Fixes in css
This commit is contained in:
parent
d5fda2b4ff
commit
1a77445a2c
6 changed files with 26 additions and 6 deletions
|
|
@ -71,7 +71,10 @@ def start_app():
|
||||||
workdir=os.getcwd()
|
workdir=os.getcwd()
|
||||||
arr_module_path={}
|
arr_module_path={}
|
||||||
|
|
||||||
# Load blueprints
|
# Load blueprints from json file (for installed modules using paramecio2 utilities)
|
||||||
|
|
||||||
|
if os.path.isfile('config/modules.json'):
|
||||||
|
pass
|
||||||
|
|
||||||
for key_app, added_app in config.apps.items():
|
for key_app, added_app in config.apps.items():
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,27 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
from paramecio2.libraries.db import corefields
|
from paramecio2.libraries.db import corefields
|
||||||
from paramecio2.libraries.db.coreforms import PasswordForm
|
from paramecio2.libraries.db.coreforms import PasswordForm
|
||||||
from paramecio2.libraries.i18n import I18n
|
from paramecio2.libraries.i18n import I18n
|
||||||
from flask import session, request, abort
|
|
||||||
from paramecio2.libraries.keyutils import create_key_encrypt
|
from paramecio2.libraries.keyutils import create_key_encrypt
|
||||||
from paramecio2.libraries.i18n import I18n, PGetText
|
from paramecio2.libraries.i18n import I18n, PGetText
|
||||||
|
|
||||||
|
# For tests outing the web framework
|
||||||
|
|
||||||
|
try:
|
||||||
|
from settings import config
|
||||||
|
except:
|
||||||
|
class config:
|
||||||
|
pass
|
||||||
|
|
||||||
|
framework='flask'
|
||||||
|
|
||||||
|
if hasattr(config, 'framework'):
|
||||||
|
framework=config.framework
|
||||||
|
|
||||||
|
if framework=='flask':
|
||||||
|
from flask import session, request, abort
|
||||||
|
elif framework=='fastapi':
|
||||||
|
from parameciofast.libraries.sessions import get_session
|
||||||
|
pass
|
||||||
|
|
||||||
# Need unittest
|
# Need unittest
|
||||||
"""Functions and classes for process forms"""
|
"""Functions and classes for process forms"""
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ body
|
||||||
|
|
||||||
margin:0px;
|
margin:0px;
|
||||||
background-color:#f4f6f9;
|
background-color:#f4f6f9;
|
||||||
font-family: "Roboto", sans, sans-serif, serif;
|
font-family: sans, sans-serif, serif;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
/*-webkit-transition: all 0.5s ease-in-out;
|
/*-webkit-transition: all 0.5s ease-in-out;
|
||||||
transition: all 0.5s ease-in-out;
|
transition: all 0.5s ease-in-out;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ body {
|
||||||
|
|
||||||
margin:0px;
|
margin:0px;
|
||||||
background: #fbfbfb;
|
background: #fbfbfb;
|
||||||
font-family: 'Open Sans', sans-serif;
|
font-family: sans , sans-serif;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ if session.get('theme', '0')=='1':
|
||||||
<link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel="stylesheet" />
|
<link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel="stylesheet" />
|
||||||
<link href="${make_media_url('css/responsive-nav.css', 'admin')}" rel="stylesheet" />
|
<link href="${make_media_url('css/responsive-nav.css', 'admin')}" rel="stylesheet" />
|
||||||
<link href="${make_media_url('css/tooltipster.bundle.min.css', 'admin')}" rel="stylesheet" />
|
<link href="${make_media_url('css/tooltipster.bundle.min.css', 'admin')}" rel="stylesheet" />
|
||||||
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
|
<!--<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> -->
|
||||||
<%block name="extra_css">
|
<%block name="extra_css">
|
||||||
</%block>
|
</%block>
|
||||||
<script language="Javascript" src="${make_media_url('js/jquery.min.js', 'admin')}"></script>
|
<script language="Javascript" src="${make_media_url('js/jquery.min.js', 'admin')}"></script>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title><%block name="title">${_('Paramecio Login')}</%block></title>
|
<title><%block name="title">${_('Paramecio Login')}</%block></title>
|
||||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||||
<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
|
<!--<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>-->
|
||||||
<link href="${make_media_url('css/login.css', 'admin')}" rel='stylesheet' type='text/css'>
|
<link href="${make_media_url('css/login.css', 'admin')}" rel='stylesheet' type='text/css'>
|
||||||
<link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel='stylesheet' type='text/css'>
|
<link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel='stylesheet' type='text/css'>
|
||||||
<%block name="extra_css">
|
<%block name="extra_css">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue