Skip to content
Snippets Groups Projects
Commit 54de69e0 authored by Olimpia Magliulo's avatar Olimpia Magliulo
Browse files

Css optimisation

- Change metadatabox to a general code-box, code-box-content and code-box-title
- Change xmlarea to text-area
- Update templates that where using old classes
parent 33194464
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{{ 'Here are the result for the cron job execution:'|trans }} {{ 'Here are the result for the cron job execution:'|trans }}
</p> </p>
<div class="metadatabox metadata-code"> <div class="code-box code-box-content">
<h2>{{ 'Cron report'|trans }}</h2> <h2>{{ 'Cron report'|trans }}</h2>
<code> <code>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<p>{{ 'Cron is a way to run things regularly on unix systems.'|trans }}<br /><br /></p> <p>{{ 'Cron is a way to run things regularly on unix systems.'|trans }}<br /><br /></p>
<p>{{ 'Here is a suggestion for a crontab file:'|trans }}<br /><br /></p> <p>{{ 'Here is a suggestion for a crontab file:'|trans }}<br /><br /></p>
<div class="metadatabox metadata-code"> <div class="code-box code-box-content">
<code> <code>
{% for url in urls %} {% for url in urls %}
# {{ 'Run cron:'|trans }} [{{ url.tag }}]<br /> # {{ 'Run cron:'|trans }} [{{ url.tag }}]<br />
......
...@@ -33,16 +33,15 @@ ...@@ -33,16 +33,15 @@
</div> </div>
{# print out exception only if the exception is available #} {# print out exception only if the exception is available #}
{% if showerrors %} {% if showerrors -%}
<h2>{{'{errors:debuginfo_header}' | trans}}</h2> <h2>{{'{errors:debuginfo_header}' | trans}}</h2>
<p>{{'{errors:debuginfo_text}' | trans}}</p> <p>{{'{errors:debuginfo_text}' | trans}}</p>
<div class="code-box code-box-content">
{# TODO: Update class #} <pre>{{ error.exceptionMsg }}<br>
<div class="metadatabox"> {{ error.exceptionTrace }}
<pre>{{ error.exceptionMsg }}</pre> </pre>
<pre>{{ error.exceptionTrace }}</pre>
</div> </div>
{% endif %} {%- endif %}
{# Add error report submit section if we have a valid technical contact. 'errorreportaddress' will only be set if {# Add error report submit section if we have a valid technical contact. 'errorreportaddress' will only be set if
the technical contact email address has been set. #} the technical contact email address has been set. #}
...@@ -56,8 +55,9 @@ ...@@ -56,8 +55,9 @@
<p> <p>
<textarea class="metadatabox" name="text" rows="6" cols="50">{{ '{errors:report_explain}' | trans }}</textarea> <textarea class="metadatabox" name="text" rows="6" cols="50">{{ '{errors:report_explain}' | trans }}</textarea>
</p> </p>
<textarea class="text-area edge" name="text" rows="6" cols="50">{{ '{errors:report_explain}' | trans }}</textarea>
</form> </form>
<p>
<input type="hidden" name="reportId" value="{{ error.reportId }}" /> <input type="hidden" name="reportId" value="{{ error.reportId }}" />
<button type="submit" name="send" class="btn">{{ '{errors:report_submit}' | trans }}</button> <button type="submit" name="send" class="btn">{{ '{errors:report_submit}' | trans }}</button>
</p> </p>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<form method="post" class="pure-form" enctype="multipart/form-data"> <form method="post" class="pure-form" enctype="multipart/form-data">
<h3> {% trans 'XML metadata' %}</h3> <h3> {% trans 'XML metadata' %}</h3>
<div class="pure-control-group"> <div class="pure-control-group">
<textarea name="xmldata" rows="20" class="xmlarea edge">{{ xmldata }}</textarea> <textarea name="xmldata" rows="20" class="text-area edge">{{ xmldata }}</textarea>
</div> </div>
<br> <br>
<div class="center"> <div class="center">
...@@ -26,16 +26,16 @@ ...@@ -26,16 +26,16 @@
<br> <br>
<h2>{{ 'Converted metadata'|trans }}</h2> <h2>{{ 'Converted metadata'|trans }}</h2>
{% for type, text in output if text -%} {% for type, text in output if text -%}
<div class="metadatabox"> <div class="code-box">
<div class="metadata-type"> <div class="code-box-title">
<h3> {{ type }}</h3> <h3> {{ type }}</h3>
<button data-clipboard-target="#metadata{{ loop.index }}" id="btn{{loop.index }}" class="pure-button right clipboard-btn" onclick="metadata({{ loop.index }})" > <button data-clipboard-target="#metadata{{ loop.index }}" id="btn{{ loop.index }}" class="pure-button right clipboard-btn">
<i class="fa fa-copy"></i> <i class="fa fa-copy"></i>
</button> </button>
</div> </div>
<div class="metadata-code"> <div class="code-box-content">
<pre id="metadata{{ loop.index }}"> <pre id="metadata{{ loop.index }}">
{%- spaceless %}{{ text }}{% endspaceless %} {%- spaceless %}{{ text }}{% endspaceless -%}
</pre> </pre>
</div> </div>
</div> </div>
......
...@@ -123,10 +123,12 @@ CONTENT ...@@ -123,10 +123,12 @@ CONTENT
} }
.message-box { .message-box {
background-color: #f4f4f4;
border-left-color: #444444;
border-left-style: solid; border-left-style: solid;
border-left-width: 0.3125rem; border-left-width: 0.3125rem;
box-shadow: 0 5px 8px -6px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 8px -6px rgba(0, 0, 0, 0.2);
margin: 0 0 1rem 0; margin: 1rem 0;
padding: 1.3rem; padding: 1.3rem;
position: relative; position: relative;
} }
...@@ -149,28 +151,19 @@ CONTENT ...@@ -149,28 +151,19 @@ CONTENT
.pure-menu-item:last-child { .pure-menu-item:last-child {
border-bottom: none; border-bottom: none;
} }
.metadatabox{ .code-box{
border:1px solid #ccc; border:1px solid #ccc;
} }
.code-box-content{
font-size: 1em;
line-height: 1.15;
padding: 0.5em 1em;
}
.metadata-type{ .metadata-type{
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
background-color: #e0e0e0; background-color: #e0e0e0;
padding: 0.5em 0 0.5em 0.5em; padding: 0.5em 0 0.5em 0.5em;
} }
.metadata-code{
font-size: 1em;
line-height: 1.15;
padding-top: 0.5em;
}
.clipboard-btn{
position: absolute;
right:0;
height: inherit;
margin-top: -2em;
margin-right: 4px;
background-color: #f0f0f0;
border: 1px solid #ccc;
}
/* *********************************************************** /* ***********************************************************
FOOTER FOOTER
...@@ -208,7 +201,7 @@ FOOTER ...@@ -208,7 +201,7 @@ FOOTER
/* *********************************************************** /* ***********************************************************
FORMS FORMS
************************************************************ */ ************************************************************ */
.xmlarea{ .text-area{
margin-top: .5em; margin-top: .5em;
width:100%; width:100%;
font-size: 0.9em; font-size: 0.9em;
...@@ -237,38 +230,19 @@ input[type="file"]{ ...@@ -237,38 +230,19 @@ input[type="file"]{
} }
/* PURE */ /* PURE */
.pure-button { .pure-button,
border-radius: 0;
}
.pure-form input.edge, .pure-form input.edge,
.pure-form textarea.edge{ .pure-form textarea.edge {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.pure-form-aligned .pure-controls{ .pure-form-aligned .pure-controls{
margin: 0 0 0 11em; margin: 0 0 0 11em;
} }
.pure-select{ .pure-select{
float: right; float: right;
} }
.pure-button-group .pure-button:first-child {
border: solid 1px #E6E6E6;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.pure-button-group .pure-button:last-child {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.pure-button-group .pure-button.show-files{
background-color: transparent;
border: solid 1px #ADADAD;
border-right: solid 1px #ADADAD;
overflow: hidden;
}
/* SELECTIZE */ /* SELECTIZE */
.selectize-input, .selectize-input,
...@@ -300,19 +274,16 @@ div .item{ ...@@ -300,19 +274,16 @@ div .item{
vertical-align: middle; vertical-align: middle;
} }
/* *********************************************************** /* ***********************************************************
IMAGES IMAGES
************************************************************ */ ************************************************************ */
.fa { .fa {
font-family: FontAwesome !important; font-family: FontAwesome !important;
} }
.fa-folder-open{ span.fa, i.fa {
padding: 0 0.5em; padding: 0 0.5em;
} }
#clipboard-btn{
margin-right: 0.5em;
}
/* *********************************************************** /* ***********************************************************
TABLES TABLES
************************************************************ */ ************************************************************ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment