Simplify logic

layouts/partials/paige/figure.html

@@ -75,9 +75,9 @@
     {{ end }}
 {{ end }}
 
-<figure class="{{ with $float }} float-{{ . }} {{ $sidemargin }} {{ end }} {{ if not $bottommargin }} mb-0 {{ end }} align-items-{{ $align }} d-flex flex-column justify-content-center paige-figure" {{ if $float }} {{ with $style }} style="{{ . | safeCSS }}" {{ end }} {{ end }}>
+<figure class="{{ with $float }} float-{{ . }} {{ $sidemargin }} {{ end }} {{ if not $bottommargin }} mb-0 {{ end }} align-items-{{ $align }} d-flex flex-column justify-content-center paige-figure" {{ if and $float $style }} style="{{ $style | safeCSS }}" {{ end }}>
     {{ if and (not $float) $style }}
-        <div class="align-items-{{ $align }} d-flex flex-column justify-content-center {{ if $height }} h-100 {{ end }}" {{ if not $float }} {{ with $style }} style="{{ . | safeCSS }}" {{ end }} {{ end }}>
+        <div class="align-items-{{ $align }} d-flex flex-column justify-content-center {{ if $height }} h-100 {{ end }}" style="{{ $style | safeCSS }}">
     {{ end }}
         {{ if $table }}
             <div class="d-table">