python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

templates refont, implemented 'get_panel' method

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-11 02:08:37 +02:00
parent fa95890bee
commit 8bac5d8bd4
22 changed files with 614 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maraudes/templates/maraudes/details.html
+2 -2
View File
@@ -1,4 +1,4 @@
<div class="col-md-6">
<div class="col-md-12">
{% if maraude.est_terminee %}
{% include "compte_rendu/compterendu.html" %}
{% else %}
@@ -6,4 +6,4 @@
{% else %} <p class="alert alert-info">Le compte-rendu n'a pas encore été écrit</p>{% endif %}
{% endif %}
</div>
{% include 'maraudes/panel_dernieres_maraudes.html' %}
maraudes/templates/maraudes/index.html
+1 -19
View File
@@ -1,5 +1,4 @@
<div class="row">
<div class="col-md-6" id="prochaine-maraudes">
<div class="col-md-12">
<div class="panel panel-primary">
<div class="panel-heading">Votre prochaine maraude</div>
<div class="panel-body">
@@ -13,21 +12,4 @@
{% else %}<p>Aucune maraude prévue.</p>{% endif %}
</div>
</div>
</div>
{% include 'maraudes/panel_dernieres_maraudes.html' %}
{% include 'maraudes/panel_signalement.html' %}
{% if user.is_superuser %}<div class="col-md-6" id="administration">
<div class="panel panel-danger">
<div class="panel-heading">Administration</div>
<div class="list-group">
<a href="{% url 'maraudes:planning' %}" class="list-group-item">Planning</a>
<a href="{% url 'admin:maraudes_maraude_changelist' %}" class="list-group-item">Gérer les maraudes</a>
</div>
</div>
</div>{% endif %}
</div>
maraudes/templates/maraudes/panel_admin.html
+7
View File
@@ -0,0 +1,7 @@
{% if user.is_superuser %}<div class="panel panel-danger">
<div class="panel-heading">Administration</div>
<div class="list-group">
<a href="{% url 'maraudes:planning' %}" class="list-group-item">Planning</a>
<a href="{% url 'admin:maraudes_maraude_changelist' %}" class="list-group-item">Gérer les maraudes</a>
</div>
</div>{% endif %}
maraudes/templates/maraudes/panel_dernieres_maraudes.html
+14 -15
View File
@@ -1,16 +1,15 @@
{% if dernieres_maraudes %}
<div class="col-md-6" id="dernieres-maraudes">
<div class="panel panel-default">
<div class="panel-heading">
<p>Dernières maraudes
<span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
</div>
<div class="list-group">
{% for m in dernieres_maraudes %}
<a href="{% url 'maraudes:details' m.pk %}" class="list-group-item {% if maraude == m %} active{% endif %}">
<strong>{{ m }}</strong> <small>{{m.binome}} & {{m.referent}}</small>
</a>
{% endfor %}
</div>
</div>
</div>{% endif %}
<div class="panel panel-default" id="dernieres-maraudes">
<div class="panel-heading">
<p>Dernières maraudes
<span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
</div>
<div class="list-group">
{% for m in dernieres_maraudes %}
<a href="{% url 'maraudes:details' m.pk %}" class="list-group-item {% if maraude == m %} active{% endif %}">
<strong>{{ m }}</strong> <small>{{m.binome}} & {{m.referent}}</small>
</a>
{% endfor %}
</div>
</div>
{% endif %}
maraudes/templates/maraudes/panel_signalement.html
-2
View File
@@ -1,5 +1,4 @@
{% load bootstrap3 %}
<div class="col-md-6" id="signalement">
<form method="post" action="">
{% csrf_token %}
<div class="panel panel-warning">
@@ -23,4 +22,3 @@
</div>
</div>
</form>
</div>
maraudes/templates/planning/planning.html
+1 -1
View File
@@ -10,7 +10,7 @@
<form method="post" action="{% url 'maraudes:planning' %}?month={{month}}&year={{year}}">
{% csrf_token %}
{{ formset.management_form }}
{% for form in formset %}<div class="col-md-4">
{% for form in formset %}<div class="col-md-4 col-xs-6">
<div class="panel {% if form.instance.pk %}panel-info{%else%}panel-warning{%endif%}">
<div class="panel-heading text-center">
<div class="form-inline">{% if form.id %}{{ form.id }}{% endif %}
maraudes/views.py
+7 -3
View File
@@ -56,6 +56,9 @@ class IndexView(DerniereMaraudeMixin, generic.FormView):
template_name = "maraudes/index.html"
form_class = SignalementForm
def get_panels(self):
return ["maraudes/panel_dernieres_maraudes.html", "maraudes/panel_admin.html"]
## MARAUDES
@webpage
@@ -68,7 +71,7 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
class PageInfo:
title = "Maraude - {{maraude.date}}"
header = "{{maraude.date}}"
header_small = "détails"
header_small = "compte-rendu"
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
@@ -78,6 +81,9 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
).by_time()
return context
def get_panels(self):
return ["maraudes/panel_dernieres_maraudes.html"]
@webpage
@@ -121,8 +127,6 @@ class CompteRenduCreateView(generic.DetailView):
)
def finalize(self):
# TODO: check for errors to avoid last entry to be lost
# Save 'heure_fin' on related Maraude object
maraude = self.get_object()
maraude.heure_fin = timezone.now()
maraude.save()
suivi/templates/suivi/index.html
+2 -18
View File
@@ -1,19 +1,3 @@
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">Sujets</div>
<div class="list-group">
<a href="{% url 'sujets:liste' %}" class="list-group-item">Liste complète</a>
</div>
</div>
</div>
{% if user.is_superuser %}
<div class="col-md-4">
<div class="panel panel-danger">
<div class="panel-heading">Administration</div>
<div class="list-group">
<a href="{% url 'sujets:create' %}" class="list-group-item">Nouveau sujet</a>
</div>
</div>
</div>
{% endif %}
suivi/templates/suivi/panel_admin.html
+8
View File
@@ -0,0 +1,8 @@
{% if user.is_superuser %}
<div class="panel panel-danger">
<div class="panel-heading">Administration</div>
<div class="list-group">
<a href="{% url 'sujets:create' %}" class="list-group-item">Nouveau sujet</a>
</div>
</div>
{% endif %}
suivi/templates/suivi/panel_sujets.html
+6
View File
@@ -0,0 +1,6 @@
<div class="panel panel-default">
<div class="panel-heading">Sujets</div>
<div class="list-group">
<a href="{% url 'sujets:liste' %}" class="list-group-item">Liste complète</a>
</div>
</div>
suivi/views.py
+3
View File
@@ -20,6 +20,9 @@ class IndexView(generic.TemplateView):
header = "Suivi"
header_small = "Tableau de bord"
def get_panels(self):
return ["suivi/panel_sujets.html", "suivi/panel_admin.html"]
@webpage
class SuiviSujetView(generic.DetailView):
model = Sujet
website/static/base.css
+23 -34
View File
@@ -1,43 +1,32 @@
body {
padding: 0px;
background-color: #f1f1f1;
#menu {
border-bottom: 4px solid #f47f02;
/*;#980300*/
padding-bottom: 0px;
margin-bottom: 0px;
}
.navbar-inverse {
padding:0px;
}
/* Éléments de l'interface
- Menu des applications, id='app-menu'
- Info utilisateur, id='maraudeur'
- Contenu, id='contenu'
*/
#menu a {
border-bottom: 1px solid transparent;
font-size: 120%;
font-weight: bold;
font-variant: small-caps;
}
#app-menu {
position: fixed;
left: 10%;
top: 50px;
width: 15%;
padding: 0px;
/*border: 2px solid grey;*/
background-color: #efefef;
max-height: 40px;
margin:0px;
padding-top:0;
background: #f47f02;
}
#maraudeur {
position: fixed;
right: 20px;
bottom: 20px;
#sidebar {
padding-top:10px;
border-bottom: 4px solid #f47f02;
border-top: 4px solid #f47f02;
}
#contenu {
position:relative;
left: 25%;
width: 60%;
top: 50px;
padding: 10px;
background-color: white;
}
website/static/bootstrap/config.json
+381 -4
View File
@@ -1,8 +1,385 @@
{
"vars": {
"@panel-danger-text": "#fff",
"@panel-danger-border": "@brand-danger",
"@panel-danger-heading-bg": "darken(@brand-danger, 30%)"
"@gray-base": "#000",
"@gray-darker": "lighten(@gray-base, 13.5%)",
"@gray-dark": "lighten(@gray-base, 20%)",
"@gray": "lighten(@gray-base, 33.5%)",
"@gray-light": "lighten(@gray-base, 46.7%)",
"@gray-lighter": "lighten(@gray-base, 93.5%)",
"@brand-primary": "darken(#428bca, 6.5%)",
"@brand-success": "#5cb85c",
"@brand-info": "#5bc0de",
"@brand-warning": "#f47f02",
"@brand-danger": "#d9534f",
"@body-bg": "#fff",
"@text-color": "@gray-dark",
"@link-color": "@brand-primary",
"@link-hover-color": "lighten(@link-color, 15%)",
"@link-hover-decoration": "underline",
"@font-family-sans-serif": "\"Helvetica Neue\", Helvetica, Arial, sans-serif",
"@font-family-serif": "Georgia, \"Times New Roman\", Times, serif",
"@font-family-monospace": "Menlo, Monaco, Consolas, \"Courier New\", monospace",
"@font-family-base": "@font-family-sans-serif",
"@font-size-base": "14px",
"@font-size-large": "ceil((@font-size-base * 1.25))",
"@font-size-small": "ceil((@font-size-base * 0.85))",
"@font-size-h1": "floor((@font-size-base * 2.6))",
"@font-size-h2": "floor((@font-size-base * 2.15))",
"@font-size-h3": "ceil((@font-size-base * 1.7))",
"@font-size-h4": "ceil((@font-size-base * 1.25))",
"@font-size-h5": "@font-size-base",
"@font-size-h6": "ceil((@font-size-base * 0.85))",
"@line-height-base": "1.428571429",
"@line-height-computed": "floor((@font-size-base * @line-height-base))",
"@headings-font-family": "inherit",
"@headings-font-weight": "500",
"@headings-line-height": "1.1",
"@headings-color": "inherit",
"@icon-font-path": "\"../fonts/\"",
"@icon-font-name": "\"glyphicons-halflings-regular\"",
"@icon-font-svg-id": "\"glyphicons_halflingsregular\"",
"@padding-base-vertical": "6px",
"@padding-base-horizontal": "12px",
"@padding-large-vertical": "10px",
"@padding-large-horizontal": "16px",
"@padding-small-vertical": "5px",
"@padding-small-horizontal": "10px",
"@padding-xs-vertical": "1px",
"@padding-xs-horizontal": "5px",
"@line-height-large": "1.3333333",
"@line-height-small": "1.5",
"@border-radius-base": "4px",
"@border-radius-large": "6px",
"@border-radius-small": "3px",
"@component-active-color": "#fff",
"@component-active-bg": "@brand-warning",
"@caret-width-base": "4px",
"@caret-width-large": "5px",
"@table-cell-padding": "8px",
"@table-condensed-cell-padding": "5px",
"@table-bg": "transparent",
"@table-bg-accent": "#f9f9f9",
"@table-bg-hover": "#f5f5f5",
"@table-bg-active": "@table-bg-hover",
"@table-border-color": "#ddd",
"@btn-font-weight": "normal",
"@btn-default-color": "#333",
"@btn-default-bg": "#fff",
"@btn-default-border": "#ccc",
"@btn-primary-color": "#fff",
"@btn-primary-bg": "@brand-primary",
"@btn-primary-border": "lighten(@btn-primary-bg, 5%)",
"@btn-success-color": "#fff",
"@btn-success-bg": "@brand-success",
"@btn-success-border": "lighten(@btn-success-bg, 5%)",
"@btn-info-color": "#fff",
"@btn-info-bg": "@brand-info",
"@btn-info-border": "lighten(@btn-info-bg, 5%)",
"@btn-warning-color": "#fff",
"@btn-warning-bg": "@brand-warning",
"@btn-warning-border": "lighten(@btn-warning-bg, 5%)",
"@btn-danger-color": "#fff",
"@btn-danger-bg": "@brand-danger",
"@btn-danger-border": "lighten(@btn-danger-bg, 5%)",
"@btn-link-disabled-color": "@gray-light",
"@btn-border-radius-base": "@border-radius-base",
"@btn-border-radius-large": "@border-radius-large",
"@btn-border-radius-small": "@border-radius-small",
"@input-bg": "#fff",
"@input-bg-disabled": "@gray-lighter",
"@input-color": "@gray",
"@input-border": "#ccc",
"@input-border-radius": "@border-radius-base",
"@input-border-radius-large": "@border-radius-large",
"@input-border-radius-small": "@border-radius-small",
"@input-border-focus": "#66afe9",
"@input-color-placeholder": "#999",
"@input-height-base": "(@line-height-computed + (@padding-base-vertical * 2) + 2)",
"@input-height-large": "(ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2)",
"@input-height-small": "(floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2)",
"@form-group-margin-bottom": "15px",
"@legend-color": "@gray-dark",
"@legend-border-color": "#e5e5e5",
"@input-group-addon-bg": "@gray-lighter",
"@input-group-addon-border-color": "@input-border",
"@cursor-disabled": "not-allowed",
"@dropdown-bg": "@brand-warning",
"@dropdown-border": "rgba(0,0,0,.15)",
"@dropdown-fallback-border": "#ccc",
"@dropdown-divider-bg": "#e5e5e5",
"@dropdown-link-color": "@gray-light",
"@dropdown-link-hover-color": "#fff",
"@dropdown-link-hover-bg": "lighten(@dropdown-bg, 15%)",
"@dropdown-link-active-color": "@component-active-color",
"@dropdown-link-active-bg": "@component-active-bg",
"@dropdown-link-disabled-color": "@gray-light",
"@dropdown-header-color": "@gray-light",
"@dropdown-caret-color": "#000",
"@screen-xs": "480px",
"@screen-xs-min": "@screen-xs",
"@screen-phone": "@screen-xs-min",
"@screen-sm": "768px",
"@screen-sm-min": "@screen-sm",
"@screen-tablet": "@screen-sm-min",
"@screen-md": "992px",
"@screen-md-min": "@screen-md",
"@screen-desktop": "@screen-md-min",
"@screen-lg": "1200px",
"@screen-lg-min": "@screen-lg",
"@screen-lg-desktop": "@screen-lg-min",
"@screen-xs-max": "(@screen-sm-min - 1)",
"@screen-sm-max": "(@screen-md-min - 1)",
"@screen-md-max": "(@screen-lg-min - 1)",
"@grid-columns": "12",
"@grid-gutter-width": "30px",
"@grid-float-breakpoint": "@screen-sm-min",
"@grid-float-breakpoint-max": "(@grid-float-breakpoint - 1)",
"@container-tablet": "(720px + @grid-gutter-width)",
"@container-sm": "@container-tablet",
"@container-desktop": "(940px + @grid-gutter-width)",
"@container-md": "@container-desktop",
"@container-large-desktop": "(1140px + @grid-gutter-width)",
"@container-lg": "@container-large-desktop",
"@navbar-height": "60px",
"@navbar-margin-bottom": "@line-height-computed",
"@navbar-border-radius": "@border-radius-base",
"@navbar-padding-horizontal": "floor((@grid-gutter-width / 2))",
"@navbar-padding-vertical": "((@navbar-height - @line-height-computed) / 2)",
"@navbar-collapse-max-height": "340px",
"@navbar-default-color": "#777",
"@navbar-default-bg": "#f8f8f8",
"@navbar-default-border": "darken(@navbar-default-bg, 6.5%)",
"@navbar-default-link-color": "#777",
"@navbar-default-link-hover-color": "#333",
"@navbar-default-link-hover-bg": "transparent",
"@navbar-default-link-active-color": "#555",
"@navbar-default-link-active-bg": "darken(@navbar-default-bg, 6.5%)",
"@navbar-default-link-disabled-color": "#ccc",
"@navbar-default-link-disabled-bg": "transparent",
"@navbar-default-brand-color": "@navbar-default-link-color",
"@navbar-default-brand-hover-color": "darken(@navbar-default-brand-color, 10%)",
"@navbar-default-brand-hover-bg": "transparent",
"@navbar-default-toggle-hover-bg": "#ddd",
"@navbar-default-toggle-icon-bar-bg": "#888",
"@navbar-default-toggle-border-color": "#ddd",
"@navbar-inverse-color": "lighten(@gray-light, 15%)",
"@navbar-inverse-bg": "#222",
"@navbar-inverse-border": "#f47f02",
"@navbar-inverse-link-color": "lighten(@gray-light, 15%)",
"@navbar-inverse-link-hover-color": "#fff",
"@navbar-inverse-link-hover-bg": "transparent",
"@navbar-inverse-link-active-color": "@navbar-inverse-link-hover-color",
"@navbar-inverse-link-active-bg": "#f47f02",
"@navbar-inverse-link-disabled-color": "#444",
"@navbar-inverse-link-disabled-bg": "transparent",
"@navbar-inverse-brand-color": "@navbar-inverse-link-color",
"@navbar-inverse-brand-hover-color": "#fff",
"@navbar-inverse-brand-hover-bg": "transparent",
"@navbar-inverse-toggle-hover-bg": "#333",
"@navbar-inverse-toggle-icon-bar-bg": "#fff",
"@navbar-inverse-toggle-border-color": "#f47f02",
"@nav-link-padding": "10px 15px",
"@nav-link-hover-bg": "@gray-lighter",
"@nav-disabled-link-color": "@gray-light",
"@nav-disabled-link-hover-color": "@gray-light",
"@nav-tabs-border-color": "#ddd",
"@nav-tabs-link-hover-border-color": "@gray-lighter",
"@nav-tabs-active-link-hover-bg": "@body-bg",
"@nav-tabs-active-link-hover-color": "@gray",
"@nav-tabs-active-link-hover-border-color": "#ddd",
"@nav-tabs-justified-link-border-color": "#ddd",
"@nav-tabs-justified-active-link-border-color": "@body-bg",
"@nav-pills-border-radius": "@border-radius-base",
"@nav-pills-active-link-hover-bg": "@component-active-bg",
"@nav-pills-active-link-hover-color": "@component-active-color",
"@pagination-color": "@link-color",
"@pagination-bg": "#fff",
"@pagination-border": "#ddd",
"@pagination-hover-color": "@link-hover-color",
"@pagination-hover-bg": "@gray-lighter",
"@pagination-hover-border": "#ddd",
"@pagination-active-color": "#fff",
"@pagination-active-bg": "@brand-primary",
"@pagination-active-border": "@brand-primary",
"@pagination-disabled-color": "@gray-light",
"@pagination-disabled-bg": "#fff",
"@pagination-disabled-border": "#ddd",
"@pager-bg": "@pagination-bg",
"@pager-border": "@pagination-border",
"@pager-border-radius": "15px",
"@pager-hover-bg": "@pagination-hover-bg",
"@pager-active-bg": "@pagination-active-bg",
"@pager-active-color": "@pagination-active-color",
"@pager-disabled-color": "@pagination-disabled-color",
"@jumbotron-padding": "30px",
"@jumbotron-color": "inherit",
"@jumbotron-bg": "@gray-lighter",
"@jumbotron-heading-color": "inherit",
"@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
"@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
"@state-success-text": "#3c763d",
"@state-success-bg": "#dff0d8",
"@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
"@state-info-text": "#31708f",
"@state-info-bg": "#d9edf7",
"@state-info-border": "darken(spin(@state-info-bg, -10), 7%)",
"@state-warning-text": "#8a6d3b",
"@state-warning-bg": "#fcf8e3",
"@state-warning-border": "darken(spin(@state-warning-bg, -10), 5%)",
"@state-danger-text": "#a94442",
"@state-danger-bg": "#f2dede",
"@state-danger-border": "darken(spin(@state-danger-bg, -10), 5%)",
"@tooltip-max-width": "200px",
"@tooltip-color": "#fff",
"@tooltip-bg": "#000",
"@tooltip-opacity": ".9",
"@tooltip-arrow-width": "5px",
"@tooltip-arrow-color": "@tooltip-bg",
"@popover-bg": "#fff",
"@popover-max-width": "276px",
"@popover-border-color": "rgba(0,0,0,.2)",
"@popover-fallback-border-color": "#ccc",
"@popover-title-bg": "darken(@popover-bg, 3%)",
"@popover-arrow-width": "10px",
"@popover-arrow-color": "@popover-bg",
"@popover-arrow-outer-width": "(@popover-arrow-width + 1)",
"@popover-arrow-outer-color": "fadein(@popover-border-color, 5%)",
"@popover-arrow-outer-fallback-color": "darken(@popover-fallback-border-color, 20%)",
"@label-default-bg": "@gray-light",
"@label-primary-bg": "@brand-primary",
"@label-success-bg": "@brand-success",
"@label-info-bg": "@brand-info",
"@label-warning-bg": "@brand-warning",
"@label-danger-bg": "@brand-danger",
"@label-color": "#fff",
"@label-link-hover-color": "#fff",
"@modal-inner-padding": "15px",
"@modal-title-padding": "15px",
"@modal-title-line-height": "@line-height-base",
"@modal-content-bg": "#fff",
"@modal-content-border-color": "rgba(0,0,0,.2)",
"@modal-content-fallback-border-color": "#999",
"@modal-backdrop-bg": "#000",
"@modal-backdrop-opacity": ".5",
"@modal-header-border-color": "#e5e5e5",
"@modal-footer-border-color": "@modal-header-border-color",
"@modal-lg": "900px",
"@modal-md": "600px",
"@modal-sm": "300px",
"@alert-padding": "15px",
"@alert-border-radius": "@border-radius-base",
"@alert-link-font-weight": "bold",
"@alert-success-bg": "@state-success-bg",
"@alert-success-text": "@state-success-text",
"@alert-success-border": "@state-success-border",
"@alert-info-bg": "@state-info-bg",
"@alert-info-text": "@state-info-text",
"@alert-info-border": "@state-info-border",
"@alert-warning-bg": "@state-warning-bg",
"@alert-warning-text": "@state-warning-text",
"@alert-warning-border": "@state-warning-border",
"@alert-danger-bg": "@state-danger-bg",
"@alert-danger-text": "@state-danger-text",
"@alert-danger-border": "@state-danger-border",
"@progress-bg": "#f5f5f5",
"@progress-bar-color": "#fff",
"@progress-border-radius": "@border-radius-base",
"@progress-bar-bg": "@brand-primary",
"@progress-bar-success-bg": "@brand-success",
"@progress-bar-warning-bg": "@brand-warning",
"@progress-bar-danger-bg": "@brand-danger",
"@progress-bar-info-bg": "@brand-info",
"@list-group-bg": "#fff",
"@list-group-border": "#ddd",
"@list-group-border-radius": "@border-radius-base",
"@list-group-hover-bg": "#f5f5f5",
"@list-group-active-color": "@component-active-color",
"@list-group-active-bg": "@component-active-bg",
"@list-group-active-border": "@list-group-active-bg",
"@list-group-active-text-color": "lighten(@list-group-active-bg, 40%)",
"@list-group-disabled-color": "@gray-light",
"@list-group-disabled-bg": "@gray-lighter",
"@list-group-disabled-text-color": "@list-group-disabled-color",
"@list-group-link-color": "#555",
"@list-group-link-hover-color": "@list-group-link-color",
"@list-group-link-heading-color": "#333",
"@panel-bg": "#fff",
"@panel-body-padding": "15px",
"@panel-heading-padding": "10px 15px",
"@panel-footer-padding": "@panel-heading-padding",
"@panel-border-radius": "@border-radius-base",
"@panel-inner-border": "#ddd",
"@panel-footer-bg": "#f5f5f5",
"@panel-default-text": "@gray-dark",
"@panel-default-border": "#ddd",
"@panel-default-heading-bg": "#f5f5f5",
"@panel-primary-text": "#fff",
"@panel-primary-border": "@brand-primary",
"@panel-primary-heading-bg": "@brand-primary",
"@panel-success-text": "@state-success-text",
"@panel-success-border": "@state-success-border",
"@panel-success-heading-bg": "@state-success-bg",
"@panel-info-text": "@state-info-text",
"@panel-info-border": "@state-info-border",
"@panel-info-heading-bg": "@state-info-bg",
"@panel-warning-text": "@state-warning-text",
"@panel-warning-border": "@state-warning-border",
"@panel-warning-heading-bg": "@state-warning-bg",
"@panel-danger-text": "@state-danger-text",
"@panel-danger-border": "@state-danger-border",
"@panel-danger-heading-bg": "@state-danger-bg",
"@thumbnail-padding": "4px",
"@thumbnail-bg": "@body-bg",
"@thumbnail-border": "#ddd",
"@thumbnail-border-radius": "@border-radius-base",
"@thumbnail-caption-color": "@text-color",
"@thumbnail-caption-padding": "9px",
"@well-bg": "#f5f5f5",
"@well-border": "darken(@well-bg, 7%)",
"@badge-color": "#fff",
"@badge-link-hover-color": "#fff",
"@badge-bg": "@gray-light",
"@badge-active-color": "@link-color",
"@badge-active-bg": "#fff",
"@badge-font-weight": "bold",
"@badge-line-height": "1",
"@badge-border-radius": "10px",
"@breadcrumb-padding-vertical": "8px",
"@breadcrumb-padding-horizontal": "15px",
"@breadcrumb-bg": "#f5f5f5",
"@breadcrumb-color": "#ccc",
"@breadcrumb-active-color": "@gray-light",
"@breadcrumb-separator": "\"/\"",
"@carousel-text-shadow": "0 1px 2px rgba(0,0,0,.6)",
"@carousel-control-color": "#fff",
"@carousel-control-width": "15%",
"@carousel-control-opacity": ".5",
"@carousel-control-font-size": "20px",
"@carousel-indicator-active-bg": "#fff",
"@carousel-indicator-border-color": "#fff",
"@carousel-caption-color": "#fff",
"@close-font-weight": "bold",
"@close-color": "#000",
"@close-text-shadow": "0 1px 0 #fff",
"@code-color": "#c7254e",
"@code-bg": "#f9f2f4",
"@kbd-color": "#fff",
"@kbd-bg": "#333",
"@pre-bg": "#f5f5f5",
"@pre-color": "@gray-dark",
"@pre-border-color": "#ccc",
"@pre-scrollable-max-height": "340px",
"@component-offset-horizontal": "180px",
"@text-muted": "@gray-light",
"@abbr-border-color": "@gray-light",
"@headings-small-color": "@gray-light",
"@blockquote-small-color": "@gray-light",
"@blockquote-font-size": "(@font-size-base * 1.25)",
"@blockquote-border-color": "@gray-lighter",
"@page-header-border-color": "@gray-lighter",
"@dl-horizontal-offset": "@component-offset-horizontal",
"@dl-horizontal-breakpoint": "@grid-float-breakpoint",
"@hr-border": "@gray-lighter"
},
"css": [
"print.less",
@@ -54,5 +431,5 @@
"scrollspy.js",
"transition.js"
],
"customizerUrl": "https://getbootstrap.com/customize/?id=1c62ff219003950951c3eef49efa3f89"
"customizerUrl": "http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7"
}
website/static/bootstrap/css/bootstrap-theme.css
Vendored
+51 -51
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=1c62ff219003950951c3eef49efa3f89)
* Config saved to config.json and https://gist.github.com/1c62ff219003950951c3eef49efa3f89
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7)
* Config saved to config.json and https://gist.github.com/d99309626f40df9865729816f248efe7
*/
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
@@ -238,24 +238,24 @@ fieldset[disabled] .btn-info.active {
background-image: none;
}
.btn-warning {
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
background-image: -webkit-linear-gradient(top, #f47f02 0%, #b75f02 100%);
background-image: -o-linear-gradient(top, #f47f02 0%, #b75f02 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f47f02), to(#b75f02));
background-image: linear-gradient(to bottom, #f47f02 0%, #b75f02 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff47f02', endColorstr='#ffb75f02', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #e38d13;
border-color: #ad5a01;
}
.btn-warning:hover,
.btn-warning:focus {
background-color: #eb9316;
background-color: #b75f02;
background-position: 0 -15px;
}
.btn-warning:active,
.btn-warning.active {
background-color: #eb9316;
border-color: #e38d13;
background-color: #b75f02;
border-color: #ad5a01;
}
.btn-warning.disabled,
.btn-warning[disabled],
@@ -275,7 +275,7 @@ fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #eb9316;
background-color: #b75f02;
background-image: none;
}
.btn-danger {
@@ -326,24 +326,24 @@ fieldset[disabled] .btn-danger.active {
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
background-image: -webkit-linear-gradient(top, #fda445 0%, #fd982c 100%);
background-image: -o-linear-gradient(top, #fda445 0%, #fd982c 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#fda445), to(#fd982c));
background-image: linear-gradient(to bottom, #fda445 0%, #fd982c 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
background-color: #e8e8e8;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffda445', endColorstr='#fffd982c', GradientType=0);
background-color: #fd982c;
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-linear-gradient(top, #f47f02 0%, #db7202 100%);
background-image: -o-linear-gradient(top, #f47f02 0%, #db7202 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f47f02), to(#db7202));
background-image: linear-gradient(to bottom, #f47f02 0%, #db7202 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
background-color: #2e6da4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff47f02', endColorstr='#ffdb7202', GradientType=0);
background-color: #db7202;
}
.navbar-default {
background-image: -webkit-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
@@ -384,12 +384,12 @@ fieldset[disabled] .btn-danger.active {
}
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .active > a {
background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
background-image: -webkit-linear-gradient(top, #f47f02 0%, #fd8506 100%);
background-image: -o-linear-gradient(top, #f47f02 0%, #fd8506 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f47f02), to(#fd8506));
background-image: linear-gradient(to bottom, #f47f02 0%, #fd8506 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff47f02', endColorstr='#fffd8506', GradientType=0);
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
}
@@ -407,12 +407,12 @@ fieldset[disabled] .btn-danger.active {
.navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #fff;
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-linear-gradient(top, #f47f02 0%, #db7202 100%);
background-image: -o-linear-gradient(top, #f47f02 0%, #db7202 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f47f02), to(#db7202));
background-image: linear-gradient(to bottom, #f47f02 0%, #db7202 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff47f02', endColorstr='#ffdb7202', GradientType=0);
}
}
.alert {
@@ -489,12 +489,12 @@ fieldset[disabled] .btn-danger.active {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
}
.progress-bar-warning {
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
background-image: -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
background-image: -webkit-linear-gradient(top, #f47f02 0%, #c16502 100%);
background-image: -o-linear-gradient(top, #f47f02 0%, #c16502 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f47f02), to(#c16502));
background-image: linear-gradient(to bottom, #f47f02 0%, #c16502 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff47f02', endColorstr='#ffc16502', GradientType=0);
}
.progress-bar-danger {
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
@@ -517,14 +517,14 @@ fieldset[disabled] .btn-danger.active {
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {
text-shadow: 0 -1px 0 #286090;
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
background-image: linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
text-shadow: 0 -1px 0 #c16502;
background-image: -webkit-linear-gradient(top, #f47f02 0%, #ce6b02 100%);
background-image: -o-linear-gradient(top, #f47f02 0%, #ce6b02 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f47f02), to(#ce6b02));
background-image: linear-gradient(to bottom, #f47f02 0%, #ce6b02 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
border-color: #2b669a;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff47f02', endColorstr='#ffce6b02', GradientType=0);
border-color: #ce6b02;
}
.list-group-item.active .badge,
.list-group-item.active:hover .badge,
@@ -576,12 +576,12 @@ fieldset[disabled] .btn-danger.active {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
}
.panel-danger > .panel-heading {
background-image: -webkit-linear-gradient(top, #761c19 0%, #611715 100%);
background-image: -o-linear-gradient(top, #761c19 0%, #611715 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#761c19), to(#611715));
background-image: linear-gradient(to bottom, #761c19 0%, #611715 100%);
background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
background-image: -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff761c19', endColorstr='#ff611715', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
}
.well {
background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
website/static/bootstrap/css/bootstrap-theme.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
website/static/bootstrap/css/bootstrap.css
Vendored
+89 -89
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=1c62ff219003950951c3eef49efa3f89)
* Config saved to config.json and https://gist.github.com/1c62ff219003950951c3eef49efa3f89
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7)
* Config saved to config.json and https://gist.github.com/d99309626f40df9865729816f248efe7
*/
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
@@ -1108,7 +1108,7 @@ a {
}
a:hover,
a:focus {
color: #23527c;
color: #64a0d3;
text-decoration: underline;
}
a:focus {
@@ -3122,25 +3122,25 @@ fieldset[disabled] .btn-default.focus {
.btn-primary {
color: #ffffff;
background-color: #337ab7;
border-color: #2e6da4;
border-color: #3c87c8;
}
.btn-primary:focus,
.btn-primary.focus {
color: #ffffff;
background-color: #286090;
border-color: #122b40;
border-color: #1d4568;
}
.btn-primary:hover {
color: #ffffff;
background-color: #286090;
border-color: #204d74;
border-color: #2c689c;
}
.btn-primary:active,
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
color: #ffffff;
background-color: #286090;
border-color: #204d74;
border-color: #2c689c;
}
.btn-primary:active:hover,
.btn-primary.active:hover,
@@ -3153,7 +3153,7 @@ fieldset[disabled] .btn-default.focus {
.open > .dropdown-toggle.btn-primary.focus {
color: #ffffff;
background-color: #204d74;
border-color: #122b40;
border-color: #1d4568;
}
.btn-primary:active,
.btn-primary.active,
@@ -3170,7 +3170,7 @@ fieldset[disabled] .btn-primary:focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus {
background-color: #337ab7;
border-color: #2e6da4;
border-color: #3c87c8;
}
.btn-primary .badge {
color: #337ab7;
@@ -3179,25 +3179,25 @@ fieldset[disabled] .btn-primary.focus {
.btn-success {
color: #ffffff;
background-color: #5cb85c;
border-color: #4cae4c;
border-color: #6ec06e;
}
.btn-success:focus,
.btn-success.focus {
color: #ffffff;
background-color: #449d44;
border-color: #255625;
border-color: #357935;
}
.btn-success:hover {
color: #ffffff;
background-color: #449d44;
border-color: #398439;
border-color: #49a749;
}
.btn-success:active,
.btn-success.active,
.open > .dropdown-toggle.btn-success {
color: #ffffff;
background-color: #449d44;
border-color: #398439;
border-color: #49a749;
}
.btn-success:active:hover,
.btn-success.active:hover,
@@ -3210,7 +3210,7 @@ fieldset[disabled] .btn-primary.focus {
.open > .dropdown-toggle.btn-success.focus {
color: #ffffff;
background-color: #398439;
border-color: #255625;
border-color: #357935;
}
.btn-success:active,
.btn-success.active,
@@ -3227,7 +3227,7 @@ fieldset[disabled] .btn-success:focus,
.btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus {
background-color: #5cb85c;
border-color: #4cae4c;
border-color: #6ec06e;
}
.btn-success .badge {
color: #5cb85c;
@@ -3236,25 +3236,25 @@ fieldset[disabled] .btn-success.focus {
.btn-info {
color: #ffffff;
background-color: #5bc0de;
border-color: #46b8da;
border-color: #70c8e2;
}
.btn-info:focus,
.btn-info.focus {
color: #ffffff;
background-color: #31b0d5;
border-color: #1b6d85;
border-color: #2390b0;
}
.btn-info:hover {
color: #ffffff;
background-color: #31b0d5;
border-color: #269abc;
border-color: #3db5d8;
}
.btn-info:active,
.btn-info.active,
.open > .dropdown-toggle.btn-info {
color: #ffffff;
background-color: #31b0d5;
border-color: #269abc;
border-color: #3db5d8;
}
.btn-info:active:hover,
.btn-info.active:hover,
@@ -3267,7 +3267,7 @@ fieldset[disabled] .btn-success.focus {
.open > .dropdown-toggle.btn-info.focus {
color: #ffffff;
background-color: #269abc;
border-color: #1b6d85;
border-color: #2390b0;
}
.btn-info:active,
.btn-info.active,
@@ -3284,7 +3284,7 @@ fieldset[disabled] .btn-info:focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus {
background-color: #5bc0de;
border-color: #46b8da;
border-color: #70c8e2;
}
.btn-info .badge {
color: #5bc0de;
@@ -3292,26 +3292,26 @@ fieldset[disabled] .btn-info.focus {
}
.btn-warning {
color: #ffffff;
background-color: #f0ad4e;
border-color: #eea236;
background-color: #f47f02;
border-color: #fd8c12;
}
.btn-warning:focus,
.btn-warning.focus {
color: #ffffff;
background-color: #ec971f;
border-color: #985f0d;
background-color: #c16502;
border-color: #8f4a01;
}
.btn-warning:hover {
color: #ffffff;
background-color: #ec971f;
border-color: #d58512;
background-color: #c16502;
border-color: #d16d02;
}
.btn-warning:active,
.btn-warning.active,
.open > .dropdown-toggle.btn-warning {
color: #ffffff;
background-color: #ec971f;
border-color: #d58512;
background-color: #c16502;
border-color: #d16d02;
}
.btn-warning:active:hover,
.btn-warning.active:hover,
@@ -3323,8 +3323,8 @@ fieldset[disabled] .btn-info.focus {
.btn-warning.active.focus,
.open > .dropdown-toggle.btn-warning.focus {
color: #ffffff;
background-color: #d58512;
border-color: #985f0d;
background-color: #9e5201;
border-color: #8f4a01;
}
.btn-warning:active,
.btn-warning.active,
@@ -3340,35 +3340,35 @@ fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus {
background-color: #f0ad4e;
border-color: #eea236;
background-color: #f47f02;
border-color: #fd8c12;
}
.btn-warning .badge {
color: #f0ad4e;
color: #f47f02;
background-color: #ffffff;
}
.btn-danger {
color: #ffffff;
background-color: #d9534f;
border-color: #d43f3a;
border-color: #de6764;
}
.btn-danger:focus,
.btn-danger.focus {
color: #ffffff;
background-color: #c9302c;
border-color: #761c19;
border-color: #a02622;
}
.btn-danger:hover {
color: #ffffff;
background-color: #c9302c;
border-color: #ac2925;
border-color: #d33632;
}
.btn-danger:active,
.btn-danger.active,
.open > .dropdown-toggle.btn-danger {
color: #ffffff;
background-color: #c9302c;
border-color: #ac2925;
border-color: #d33632;
}
.btn-danger:active:hover,
.btn-danger.active:hover,
@@ -3381,7 +3381,7 @@ fieldset[disabled] .btn-warning.focus {
.open > .dropdown-toggle.btn-danger.focus {
color: #ffffff;
background-color: #ac2925;
border-color: #761c19;
border-color: #a02622;
}
.btn-danger:active,
.btn-danger.active,
@@ -3398,7 +3398,7 @@ fieldset[disabled] .btn-danger:focus,
.btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus {
background-color: #d9534f;
border-color: #d43f3a;
border-color: #de6764;
}
.btn-danger .badge {
color: #d9534f;
@@ -3426,7 +3426,7 @@ fieldset[disabled] .btn-link {
}
.btn-link:hover,
.btn-link:focus {
color: #23527c;
color: #64a0d3;
text-decoration: underline;
background-color: transparent;
}
@@ -3536,7 +3536,7 @@ tbody.collapse.in {
list-style: none;
font-size: 14px;
text-align: left;
background-color: #ffffff;
background-color: #f47f02;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
@@ -3561,14 +3561,14 @@ tbody.collapse.in {
clear: both;
font-weight: normal;
line-height: 1.42857143;
color: #333333;
color: #777777;
white-space: nowrap;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
text-decoration: none;
color: #262626;
background-color: #f5f5f5;
color: #ffffff;
background-color: #fda445;
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
@@ -3576,7 +3576,7 @@ tbody.collapse.in {
color: #ffffff;
text-decoration: none;
outline: 0;
background-color: #337ab7;
background-color: #f47f02;
}
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover,
@@ -4103,7 +4103,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
color: #ffffff;
background-color: #337ab7;
background-color: #f47f02;
}
.nav-stacked > li {
float: none;
@@ -4171,7 +4171,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar {
position: relative;
min-height: 50px;
min-height: 60px;
margin-bottom: 20px;
border: 1px solid transparent;
}
@@ -4279,10 +4279,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar-brand {
float: left;
padding: 15px 15px;
padding: 20px 15px;
font-size: 18px;
line-height: 20px;
height: 50px;
height: 60px;
}
.navbar-brand:hover,
.navbar-brand:focus {
@@ -4302,8 +4302,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: right;
margin-right: 15px;
padding: 9px 10px;
margin-top: 8px;
margin-bottom: 8px;
margin-top: 13px;
margin-bottom: 13px;
background-color: transparent;
background-image: none;
border: 1px solid transparent;
@@ -4327,7 +4327,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-nav {
margin: 7.5px -15px;
margin: 10px -15px;
}
.navbar-nav > li > a {
padding-top: 10px;
@@ -4366,8 +4366,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: left;
}
.navbar-nav > li > a {
padding-top: 15px;
padding-bottom: 15px;
padding-top: 20px;
padding-bottom: 20px;
}
}
.navbar-form {
@@ -4378,8 +4378,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-bottom: 1px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
margin-top: 8px;
margin-bottom: 8px;
margin-top: 13px;
margin-bottom: 13px;
}
@media (min-width: 768px) {
.navbar-form .form-group {
@@ -4464,21 +4464,21 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-bottom-left-radius: 0;
}
.navbar-btn {
margin-top: 8px;
margin-bottom: 8px;
margin-top: 13px;
margin-bottom: 13px;
}
.navbar-btn.btn-sm {
margin-top: 10px;
margin-bottom: 10px;
}
.navbar-btn.btn-xs {
margin-top: 14px;
margin-bottom: 14px;
}
.navbar-text {
margin-top: 15px;
margin-bottom: 15px;
}
.navbar-btn.btn-xs {
margin-top: 19px;
margin-bottom: 19px;
}
.navbar-text {
margin-top: 20px;
margin-bottom: 20px;
}
@media (min-width: 768px) {
.navbar-text {
float: left;
@@ -4596,7 +4596,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
}
.navbar-inverse {
background-color: #222222;
border-color: #080808;
border-color: #f47f02;
}
.navbar-inverse .navbar-brand {
color: #9d9d9d;
@@ -4621,7 +4621,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
.navbar-inverse .navbar-nav > .active > a:hover,
.navbar-inverse .navbar-nav > .active > a:focus {
color: #ffffff;
background-color: #080808;
background-color: #f47f02;
}
.navbar-inverse .navbar-nav > .disabled > a,
.navbar-inverse .navbar-nav > .disabled > a:hover,
@@ -4630,7 +4630,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
background-color: transparent;
}
.navbar-inverse .navbar-toggle {
border-color: #333333;
border-color: #f47f02;
}
.navbar-inverse .navbar-toggle:hover,
.navbar-inverse .navbar-toggle:focus {
@@ -4646,15 +4646,15 @@ fieldset[disabled] .navbar-default .btn-link:focus {
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus {
background-color: #080808;
background-color: #f47f02;
color: #ffffff;
}
@media (max-width: 767px) {
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
border-color: #080808;
border-color: #f47f02;
}
.navbar-inverse .navbar-nav .open .dropdown-menu .divider {
background-color: #080808;
background-color: #f47f02;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #9d9d9d;
@@ -4668,7 +4668,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #ffffff;
background-color: #080808;
background-color: #f47f02;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
@@ -4751,7 +4751,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > a:focus,
.pagination > li > span:focus {
z-index: 2;
color: #23527c;
color: #64a0d3;
background-color: #eeeeee;
border-color: #dddddd;
}
@@ -4902,11 +4902,11 @@ a.label:focus {
background-color: #31b0d5;
}
.label-warning {
background-color: #f0ad4e;
background-color: #f47f02;
}
.label-warning[href]:hover,
.label-warning[href]:focus {
background-color: #ec971f;
background-color: #c16502;
}
.label-danger {
background-color: #d9534f;
@@ -5184,7 +5184,7 @@ a.thumbnail.active {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.progress-bar-warning {
background-color: #f0ad4e;
background-color: #f47f02;
}
.progress-striped .progress-bar-warning {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -5310,8 +5310,8 @@ button.list-group-item {
.list-group-item.active:focus {
z-index: 2;
color: #ffffff;
background-color: #337ab7;
border-color: #337ab7;
background-color: #f47f02;
border-color: #f47f02;
}
.list-group-item.active .list-group-item-heading,
.list-group-item.active:hover .list-group-item-heading,
@@ -5327,7 +5327,7 @@ button.list-group-item {
.list-group-item.active .list-group-item-text,
.list-group-item.active:hover .list-group-item-text,
.list-group-item.active:focus .list-group-item-text {
color: #c7ddef;
color: #ffe2c3;
}
.list-group-item-success {
color: #3c763d;
@@ -5779,22 +5779,22 @@ button.list-group-item-danger.active:focus {
border-bottom-color: #faebcc;
}
.panel-danger {
border-color: #d9534f;
border-color: #ebccd1;
}
.panel-danger > .panel-heading {
color: #ffffff;
background-color: #761c19;
border-color: #d9534f;
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
.panel-danger > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #d9534f;
border-top-color: #ebccd1;
}
.panel-danger > .panel-heading .badge {
color: #761c19;
background-color: #ffffff;
color: #f2dede;
background-color: #a94442;
}
.panel-danger > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #d9534f;
border-bottom-color: #ebccd1;
}
.embed-responsive {
position: relative;
website/static/bootstrap/css/bootstrap.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
website/static/bootstrap/js/bootstrap.js
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=1c62ff219003950951c3eef49efa3f89)
* Config saved to config.json and https://gist.github.com/1c62ff219003950951c3eef49efa3f89
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7)
* Config saved to config.json and https://gist.github.com/d99309626f40df9865729816f248efe7
*/
if (typeof jQuery === 'undefined') {
throw new Error('Bootstrap\'s JavaScript requires jQuery')
website/static/bootstrap/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
website/templates/base.html
+4 -1
View File
@@ -10,11 +10,14 @@
{% block globalnav %}{% endblock %}
<div class="container">
<div class="row">
{% block panels %}<div class="col-md-12">{% endblock %}
{% if panels %}<div class="col-md-8">{% else %}<div class="col-md-12">{% endif %}
{% bootstrap_messages %}
<div class="page-header"><h1>{% block page_header %}Header{% endblock %}</h1></div>
{% block content %}{% endblock %}
</div>
{% if panels %}<div class="col-md-4" id="sidebar">
{% block panels %}{% endblock %}
</div>{% endif %}
</div>
</div>
</body>
website/templates/base_site.html
+4 -2
View File
@@ -11,9 +11,11 @@
</div>
{% endblock %}
{% block content %}{% include content_template %}{% endblock %}
{% block panels %}
{% if panels %}<div class="col-md-2">{{ panels }}</div><div class="col-md-10">
{% if panels %}<div class="panel-group">{% for panel in panels %}{% include panel %}{% endfor %}</div>
{% else %}{{ block.super }}{% endif %}
{% endblock %}
{% block content %}{% include content_template %}{% endblock %}
website/templates/navbar.html
+1 -17
View File
@@ -1,15 +1,6 @@
{% load bootstrap3 %}{% load staticfiles %}
<nav class="navbar navbar-default navbar-static-top">
<nav class="navbar navbar-inverse navbar-static-top" role="navigation" id="menu">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<img alt="Logo Alsa" src="{% static 'alsa_logo.png' %}" class="img-rounded">
</div>
<ul class="nav navbar-nav navbar-left">{% for app in apps %}
<li {% if app == active_app %} class="active" {%endif%}>
<a href="/{{app.label}}/">{{ app.name|title }}</a>
@@ -30,12 +21,5 @@
</ul>
</li>
</ul>
<!-- Search form -->
<form class="navbar-form navbar-right" role="search">
<div class="input-group">
<input type="text" class="form-control" placeholder="NotYetImplemented" />
<span class="input-group-btn"><button class="btn btn-default" type="button"><i class="glyphicon glyphicon-search"></i></button></span>
</div>
</form>
</div>
</nav>