Browse Source

style: something that makes sense

master
lephe 10 months ago
parent
commit
328cf887b0
12 changed files with 95 additions and 64 deletions
  1. +2
    -3
      app/routes/admin.py
  2. +8
    -21
      app/static/css/container.css
  3. +14
    -13
      app/static/css/global.css
  4. +16
    -2
      app/static/css/header.css
  5. +2
    -2
      app/static/css/responsive.css
  6. +16
    -0
      app/static/css/table.css
  7. +20
    -14
      app/templates/admin/index.html
  8. +0
    -1
      app/templates/base/base.html
  9. +3
    -2
      app/templates/base/container.html
  10. +7
    -5
      app/templates/base/footer.html
  11. +1
    -0
      app/templates/base/head.html
  12. +6
    -1
      app/templates/base/header.html

+ 2
- 3
app/routes/admin.py View File

@@ -13,8 +13,7 @@ from app import app, db
@priv_required('panel-admin')
def admin():
class AdminForm(FlaskForm):
submit = SubmitField('Régénérer les groupes, les privilèges, et les ' +
'membres de test "PlanèteCasio" et "GLaDOS" (mdp "v5-forever")')
submit = SubmitField('Régénérer groupes, privilèges, membres de test')

form = AdminForm()
if form.validate_on_submit():
@@ -27,7 +26,7 @@ def admin():
g_admins = Group('Administrateur', 'color: red')
g_modos = Group('Modérateur', 'color: green')
g_redacs = Group('Rédacteur', 'color: blue')
g_community = Group('Compte communautaire', 'background: #c8c8c8;' +
g_community = Group('Compte communautaire', 'background: #d8d8d8;' +
'border-radius: 4px; color: #303030; padding: 1px 2px')
db.session.add(g_admins)
db.session.add(g_modos)

+ 8
- 21
app/static/css/container.css View File

@@ -1,12 +1,10 @@
#container {
.container {
margin-left: 60px;
}

section {
min-width: 350px; width: 90%;
margin: 20px auto 0; padding: 20px;
background: #ffffff;
border: 1px solid #dddddd; border-radius: 5px;
min-width: 350px; width: 80%;
margin: 20px auto 0 auto;
}

section h1 {
@@ -17,10 +15,11 @@ section h1 {
}

section h2 {
margin-top: 0;
border-bottom: 1px solid #a0a0a0;
font-family: Raleway; font-size: 26px;
font-weight: 300; color: #242424;
margin: 24px 0 16px 0;
border-bottom: 1px solid #d8d8d8;
font-family: Cantarell; font-weight: bold;
font-size: 18px; color: #101010;
padding-bottom: 2px;
}

section .avatar {
@@ -28,15 +27,3 @@ section .avatar {
border-radius: 100%;
width: 150px; height: 150px;
}

/* #container h1 {
margin-left: 5%;
font-family: Raleway; font-size: 24px;
font-weight: 200; color: #242424;
}

#container h2 {
margin-left: 5%;
font-family: Raleway; font-size: 20px;
font-weight: 200; color: #242424;
} */

+ 14
- 13
app/static/css/global.css View File

@@ -37,6 +37,7 @@ body {

a {
text-decoration: none;
color: #b41414;
}
a:focus {
outline: none;
@@ -71,7 +72,7 @@ input[type="button"],
input[type="submit"] {
padding: 6px 10px;
border: 1px solid transparent; border-radius: 3px;
font-family: 'DejaVu Sans', sans-serif; font-size: 14px; font-weight: 400;
font-family: 'DejaVu Sans', sans-serif; font-weight: 400;
}

/* Checkbox */
@@ -82,7 +83,7 @@ input[type="checkbox"] {



/*
/*
Bootstrap-style rules
*/
.flex {
@@ -91,35 +92,35 @@ input[type="checkbox"] {

.bg-green,
.bg-green {
background-color: #149641 !important;
color: #ffffff !important;
background-color: #149641;
color: #ffffff;
}
.bg-green:hover,
.bg-green:focus,
.bg-green:active {
background-color: #0f7331 !important;
background-color: #0f7331;
}

.bg-red,
.bg-red {
background-color: #c0341d !important;
color: #ffffff !important;
background-color: #c0341d;
color: #ffffff;
}
.bg-red:hover,
.bg-red:focus,
.bg-red:active {
background-color: #aa3421 !important;
background-color: #aa3421;
}

.bg-white,
.bg-white {
border: 1px solid #e5e5e5 !important;
background-color: #ffffff !important;
color: #000000 !important;
border: 1px solid #e5e5e5;
background-color: #ffffff;
color: #000000;
}
.bg-white:hover,
.bg-white:focus,
.bg-white:active {
background-color: #f0f0f0 !important;
border-color: #e3e3e3 !important;
background-color: #f0f0f0;
border-color: #e3e3e3;
}

+ 16
- 2
app/static/css/header.css View File

@@ -5,11 +5,13 @@
header {
height: 50px; margin: 0; padding: 0 30px;
display: flex; align-items: center; justify-content: space-between;
background: #f8f8fa; border-bottom: 1px solid #d0d0d0;
background: #f4f4f6; border-bottom: 1px solid #d0d0d0;
}

header h1 {
font-family: Raleway; font-weight: 200;
font-family: Cantarell; font-weight: bold; font-size: 18px;
color: #181818;
display: inline;
}

header svg {
@@ -50,3 +52,15 @@ header input[type="search"]:focus ~ a > svg > path {
border-bottom: 2px solid rgba(93, 123, 141, 1);
}


#spotlight a {
background: #d15151;
color: white; font-size: 11px;
height: 24px; line-height: 24px; padding: 6px 12px;
border-radius: 2px; border: 1px solid rgba(0, 0, 255, .05);
}
#spotlight a:hover {
background: #bd3535;
border-bottom: 1px solid rgba(128, 128, 255, .05);
border-color: rgba(128, 128, 255, .03);
}

+ 2
- 2
app/static/css/responsive.css View File

@@ -24,8 +24,8 @@


@media all and (min-width: 1400px) {
body {
font-size: 14px;
body, input {
font-size: 13px;
}

header input[type="search"] {

+ 16
- 0
app/static/css/table.css View File

@@ -0,0 +1,16 @@
table {
border-collapse: collapse;
border-color: #d8d8d8;
border-style: solid;
border-width: 0 0 1px 0;
}
table th {
background: #ecb0b0;
border-color: #dc9898;
border-style: solid;
border-width: 1px 0;
padding: 2px;
}
table td {
padding: 4px;
}

+ 20
- 14
app/templates/admin/index.html View File

@@ -1,33 +1,32 @@
{% extends "base/container.html" %}

{% block title %}
Panneau d'administration » <h1>Utilisateurs et groupes</h1>
{% endblock %}

{% block content %}
<section>
<form action='' method='POST'>
{{ form.hidden_tag() }}
{{ form.submit(class="bg-white") }}
</form>

<h2>List of members</h2>
<h2>Listes des membres utiles</h2>

<table style="width:70%; margin: auto;">
<tr><th>Name</th><th>Email</th><th>Register</th><th>XP</th><th>Inn.</th>
<th>Newsletter</th><th>Edit</th></tr>
<table style="width:90%; margin: auto;">
<tr><th>Pseudo</th><th>Email</th><th>Date d'inscription</th><th>XP</th>
<th>Innovation</th><th>Newsletter</th><th>Modifier</th></tr>

{% for user in users %}
<tr><td><a href="{{ url_for('user_by_id', user_id=user.id) }}" >{{ user.name }}</a></td>
<td>{{ user.email }}</td>
<td>{{ user.register_date }}</td><td>{{ user.xp }}</td>
<td>{{ user.innovation }}</td>
<td>{{ "Yes" if user.newsletter else "No" }}</td>
<td><a href="{{ url_for('adm_edit_account', user_id=user.id) }}" class="button">Edit</a></td>
<td>{{ "Oui" if user.newsletter else "Non" }}</td>
<td><a href="{{ url_for('adm_edit_account', user_id=user.id) }}" class="button">Modifier</a></td>
</tr>
{% endfor %}
</table>

<h2>List of groups</h2>
<h2>Groupes et privilèges</h2>

<table style="width:70%; margin: auto;">
<tr><th>Group</th><th>Members</th><th>Privileges</th></tr>
<table style="width:90%; margin: auto;">
<tr><th>Groupe</th><th>Membres</th><th>Privilèges</th></tr>

{% for group in groups %}
<tr><td><span style="{{ group.css }}">{{ group.name }}</span></td><td>
@@ -41,5 +40,12 @@
</td></tr>
{% endfor %}
</table>

<h2>Maintenance et développement</h2>

<form action='' method='POST'>
{{ form.hidden_tag() }}
{{ form.submit(style="background: #da9b1d;border: 1px solid rgba(0,0,0,.1);border-radius: 2px;color: white;") }}
</form>
</section>
{% endblock %}

+ 0
- 1
app/templates/base/base.html View File

@@ -8,7 +8,6 @@
{% endblock container %}

{% include "base/footer.html" %}

{% include "base/flash.html" %}

{% include "base/scripts.html" %}

+ 3
- 2
app/templates/base/container.html View File

@@ -1,10 +1,11 @@
{% extends "base/base.html" %}

{% block container %}
<div id="container">
<div class="container">
{% include "base/header.html" %}


{% block content %}
{% endblock content %}
{% endblock %}
</div>
{% endblock container %}

+ 7
- 5
app/templates/base/footer.html View File

@@ -1,5 +1,7 @@
<footer>
<p>Planète Casio est un site communautaire non affilié à Casio | Toute reproduction de Planète Casio, même partielle, est interdite.</p>
<p>Les programmes et autres publications présentes sur Planète Casio restent la propriété de leurs auteurs et peuvent être soumis à des licences ou des copyrights.</p>
<p>CASIO est une marque déposée par CASIO Computer Co., Ltd.</p>
</footer>
<div class="container">
<footer>
<p>Planète Casio est un site communautaire non affilié à Casio. Toute reproduction de Planète Casio, même partielle, est interdite.</p>
<p>Les programmes et autres publications présentes sur Planète Casio restent la propriété de leurs auteurs et peuvent être soumis à des licences ou des copyrights.</p>
<p>CASIO est une marque déposée par CASIO Computer Co., Ltd.</p>
</footer>
</div>

+ 1
- 0
app/templates/base/head.html View File

@@ -12,5 +12,6 @@
<link rel="stylesheet" media="all and (min-width: 700px)" type="text/css" href={{url_for('static', filename = 'css/footer.css')}}>
<link rel="stylesheet" media="all and (min-width: 700px)" type="text/css" href={{url_for('static', filename = 'css/flash.css')}}>
<link rel="stylesheet" media="all and (min-width: 700px)" type="text/css" href={{url_for('static', filename = 'css/responsive.css')}}>
<link rel="stylesheet" media="all and (min-width: 700px)" type="text/css" href={{url_for('static', filename = 'css/table.css')}}>
<link rel="stylesheet" media="all and (max-width: 699px)" type="text/css" href={{url_for('static', filename = 'css/light.css')}}>
</head>

+ 6
- 1
app/templates/base/header.html View File

@@ -1,4 +1,9 @@
<header>
<div>
{% block title %}
Test
{% endblock %}
</div>
<form action={{url_for('search')}} method="get">
<input type="search" name="q" id="q" placeholder="{{search_form.label}}" />
<a role="button" onclick="this.parentNode.submit();" href="#" class="light-hidden">
@@ -10,6 +15,6 @@

<div id="spotlight">
<a href="#">Concours</a>
<a href="#">Jeu du mois</a>
<a href="#">Jeu du mois : février 2019</a>
</div>
</header>

Loading…
Cancel
Save