theluyuan/shynet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

General style improvements

Browse Source
This commit is contained in:
R. Miles McCain 2020-04-13 00:12:08 -04:00
parent ae1bb6fec9
commit 568e08c0ec
No known key found for this signature in database
GPG Key ID: 91CB47BDDF2671A5
5 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shynet/core/static/core/css/global.css
View File

@ -2,8 +2,12 @@
background-color: transparent; background-color: transparent;
} }
.table {
overflow-x: scroll;
}
.limited-height { .limited-height {
overflow-y: scroll; overflow: scroll;
max-height: 400px; max-height: 400px;
} }

83
shynet/core/templates/base.html
View File

@ -19,57 +19,70 @@
<body class="bg-gray-200 min-h-full"> <body class="bg-gray-200 min-h-full">
{% block body %} {% block body %}
<section class="max-w-screen-xl mx-auto px-6 md:px-0 md:py-12 md:flex"> <section class="max-w-screen-xl mx-auto px-4 md:px-0 py-4 md:py-12 md:flex">
<aside class="md:w-2/12 md:pr-6"> <aside class="mb-8 md:w-2/12 md:pr-6 relative flex flex-wrap md:block justify-between items-center">
<a class="icon ~urge ml-6 mb-8 mt-3" href="{% url 'core:dashboard' %}"> <a class="icon ~urge ml-2 md:ml-6 md:mb-8 md:mt-3" href="{% url 'core:dashboard' %}">
<i class="fas fa-book-reader fa-3x text-purple-600"></i> <i class="fas fa-binoculars fa-3x text-purple-600 hidden md:block"></i>
<i class="fas fa-binoculars fa-2x text-purple-600 md:hidden"></i>
</a> </a>
{% if user.owning_services.all %} <button class="button ~neutral !low md:hidden"
<p class="ml-2 mt-8 mb-1 supra font-medium text-gray-500 pointer-events-none">Services</p> onclick="document.getElementById('navMenuExpanded').classList.toggle('hidden')">
<span class="icon">
<i class="fas fa-bars"></i>
</span>
</button>
<hr class="sep h-4 md:h-8 w-full">
<div id="navMenuExpanded" class="bg-white shadow-lg md:shadow-none p-4 hidden rounded-lg md:block md:bg-transparent md:border-none md:p-0 w-full">
{% if user.owning_services.all %}
<p class="ml-2 mb-1 supra font-medium text-gray-500 pointer-events-none">Services</p>
{% for service in user.owning_services.all %} {% for service in user.owning_services.all %}
{% url 'core:service' service.uuid as url %} {% url 'core:service' service.uuid as url %}
{% include 'core/includes/sidebar_portal.html' with label=service.name url=url %} {% include 'core/includes/sidebar_portal.html' with label=service.name url=url %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% has_perm 'core.create_service' user as can_create %} {% has_perm 'core.create_service' user as can_create %}
{% if can_create %} {% if can_create %}
{% url 'core:service_create' as url %} {% url 'core:service_create' as url %}
{% include 'core/includes/sidebar_portal.html' with label="+ Create" url=url %} {% include 'core/includes/sidebar_portal.html' with label="+ Create" url=url %}
{% endif %} {% endif %}
{% if user.collaborating_services.all %} {% if user.collaborating_services.all %}
<p class="ml-2 mt-8 mb-1 supra font-medium text-gray-500 pointer-events-none">Collaborations</p> <p class="ml-2 mt-8 mb-1 supra font-medium text-gray-500 pointer-events-none">Collaborations</p>
{% for service in user.collaborating_services.all %} {% for service in user.collaborating_services.all %}
{% url 'core:service' service.uuid as url %} {% url 'core:service' service.uuid as url %}
{% include 'core/includes/sidebar_portal.html' with label=service.name url=url %} {% include 'core/includes/sidebar_portal.html' with label=service.name url=url %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<p class="ml-2 mt-8 mb-1 supra font-medium text-gray-500 pointer-events-none">Account</p> <p class="ml-2 mt-8 mb-1 supra font-medium text-gray-500 pointer-events-none">Account</p>
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% url 'account_email' as url %} {% url 'account_email' as url %}
{% include 'core/includes/sidebar_portal.html' with label="Emails" url=url %} {% include 'core/includes/sidebar_portal.html' with label="Emails" url=url %}
{% url 'account_logout' as url %} {% url 'account_set_password' as url %}
{% include 'core/includes/sidebar_portal.html' with label="Log Out" url=url %} {% include 'core/includes/sidebar_portal.html' with label="Security" url=url %}
{% else %} {% url 'account_logout' as url %}
{% include 'core/includes/sidebar_portal.html' with label="Log Out" url=url %}
{% url 'account_login' as url %} {% else %}
{% include 'core/includes/sidebar_portal.html' with label="Log In" url=url %}
{% url 'account_signup' as url %} {% url 'account_login' as url %}
{% include 'core/includes/sidebar_portal.html' with label="Sign Up" url=url %} {% include 'core/includes/sidebar_portal.html' with label="Log In" url=url %}
{% endif %} {% url 'account_signup' as url %}
{% include 'core/includes/sidebar_portal.html' with label="Sign Up" url=url %}
{% endif %}
</div>
</aside> </aside>
<div class="md:w-10/12"> <div class="md:w-10/12">
{% if messages %} {% if messages %}

4
shynet/core/templates/core/includes/service_overview.html
View File

@ -3,8 +3,8 @@
<a class="card ~neutral !low service mb-6 p-0" href="{% url 'core:service' object.uuid %}"> <a class="card ~neutral !low service mb-6 p-0" href="{% url 'core:service' object.uuid %}">
{% with stats=object.stats %} {% with stats=object.stats %}
<div class="p-4 md:flex justify-between"> <div class="p-4 md:flex justify-between">
<div class="md:w-4/12 flex items-center"> <div class="md:w-4/12 flex items-center mb-4 md:mb-0">
<h3 class="heading mr-2 mb-1 text-purple-600"> <h3 class="heading text-xl md:text-2xl mr-2 mb-1 text-purple-600">
{{object.name}} {{object.name}}
</h3> </h3>
{% include 'core/includes/stats_status_chip.html' %} {% include 'core/includes/stats_status_chip.html' %}

9
shynet/core/templates/core/pages/service_update.html
View File

@ -10,11 +10,10 @@
{% block service_content %} {% block service_content %}
<div class="max-w-xl content"> <div class="max-w-xl content">
<h5>Analytics Installation</h5> <h5>Installation</h5>
<p>(At the end of <code>&lt;body&gt;</code>) <div class="card ~neutral !high font-mono text-sm">
<pre {% filter force_escape %}<noscript><img src="{{base_url}}/ingress/fc4008d3-f2fa-4500-9968-d96719e3819c/pixel.gif"></noscript><script src="{{base_url}}/ingress/fc4008d3-f2fa-4500-9968-d96719e3819c/identifier/script.js"></script>{% endfilter %}
class="text-sm"><code>{% filter force_escape %}<noscript><img src="{{base_url}}/ingress/fc4008d3-f2fa-4500-9968-d96719e3819c/pixel.gif"></noscript> </div>
<script src="{{base_url}}/ingress/fc4008d3-f2fa-4500-9968-d96719e3819c/identifier/script.js"></script>{% endfilter %}</pre></code>
</div> </div>
<hr class="sep"> <hr class="sep">
<form class="card ~neutral !low p-0 max-w-xl" method="POST"> <form class="card ~neutral !low p-0 max-w-xl" method="POST">

2
shynet/core/templates/core/service_base.html
View File

@ -6,7 +6,7 @@
{% block content %} {% block content %}
<div class="md:flex justify-between items-center" id="heading"> <div class="md:flex justify-between items-center" id="heading">
<a class="flex items-center" href="{% url 'core:service' object.uuid %}"> <a class="flex items-center mb-4 md:mb-0" href="{% url 'core:service' object.uuid %}">
<h3 class="heading leading-none mr-4"> <h3 class="heading leading-none mr-4">
{{object.name}} {{object.name}}
</h3> </h3>