From: Michael Tremer Date: Fri, 9 May 2025 14:05:29 +0000 (+0000) Subject: Remove all previous JS and CSS X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7a5f2b3678a22d973cee953ae848a615821ab2e;p=people%2Fms%2Fwestferry.git Remove all previous JS and CSS Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index ad54f3c..4ceab27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,9 +37,7 @@ configsdir = $(sysconfdir)/westferry # Directories for static files webrootdir = $(datadir)/westferry/webroot webroot_assetsdir = $(webrootdir)/assets -webroot_cssdir = $(webrootdir)/css webroot_fontsdir = $(webrootdir)/fonts -webroot_scriptsdir = $(webrootdir)/scripts webroot_imagesdir = $(webrootdir)/images CLEANFILES = @@ -195,16 +193,6 @@ ui_modulesdir = $(datadir)/westferry/templates/modules ui_modules_DATA = -dist_webroot_css_DATA = \ - src/styles/westferry.css - -EXTRA_DIST += \ - src/styles/_fonts.scss \ - src/styles/westferry.scss - -CLEANFILES += \ - src/styles/westferry.css - dist_webroot_fonts_DATA = \ src/third-party/fonts/ofl/prompt/OFL.txt \ src/third-party/fonts/ofl/prompt/Prompt-Black.ttf \ @@ -226,17 +214,6 @@ dist_webroot_fonts_DATA = \ src/third-party/fonts/ofl/prompt/Prompt-Thin.ttf \ src/third-party/fonts/ofl/prompt/Prompt-ThinItalic.ttf -webroot_scripts_DATA = \ - src/scripts/foundation.min.js \ - src/scripts/westferry.min.js - -EXTRA_DIST += \ - src/scripts/westferry.js - -CLEANFILES += \ - src/scripts/foundation.min.js \ - src/scripts/westferry.min.js - # - frontend ------------------------------------------------------------------- EXTRA_DIST += \ @@ -358,16 +335,6 @@ UGLIFYJS_PROCESS = \ %.py: %.py.in $(SED_PROCESS) -%.css: %.scss - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(SASSC) --style compressed $< > $@ - -%.min.js: %.js - $(UGLIFYJS_PROCESS) - -src/scripts/foundation.min.js: src/third-party/foundation-sites/dist/js/foundation.js - $(UGLIFYJS_PROCESS) - src/scripts/westferry: src/scripts/westferry.in $(SED_PROCESS) diff --git a/configure.ac b/configure.ac index abdf1bc..5ca193b 100644 --- a/configure.ac +++ b/configure.ac @@ -64,15 +64,6 @@ if test "x$NPM" = "xno"; then AC_MSG_ERROR([npm is required to build the frontend]) fi -# SASSC -AC_CHECK_PROG(SASSC, [sassc], [sassc]) -if test -z "${SASSC}"; then - AC_MSG_ERROR([sassc is required]) -fi - -# uglifyjs.terser -AC_CHECK_PROG(UGLIFYJS, [uglifyjs.terser], [uglifyjs.terser]) - save_LIBS="$LIBS" # pkg-config diff --git a/src/scripts/.gitignore b/src/scripts/.gitignore deleted file mode 100644 index 121531a..0000000 --- a/src/scripts/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.min.js diff --git a/src/scripts/westferry.js b/src/scripts/westferry.js deleted file mode 100644 index 63edf38..0000000 --- a/src/scripts/westferry.js +++ /dev/null @@ -1,6 +0,0 @@ -/* - Westferry JS Code -*/ - -// Initialise Foundation -$(document).foundation(); diff --git a/src/styles/.gitignore b/src/styles/.gitignore deleted file mode 100644 index b3a5267..0000000 --- a/src/styles/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.css diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss deleted file mode 100644 index 107f9d0..0000000 --- a/src/styles/_fonts.scss +++ /dev/null @@ -1,53 +0,0 @@ -/* latin-ext */ -@font-face { - font-family: "Prompt"; - font-style: normal; - font-weight: 400; - src: local("Prompt Regular"), local("Prompt-Regular"), url(../fonts/Prompt-Regular.ttf) format("truetype"); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* latin */ -@font-face { - font-family: "Prompt"; - font-style: normal; - font-weight: 400; - src: local("Prompt Regular"), local("Prompt-Regular"), url(../fonts/Prompt-Regular.ttf) format("truetype"); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -/* latin-ext */ -@font-face { - font-family: 'Prompt'; - font-style: normal; - font-weight: 500; - src: local('Prompt Medium'), local('Prompt-Medium'), url(../fonts/Prompt-Medium.ttf) format("truetype"); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* latin */ -@font-face { - font-family: 'Prompt'; - font-style: normal; - font-weight: 500; - src: local('Prompt Medium'), local('Prompt-Medium'), url(../fonts/Prompt-Medium.ttf) format("truetype"); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -/* latin-ext */ -@font-face { - font-family: "Prompt"; - font-style: normal; - font-weight: 700; - src: local("Prompt Bold"), local("Prompt-Bold"), url(../fonts/Prompt-Bold.ttf) format("truetype"); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* latin */ -@font-face { - font-family: "Prompt"; - font-style: normal; - font-weight: 700; - src: local("Prompt Bold"), local("Prompt-Bold"), url(../fonts/Prompt-Bold.ttf) format("truetype"); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} diff --git a/src/styles/westferry.scss b/src/styles/westferry.scss deleted file mode 100644 index df59a7a..0000000 --- a/src/styles/westferry.scss +++ /dev/null @@ -1,88 +0,0 @@ -/* - Global Settings -*/ -$body-font-family: Prompt, sans-serif; - -// Colour Palette -$foundation-palette: ( - primary: #ff2e53, - secondary: #767676, - success: #3adb76, - warning: #e7e247, - alert: #cc4b37, -); - -// Import fonts -@import "fonts"; - -/* - Import Foundation Sites -*/ -@import "../third-party/foundation-sites/scss/foundation"; - -// Global styles -@include foundation-global-styles; -@include foundation-forms; -@include foundation-typography; - -// Enable the XY Grid -@include foundation-xy-grid-classes; - -// Generic components -@include foundation-button; -@include foundation-button-group; -@include foundation-close-button; -@include foundation-label; -@include foundation-progress-bar; -@include foundation-slider; -@include foundation-switch; -@include foundation-table; - -// Basic components -@include foundation-badge; -@include foundation-breadcrumbs; -@include foundation-callout; -@include foundation-card; -@include foundation-dropdown; -@include foundation-pagination; -@include foundation-tooltip; - -// Containers -@include foundation-accordion; -@include foundation-media-object; -@include foundation-orbit; -@include foundation-responsive-embed; -@include foundation-tabs; -@include foundation-thumbnail; - -// Menu-based containers -@include foundation-menu; -@include foundation-menu-icon; -@include foundation-accordion-menu; -@include foundation-drilldown-menu; -@include foundation-dropdown-menu; - -// Layout components -@include foundation-off-canvas; -@include foundation-reveal; -@include foundation-sticky; -@include foundation-title-bar; -@include foundation-top-bar; - -// Helpers -@include foundation-float-classes; -@include foundation-flex-classes; -@include foundation-visibility-classes; -// @include foundation-prototype-classes; - -/* - Custom CSS -*/ - -.top-bar { - margin-bottom: 1rem; -} - -img.graph { - margin-bottom: 1rem; -}