Merge pull request #2 from q-verse/develop

EDE-521 release-2020-05-18
q-verse · May 21, 2020 · 6d20d46 · 6d20d46
2 parents d8098a7 + 9583374
commit 6d20d46
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,22 @@
 # qverse-theme
 
 This repo is copied from edly theme repo. For details, you can always refer to https://github.com/edly-io/edly-edx-themes.
+
+To enable colors and branding use the following configuration for LMS, CMS and Ecommerce in **admin** → **site configuration**.
+
+```
+{
+  "COLORS":{
+    "primary":"#853111",
+    "secondary":"#853111"
+  },
+  "FONTS":{
+    "base-font":"Open Sans, sans-serif",
+    "heading-font":"Open Sans, sans-serif",
+    "font-path":"https://fonts.googleapis.com/css?family=Open+Sans&display=swap"
+  },
+  "BRANDING":{
+    "logo":"https://edly-cloud-static-assets.s3.amazonaws.com/esut/logo.png",
+    "favicon":"https://edly-cloud-static-assets.s3.amazonaws.com/esut/favicon.ico"
+  }
+}
diff --git a/q-verse/cms/static/sass/shared-v2/_footer.scss b/q-verse/cms/static/sass/shared-v2/_footer.scss
@@ -17,6 +17,12 @@
         &.primary {
             max-width: none;
             color: $color-gray-light;
+
+            .colophon {
+                float: none;
+                width: auto;
+                margin-right: 0;
+            }
         }
 
         .nav-legal,

diff --git a/q-verse/lms/static/sass/shared-v2/_header.scss b/q-verse/lms/static/sass/shared-v2/_header.scss
@@ -192,7 +192,10 @@
                 }
 
                 .dropdown-nav-item {
-                    @include media-up(md) { border-bottom: 1px solid $gray-lighter; }
+                    @include media-up(md) {
+                        border-bottom: 1px solid $gray-lighter;
+                        padding: 0;
+                    }
 
                     a {
 

diff --git a/q-verse/lms/templates/main.html b/q-verse/lms/templates/main.html
@@ -129,7 +129,7 @@
     % if uses_bootstrap:
     ## xss-lint: disable=mako-invalid-js-filter
 
-        <script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.bundle.js')}"></script>
+    <script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.bundle.js')}"></script>
     % endif
 
     <script>
@@ -321,14 +321,10 @@
 <body class="${static.dir_rtl()} <%block name='bodyclass'/> lang_${LANGUAGE_CODE}"
       data-nav-menu-url="${marketing_link('NAV_MENU')}"
       data-zendesk-widget-url="${marketing_link('ZENDESK-WIDGET')}"
-      data-services-notifications-url = "${services_notifications_url}"
-      data-session-cookie-domain = "${session_cookie_domain}"
-      data-services-notifications-cookie-expiry = "${services_notifications_cookie_expiry}"
       data-footer-url="${marketing_link('FOOTER')}">
 
     <%static:optional_include_mako file="body-initial.html" is_theming_enabled="True" />
 <div id="page-prompt"></div>
-<div id="services_notifications" class="suitewise-notifications-wrapper"></div>
 <div id="preload" class="loading">
     <ul class="loading-dots">
         <li></li>