From 75074d5e901b7bc952487f9fb9e27b4eac34d571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Sun, 1 Oct 2023 10:22:03 +0200 Subject: [PATCH] Fix columns size --- ram/portal/static/css/main.css | 4 ++++ ram/portal/templates/cards.html | 6 +++--- ram/portal/templates/companies.html | 10 +++++----- ram/portal/templates/consist.html | 2 +- ram/portal/templates/consists.html | 4 ++-- ram/portal/templates/manufacturers.html | 6 +++--- ram/portal/templates/rollingstock.html | 22 +++++++++++----------- ram/portal/templates/scales.html | 8 ++++---- ram/portal/templates/types.html | 4 ++-- ram/ram/__init__.py | 2 +- 10 files changed, 36 insertions(+), 32 deletions(-) diff --git a/ram/portal/static/css/main.css b/ram/portal/static/css/main.css index df6847d..91cdee4 100644 --- a/ram/portal/static/css/main.css +++ b/ram/portal/static/css/main.css @@ -20,6 +20,10 @@ a.badge, a.badge:hover { padding: 0; } +.w-33 { + width: 33% !important; +} + #nav-notes > p { padding: .5rem; } diff --git a/ram/portal/templates/cards.html b/ram/portal/templates/cards.html index 895a533..c2eadb8 100644 --- a/ram/portal/templates/cards.html +++ b/ram/portal/templates/cards.html @@ -32,7 +32,7 @@ - Type + Type {{ d.rolling_class.type }} @@ -54,7 +54,7 @@ {{ d.era }} - Manufacturer + Manufacturer {%if d.manufacturer %} {{ d.manufacturer }}{% if d.manufacturer.website %} {% endif %} {% endif %} @@ -78,7 +78,7 @@ - Decoder + Decoder {{ d.decoder }} diff --git a/ram/portal/templates/companies.html b/ram/portal/templates/companies.html index 964c44a..765af43 100644 --- a/ram/portal/templates/companies.html +++ b/ram/portal/templates/companies.html @@ -17,25 +17,25 @@ {% if d.logo %} - Logo + Logo {% endif %} - Name + Name {{ d.extended_name }} - Abbreviation + Abbreviation {{ d.name }} - Country + Country {{ d.country.name }} {{ d.country }} {% if d.freelance %} - Notes + Notes A freelance company {% endif %} diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html index 1ab8e67..39ffe61 100644 --- a/ram/portal/templates/consist.html +++ b/ram/portal/templates/consist.html @@ -82,7 +82,7 @@ - Company + Company {{ consist.company }} diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html index d9f84b4..dae12d4 100644 --- a/ram/portal/templates/consists.html +++ b/ram/portal/templates/consists.html @@ -36,12 +36,12 @@ {% if d.address %} - Address + Address {{ d.address }} {% endif %} - Company + Company {{ d.company }} diff --git a/ram/portal/templates/manufacturers.html b/ram/portal/templates/manufacturers.html index 723a1e2..b198b7e 100644 --- a/ram/portal/templates/manufacturers.html +++ b/ram/portal/templates/manufacturers.html @@ -17,18 +17,18 @@ {% if d.logo %} - Logo + Logo {% endif %} {% if d.website %} - Website + Website {% endif %} - Category + Category {{ d.category | title }} diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html index 396f8b8..2a22c7f 100644 --- a/ram/portal/templates/rollingstock.html +++ b/ram/portal/templates/rollingstock.html @@ -64,7 +64,7 @@ - Type + Type {{ rolling_stock.rolling_class.type }} @@ -95,7 +95,7 @@ - Manufacturer + Manufacturer {%if rolling_stock.manufacturer %} {{ rolling_stock.manufacturer }}{% if rolling_stock.manufacturer.website %} {% endif %} {% endif %} @@ -119,7 +119,7 @@ - Interface + Interface {{ rolling_stock.get_decoder_interface_display }} {% if rolling_stock.decoder %} @@ -145,7 +145,7 @@ - Manufacturer + Manufacturer {%if rolling_stock.manufacturer %} {{ rolling_stock.manufacturer }}{% if rolling_stock.manufacturer.website %} {% endif %} {% endif %} @@ -182,7 +182,7 @@ {% for p in rolling_stock_properties %} - {{ p.property }} + {{ p.property }} {{ p.value }} {% endfor %} @@ -199,7 +199,7 @@ - Class + Class {{ rolling_stock.rolling_class.identifier }} @@ -234,7 +234,7 @@ {% for p in class_properties %} - {{ p.property }} + {{ p.property }} {{ p.value }} {% endfor %} @@ -255,7 +255,7 @@ {{ rolling_stock.get_decoder_interface_display }} - Address + Address {{ rolling_stock.address }} @@ -301,7 +301,7 @@ {% for d in rolling_stock.document.all %} - {{ d.description }} + {{ d.description }} {{ d.filename }} {{ d.file.size | filesizeformat }} @@ -318,7 +318,7 @@ {% for d in rolling_stock.decoder.document.all %} - {{ d.description }} + {{ d.description }} {{ d.filename }} {{ d.file.size | filesizeformat }} @@ -337,7 +337,7 @@ {% for j in rolling_stock_journal %} - {{ j.date }} + {{ j.date }} {{ j.log | safe }} {% endfor %} diff --git a/ram/portal/templates/scales.html b/ram/portal/templates/scales.html index d32f792..3c5e9e1 100644 --- a/ram/portal/templates/scales.html +++ b/ram/portal/templates/scales.html @@ -14,19 +14,19 @@ - Name + Name {{ d.scale }} - Ratio + Ratio {{ d.ratio }} - Gauge + Gauge {{ d.gauge }} - Tracks + Tracks {{ d.tracks }} diff --git a/ram/portal/templates/types.html b/ram/portal/templates/types.html index 83f7d36..127c3f3 100644 --- a/ram/portal/templates/types.html +++ b/ram/portal/templates/types.html @@ -14,11 +14,11 @@ - Type + Type {{ d.type }} - Category + Category {{ d.category | title}} diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py index 830ef68..b7d7d4b 100644 --- a/ram/ram/__init__.py +++ b/ram/ram/__init__.py @@ -1,4 +1,4 @@ from ram.utils import git_suffix -__version__ = "0.4.0" +__version__ = "0.4.1" __version__ += git_suffix(__file__)