Commit ede69396 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch '60-rename-theme' into 'master'

Renaming theme, folder name and templates

Closes #60

See merge request e/cloud/my-spot!64
parents dfc5b6c3 b4f58da3
......@@ -16,7 +16,7 @@ nav {
color: @color_accent;
}
}
#eelo_links > * { margin-right: 32px; }
#etheme_links > * { margin-right: 32px; }
}
#nav_toggle_btn {
display: none;
......
{% from 'eelo/macros.html' import search_bar %}
{% call search_bar(q, rtl=rtl, autofocus=True) %}{% endcall %}
\ No newline at end of file
{% extends "eelo/base.html" %}
{% extends "etheme/base.html" %}
{% block content %}
<div class="container contents full">
<div>
......
{% extends "eelo/base.html" %}
{% extends "etheme/base.html" %}
{% block title %}{{ _('about') }} - {% endblock %}
{% block content %}
<div class="container">
......
{% from 'eelo/macros.html' import icon %}
{% from 'etheme/macros.html' import icon %}
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
<head>
......@@ -13,7 +13,7 @@
{% block meta %}{% endblock %}
<title>{% block title %}{% endblock %}{{ instance_name }}</title>
<link rel="stylesheet" href="{{ url_for('static', filename='css/eelo.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url_for('static', filename='css/etheme.min.css') }}" type="text/css" />
{% for css in styles %}
<link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" />
......@@ -46,8 +46,8 @@
<body>
{% include 'eelo/components/icons.html' %}
{% include 'eelo/components/navbar.html' %}
{% include 'etheme/components/icons.html' %}
{% include 'etheme/components/navbar.html' %}
{% set inline_search_form = true %}
<main>
......@@ -96,7 +96,7 @@
<script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/eelo.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/etheme.min.js') }}"></script>
{% if autocomplete %}<script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %}
<script src="{{ url_for('static', filename='js/searx.min.js') }}"
data-method="{{ method or 'POST' }}"
......
{% from 'eelo/macros.html' import result_link with context %}
{% from 'etheme/macros.html' import result_link with context %}
<div class="infobox">
<div class="head">
......
{% from 'eelo/macros.html' import navbar_menu %}
{% from 'etheme/macros.html' import navbar_menu %}
<input type="checkbox" name="nav_toggle" id="nav_toggle" class="hidden">
<nav>
<span id="eelo_links">
<span id="etheme_links">
<a href="https://ecloud.global/apps/rainloop">{{_('mail')}}</a>
<a href="https://ecloud.global/apps/files">{{_('drive')}}</a>
</span>
......
{% from 'etheme/macros.html' import search_bar %}
{% call search_bar(q, rtl=rtl, autofocus=True) %}{% endcall %}
\ No newline at end of file
{% from 'eelo/macros.html' import search_bar %}
{% from 'etheme/macros.html' import search_bar %}
{% call search_bar(q, true, rtl) %}
<div id="search_params">
{% include 'eelo/components/categories.html' %}
{% include 'etheme/components/categories.html' %}
<span id="time_and_lang">
{% set flat_lang_selector = True %}
{% include 'eelo/components/languages.html' %}
{% include 'eelo/components/time-range.html' %}
{% include 'etheme/components/languages.html' %}
{% include 'etheme/components/time-range.html' %}
</span>
</div>
{% endcall %}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment