From cc0f5fedb86898d750a2151efd1040a744b8235a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 22 Mar 2024 21:45:22 +0800 Subject: [PATCH] update fonts --- .../modules/cmsfront/themes/default/_bootswatch.scss | 4 ++-- .../modules/cmsfront/themes/default/bootstrap.css | 2 +- .../cmsfront/themes/default/bootstrap.min.css | 3 ++- .../modules/cmsfront/themes/default/bootswatch.less | 12 ++++++------ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/_bootswatch.scss b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/_bootswatch.scss index 5f04a929..82a2f556 100644 --- a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/_bootswatch.scss +++ b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/_bootswatch.scss @@ -2,8 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" !default; -@import url($web-font-path); +//$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" !default; +//@import url($web-font-path); // Navbar ===================================================================== diff --git a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.css b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.css index e2f12373..c3091f5f 100644 --- a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.css +++ b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"); +/*@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");*/ /*! * bootswatch v3.4.1 * Homepage: http://bootswatch.com diff --git a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.min.css b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.min.css index 86e72743..6c56d7df 100644 --- a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.min.css +++ b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootstrap.min.css @@ -1,4 +1,5 @@ -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");/*! +/*@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");*/ +/*! * bootswatch v3.4.1 * Homepage: http://bootswatch.com * Copyright 2012-2019 Thomas Park diff --git a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootswatch.less b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootswatch.less index f484615e..c8f3c39a 100644 --- a/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootswatch.less +++ b/modules/cms/src/main/resources/static/modules/cmsfront/themes/default/bootswatch.less @@ -2,12 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"; - -.web-font(@path) { - @import (css) url("@{path}"); -} -.web-font(@web-font-path); +//@web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"; +// +//.web-font(@path) { +// @import (css) url("@{path}"); +//} +//.web-font(@web-font-path); // Navbar =====================================================================