From e13c96faa21f19ece264d71947efd1fab0b6d113 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 15 Sep 2022 09:34:04 +0200 Subject: [PATCH 1/3] added icons and sections for documentation, apps, git and about --- caimira/apps/static/css/style.css | 2 +- caimira/apps/templates/base/index.html.j2 | 37 +++++++++++++++++----- caimira/apps/templates/base/layout.html.j2 | 1 + 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/caimira/apps/static/css/style.css b/caimira/apps/static/css/style.css index 4f5d97c1..929ab89f 100644 --- a/caimira/apps/static/css/style.css +++ b/caimira/apps/static/css/style.css @@ -223,7 +223,7 @@ footer img { .paragraph-title { text-align: left; - font-size: 2rem; + font-size: 1.5rem; } .split > * + * { diff --git a/caimira/apps/templates/base/index.html.j2 b/caimira/apps/templates/base/index.html.j2 index d9ab3be8..1ecfb19a 100644 --- a/caimira/apps/templates/base/index.html.j2 +++ b/caimira/apps/templates/base/index.html.j2 @@ -28,6 +28,16 @@


+
+
+ {#

Apps:

+
#} +
Calculator
+
+
Expert (beta)
+
+ {#
#} +
@@ -35,16 +45,27 @@

-
-
-

Apps:

-
-
Calculator
-
-
Expert (beta)
+ +
+ +
+

Applications

+
CAiMIRA is composed of two applications, the Calculator and the Expert App.
+
+
+

About

+
About page for details on methodology, assumptions and limitations of CAiMIRA.
+
+
+

Documentation

+
Documentation for CAiMIRA's applications, available online.
caimira.readthedocs.io/
+
+
+

GitLab

+
Official CAiMIRA's GitLab repository.
gitlab.cern.ch/cara/cara
-
+
{% block caimira_at_cern %} {% endblock caimira_at_cern %} diff --git a/caimira/apps/templates/base/layout.html.j2 b/caimira/apps/templates/base/layout.html.j2 index e7ac6dea..a563d62d 100644 --- a/caimira/apps/templates/base/layout.html.j2 +++ b/caimira/apps/templates/base/layout.html.j2 @@ -16,6 +16,7 @@ + {% block extra_headers %} From d63a6f2cf1e9e2f6cb589c01f27d110ed5004b24 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 16 Sep 2022 11:19:53 +0200 Subject: [PATCH 2/3] updated headers submenu and and mobile responsiveness --- caimira/apps/static/css/style.css | 10 +++++++ caimira/apps/templates/base/index.html.j2 | 33 ++++++++++------------ caimira/apps/templates/base/layout.html.j2 | 4 +-- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/caimira/apps/static/css/style.css b/caimira/apps/static/css/style.css index 929ab89f..fddd7503 100644 --- a/caimira/apps/static/css/style.css +++ b/caimira/apps/static/css/style.css @@ -179,6 +179,13 @@ body { height: 4em; } +.submenu-division { + border-right: 3px white solid; + width: 25px; + height: 30px; + margin-right: 10px; +} + /*===== FIXED BACKGROUND IMG =====*/ .fixed-background { @@ -325,6 +332,9 @@ footer img { .h1-text { font-size: 1.5rem; } + .mobile-sub-section { + width: 100%!important; + } } /* Devices under 768px (md) */ diff --git a/caimira/apps/templates/base/index.html.j2 b/caimira/apps/templates/base/index.html.j2 index 1ecfb19a..b7aa24c7 100644 --- a/caimira/apps/templates/base/index.html.j2 +++ b/caimira/apps/templates/base/index.html.j2 @@ -30,41 +30,38 @@
- {#

Apps:

-
#}
Calculator

Expert (beta)
- {#
#} +
-
-
- -
-

Applications

-
CAiMIRA is composed of two applications, the Calculator and the Expert App.
+
+
+

Applications

+
CAiMIRA is composed of two applications, the Calculator and the Expert App.
-
-

About

-
About page for details on methodology, assumptions and limitations of CAiMIRA.
+
+

About

+
About page for details on methodology, assumptions and limitations of CAiMIRA.
-
-

Documentation

-
Documentation for CAiMIRA's applications, available online.
caimira.readthedocs.io/
+
+

Documentation

+
Documentation for CAiMIRA's applications, available online.
caimira.readthedocs.io/
-
-

GitLab

-
Official CAiMIRA's GitLab repository.
gitlab.cern.ch/cara/cara
+
+

GitLab

+
Official CAiMIRA's GitLab repository.
gitlab.cern.ch/cara/cara
+

{% block caimira_at_cern %} diff --git a/caimira/apps/templates/base/layout.html.j2 b/caimira/apps/templates/base/layout.html.j2 index a563d62d..bb5bc7b8 100644 --- a/caimira/apps/templates/base/layout.html.j2 +++ b/caimira/apps/templates/base/layout.html.j2 @@ -42,9 +42,9 @@ -
    + From f907a6d897cdfed0dbe45776799e172daf9fe689 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 14 Oct 2022 15:48:41 +0200 Subject: [PATCH 3/3] modified UI text --- caimira/apps/templates/base/index.html.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/caimira/apps/templates/base/index.html.j2 b/caimira/apps/templates/base/index.html.j2 index b7aa24c7..b7aa72cb 100644 --- a/caimira/apps/templates/base/index.html.j2 +++ b/caimira/apps/templates/base/index.html.j2 @@ -54,11 +54,11 @@

Documentation

-
Documentation for CAiMIRA's applications, available online.
caimira.readthedocs.io/
+
Documentation for CAiMIRA, available here.
-

GitLab

-
Official CAiMIRA's GitLab repository.
gitlab.cern.ch/cara/cara
+

Git

+
Official CAiMIRA GitLab repository.