Improved layout of producers show

philschonholzer · Oct 8, 2021 · eee5cc3 · eee5cc3
1 parent a7454ec
commit eee5cc3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Web/Component/CommonConsumption.hs b/Web/Component/CommonConsumption.hs
@@ -55,10 +55,11 @@ instance Component CommonConsumption CommonConsumptionController where
         </p>
 
         <p style="font-size: 2em;">
-          ×&nbsp;<span class="producer-amount">{timesPerYear |> twoDec}</span>
+          <span style="font-size: 1.5em">×&ensp;</span>
+          <span class="producer-amount">{timesPerYear |> twoDec}</span> / year
         </p>
         <p style="font-size: 2em;">
-          =
+          <span style="font-size: 1.5em">=&ensp;</span>
           <span class="co2-amount timesPerYear">{((calcCo2Factor gCo2 1.0 amount) * timesPerYear) |> renderWeight}</span>&nbsp;CO<sub>2</sub>e / year
         </p>
         {renderInput amount minAmount maxAmount "SetCommonConsumptionValue" "newAmount" "Single consumption"}

diff --git a/Web/View/Co2Producers/Show.hs b/Web/View/Co2Producers/Show.hs
@@ -61,7 +61,7 @@ instance View ShowView where
     where
       renderCo2Value co2Producer sources = case averageCo2Value sources of
         Just a -> [hsx|
-            <p style="font-size: 2em;">
+            <p style="font-size: 2em; margin: 0;">
               <span class="producer-amount">1</span>
               <span class="producer-unit">{get #unit co2Producer}</span>
               {svg}

diff --git a/static/styles/producer-common-consumption.css b/static/styles/producer-common-consumption.css
@@ -8,7 +8,8 @@
 }
 
 .producer.show .common-consumption h2 {
-  font-size: 2em;
+  font-size: 3em;
+  margin: 0.1em 0 1em;
 }
 
 .producer.show .common-consumption h3 {

diff --git a/static/styles/producer-show.css b/static/styles/producer-show.css
@@ -36,10 +36,6 @@
   overflow: hidden;
 }
 
-.producer.show section {
-  padding: 0;
-}
-
 .producer.show .fields a {
   line-break: anywhere;
 }