]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'main' into xmr/docs-sass xmr/docs-sass 39700/head
authorXhmikosR <xhmikosr@gmail.com>
Tue, 19 Mar 2024 13:57:43 +0000 (15:57 +0200)
committerGitHub <noreply@github.com>
Tue, 19 Mar 2024 13:57:43 +0000 (15:57 +0200)
1  2 
package.json
site/layouts/partials/stylesheet.html

diff --cc package.json
Simple merge
index 47e25e0c54f3c3fa78dcae92c3e5b742dd6b7ab9,9969ee44fc4f372a4756101a3a47542a084ec5b1..89955d7eeb1495e88a9432f1edf1a547909460bd
  {{- end }}
  
  {{- if (ne .Page.Layout "examples") }}
- {{- $targetDocsCssPath := path.Join "/docs" .Site.Params.docs_version "assets/css/docs.css" -}}
- {{- $sassOptions := dict "transpiler" "dartsass" "targetPath" $targetDocsCssPath "outputStyle" "expanded" -}}
 -{{- $sassOptions := dict "outputStyle" "expanded" "precision" 6 -}}
++{{- $sassOptions := dict "transpiler" "dartsass" "outputStyle" "expanded" -}}
  {{- $postcssOptions := dict "use" "autoprefixer" "noMap" true -}}
  
+ {{- $targetDocsCssPath := path.Join "/docs" .Site.Params.docs_version "assets/css/docs.css" -}}
+ {{- $targetSearchCssPath := path.Join "/docs" .Site.Params.docs_version "assets/css/search.css" -}}
  {{ if hugo.IsProduction -}}
    {{- $sassOptions = merge $sassOptions (dict "outputStyle" "compressed") -}}
  {{- end -}}