From 8c889ffb92f25a00d45a7589065321f2a0db59e4 Mon Sep 17 00:00:00 2001 From: Anand Chitipothu Date: Thu, 20 May 2021 13:12:19 +0530 Subject: [PATCH] chore: switched to new build system for css. - added community.bundle.less file to create css bundle - removed the obsolete build.json in favor of new build system - updated the paths in the books - removed the imported urls from css files (the new build system doesn't support that) - removed obsolete lms.css --- community/hooks.py | 6 ++--- community/lms/widgets/Exercise.html | 9 -------- community/public/build.json | 14 ------------ community/public/css/community.bundle.less | 4 ++++ community/public/css/lms.css | 26 ---------------------- community/public/css/style.css | 4 +--- community/public/css/style.less | 5 ----- 7 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 community/public/build.json create mode 100644 community/public/css/community.bundle.less delete mode 100644 community/public/css/lms.css diff --git a/community/hooks.py b/community/hooks.py index 8868509c..bf047f2b 100644 --- a/community/hooks.py +++ b/community/hooks.py @@ -18,11 +18,11 @@ app_logo_url = APP_LOGO_URL # ------------------ # include js, css files in header of desk.html -app_include_css = "/assets/community/css/community.css" -app_include_js = "/assets/community/js/community.js" +# app_include_css = "/assets/community/css/community.css" +# app_include_js = "/assets/community/js/community.js" # include js, css files in header of web template -web_include_css = "/assets/css/community.css" +web_include_css = "community.bundle.css" # web_include_css = "/assets/community/css/community.css" # web_include_js = "/assets/community/js/community.js" diff --git a/community/lms/widgets/Exercise.html b/community/lms/widgets/Exercise.html index 7e075058..b43410b4 100644 --- a/community/lms/widgets/Exercise.html +++ b/community/lms/widgets/Exercise.html @@ -16,12 +16,3 @@ is_exercise=True, last_submitted=submission and submission.creation) }} - - diff --git a/community/public/build.json b/community/public/build.json deleted file mode 100644 index 06a54a29..00000000 --- a/community/public/build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "css/lms.css": [ - "public/css/lms.css" - ], - "css/community.css": [ - "public/css/style.css", - "public/css/vars.css", - "public/css/style.less" - ], - "js/livecode-canvas.js": [ - "public/js/livecode-canvas.js" - ] - -} diff --git a/community/public/css/community.bundle.less b/community/public/css/community.bundle.less new file mode 100644 index 00000000..66652c93 --- /dev/null +++ b/community/public/css/community.bundle.less @@ -0,0 +1,4 @@ + +@import "./style.css"; +@import "./vars.css"; +@import "./style.less"; diff --git a/community/public/css/lms.css b/community/public/css/lms.css deleted file mode 100644 index 266295d0..00000000 --- a/community/public/css/lms.css +++ /dev/null @@ -1,26 +0,0 @@ - -.heading { - background: #eee; - padding: 10px; - clear: both; - color: #212529; - border: 1px solid #ddd; -} - -.sketch-header h1 { - font-size: 1.5em; - margin-bottom: 0px; -} - -.sketch-header { - margin-bottom: 1em; -} - -.sketch-card .sketch-title a { - font-weight: bold; - color: inherit; -} - -.hidden { - display: none; -} diff --git a/community/public/css/style.css b/community/public/css/style.css index 1462ebf4..8c3fb588 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -1,5 +1,3 @@ -@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons@1.4.1/font/bootstrap-icons.css"); -@import url("https://use.fontawesome.com/releases/v5.13.0/css/all.css"); :root { --c1: #fefae0; @@ -26,7 +24,7 @@ --send-message: var(--c7); --received-message: var(--c8); - --primary-color: #08B74F; + --primary-color: #08B74F !important; } body { diff --git a/community/public/css/style.less b/community/public/css/style.less index c2d05b19..e92d02ef 100644 --- a/community/public/css/style.less +++ b/community/public/css/style.less @@ -1,9 +1,4 @@ @primary-color: #08B74F; -@import url('https://rsms.me/inter/inter.css'); - -body { - font-family: "Inter", sans-serif; -} h2 { margin: 20px 0px;