diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py index 5bda46d0..701ef98c 100644 --- a/tutorindigo/plugin.py +++ b/tutorindigo/plugin.py @@ -21,9 +21,9 @@ # Add here your new settings "defaults": { "VERSION": __version__, - "WELCOME_MESSAGE": "The place for all your online learning", + "WELCOME_MESSAGE": "We keep you in the dark", "PRIMARY_COLOR": "#15376D", # Indigo - "ENABLE_DARK_TOGGLE": True, + "ENABLE_DARK_TOGGLE": False, # Footer links are dictionaries with a "title" and "url" # To remove all links, run: # tutor config save --set INDIGO_FOOTER_NAV_LINKS=[] @@ -121,7 +121,7 @@ def _override_openedx_docker_image( RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0 RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.2.2' -RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.2.2' +RUN npm install '@edx/brand@git+https://github.com/zemogle/brand-openedx.git#main' """, ) @@ -133,7 +133,7 @@ def _override_openedx_docker_image( hooks.Filters.ENV_PATCHES.add_item( ( "mfe-dockerfile-post-npm-install-authn", - "RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.2.2'", + "RUN npm install '@edx/brand@git+https://github.com/zemogle/brand-openedx.git#main'", ) ) @@ -188,6 +188,38 @@ def _override_openedx_docker_image( hooks.Filters.ENV_PATCHES.add_item((os.path.basename(path), patch_file.read())) +# for mfe in indigo_styled_mfes: +# PLUGIN_SLOTS.add_item( +# ( +# mfe, +# "footer_slot", +# """ +# { +# op: PLUGIN_OPERATIONS.Hide, +# widgetId: 'default_contents', +# }, +# { +# op: PLUGIN_OPERATIONS.Insert, +# widget: { +# id: 'default_contents', +# type: DIRECT_PLUGIN, +# priority: 1, +# RenderWidget: , +# }, +# }, +# { +# op: PLUGIN_OPERATIONS.Insert, +# widget: { +# id: 'read_theme_cookie', +# type: DIRECT_PLUGIN, +# priority: 2, +# RenderWidget: AddDarkTheme, +# }, +# }, +# """, +# ), +# ) + for mfe in indigo_styled_mfes: PLUGIN_SLOTS.add_item( ( diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss index 87f5f9f3..b68527fa 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss @@ -1,7 +1,7 @@ /////////////////// General -@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&family=Unica+One&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Quattrocento+Sans:ital,wght@0,400;0,700;1,400;1,700&family=Unica+One&display=swap'); -$font-stack: "Noto Sans", sans-serif; +$font-stack: "Quattrocento Sans", sans-serif; $font-headers: 'Unica One', sans-serif; $content_padding_top: 24px; diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_fonts.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_fonts.scss index 8720c730..e69de29b 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_fonts.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_fonts.scss @@ -1,48 +0,0 @@ -///////// Serif -@font-face { - font-family: 'Crimson'; - src: - url('#{$static-path}/fonts/CrimsonText-Regular.ttf') format('truetype'); - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: 'Crimson'; - src: - url('#{$static-path}/fonts/CrimsonText-Italic.ttf') format('truetype'); - font-weight: 400; - font-style: italic; -} - -@font-face { - font-family: 'Crimson'; - src: - url('#{$static-path}/fonts/CrimsonText-SemiBold.ttf') format('truetype'); - font-weight: 600; - font-style: normal; -} - -@font-face { - font-family: 'Crimson'; - src: - url('#{$static-path}/fonts/CrimsonText-SemiBoldItalic.ttf') format('truetype'); - font-weight: 600; - font-style: italic; -} - -@font-face { - font-family: 'Crimson'; - src: - url('#{$static-path}/fonts/CrimsonText-Bold.ttf') format('truetype'); - font-weight: 700; - font-style: normal; -} - -@font-face { - font-family: 'Crimson'; - src: - url('#{$static-path}/fonts/CrimsonText-BoldItalic.ttf') format('truetype'); - font-weight: 700; - font-style: italic; -} diff --git a/tutorindigo/templates/indigo/lms/static/sass/xblock/_xblock.scss b/tutorindigo/templates/indigo/lms/static/sass/xblock/_xblock.scss index d1b6120a..31f57044 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/xblock/_xblock.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/xblock/_xblock.scss @@ -52,6 +52,7 @@ .xmodule_display.xmodule_HtmlBlock p, .xmodule_display.xmodule_StaticTabBlock p { color: $text-color-d; + font-size: 1.4em; } .xmodule_display.xmodule_AboutBlock ol, .xmodule_display.xmodule_AboutBlock ul,