From 6772dc38b3b44eb7db8619fa1a8ab57648122a39 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 5 Nov 2024 17:07:37 +0100 Subject: [PATCH] Reorganize functions --- src/section.lisp | 10 +++------- src/utility.lisp | 12 +++++++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/section.lisp b/src/section.lisp index d4c5a7c..d099044 100644 --- a/src/section.lisp +++ b/src/section.lisp @@ -2,6 +2,9 @@ (defpackage ml-sbt/section (:use :cl) + (:import-from #:ml-sbt/utility + #:make-col-class + #:combine-classes) (:import-from #:ml-sbt/btn #:btn-group-outline-primary) (:export @@ -14,13 +17,6 @@ (in-package :ml-sbt/section) -(defun make-col-class (breakpoint value) - (when value - (format nil "col~@[-~(~a~)~]~@[-~a~]" breakpoint value))) - -(defun combine-classes (&rest class-specs) - (string-trim " " (format nil "~{~a ~}" (remove nil class-specs)))) - (defmacro with-title-bar (head &rest items) "Creates a Bootstrap-styled title bar with an optional set of action buttons. diff --git a/src/utility.lisp b/src/utility.lisp index 411d365..155f22f 100644 --- a/src/utility.lisp +++ b/src/utility.lisp @@ -51,7 +51,9 @@ :sizing :spacing :text - :valign) + :valign + :make-col-class + :combine-classes) (:documentation "A module for generating Bootstrap utility classes.")) (in-package :ml-sbt/utility) @@ -553,3 +555,11 @@ Example 3: ; This will generate a string 'align-middle'" (let ((align-str (if (null align) "" (format nil "align-~a" align)))) (string-clean align-str))) + + +(defun make-col-class (breakpoint value) + (when value + (format nil "col~@[-~(~a~)~]~@[-~a~]" breakpoint value))) + +(defun combine-classes (&rest class-specs) + (string-trim " " (format nil "~{~a ~}" (remove nil class-specs))))