From 4a21539be9e5257d9b80b9bd28f34fdb1b950bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ctanveer65=E2=80=9D?= Date: Wed, 24 Jan 2024 12:21:10 +0500 Subject: [PATCH] fix: Updates of favicon and minor fixes - v2.1 --- tutorindigo/plugin.py | 17 +++ .../indigo/cms/static/images/favicon.ico | Bin 4286 -> 12206 bytes .../lms/static/images/no_course_image.png | Bin 0 -> 3269 bytes .../lms/static/sass/courseware/_about.scss | 38 ++++++- .../lms/static/sass/courseware/_discover.scss | 11 +- .../lms/static/sass/dashbord/_dashbord.scss | 4 +- .../indigo/lms/static/sass/extra/_header.scss | 30 ++++- .../indigo/lms/static/sass/home/_home.scss | 105 ++++++++++++++++++ .../sass/partials/lms/theme/_extras.scss | 1 + .../indigo/lms/templates/course.html | 2 +- .../templates/courseware/course_about.html | 1 + .../lms/templates/courseware/courses.html | 4 - .../discovery/course_card.underscore | 2 +- .../lms/templates/header/user_dropdown.html | 2 +- .../templates/indigo/lms/templates/index.html | 79 +++++++++++++ 15 files changed, 278 insertions(+), 18 deletions(-) create mode 100644 tutorindigo/templates/indigo/lms/static/images/no_course_image.png create mode 100644 tutorindigo/templates/indigo/lms/templates/index.html diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py index 3f1d97d67..0a9e6c745 100644 --- a/tutorindigo/plugin.py +++ b/tutorindigo/plugin.py @@ -117,6 +117,23 @@ def _override_openedx_docker_image( "mfe-dockerfile-post-npm-install-authn", """ RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^1.0.0' +""", + ), + # Tutor-Indigo v2.1 targets the styling updations in discussions and learner-dashboard MFE + # brand-openedx is related to styling updates while others are for header and footer updates + ( + "mfe-dockerfile-post-npm-install-discussions", + """ +RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^1.0.0' +RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^1.0.0' +RUN npm install '@edx/frontend-component-footer@npm:@edly-io/indigo-frontend-component-footer@^1.0.0' +""", + ), + ( + "mfe-dockerfile-post-npm-install-learner-dashboard", + """ +RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^1.0.0' +RUN npm install '@edx/frontend-component-footer@npm:@edly-io/indigo-frontend-component-footer@^1.0.0' """, ), ] diff --git a/tutorindigo/templates/indigo/cms/static/images/favicon.ico b/tutorindigo/templates/indigo/cms/static/images/favicon.ico index f455454c554a2c74c64f4708539a1fc26b1f7e12..5bc7c23de6143c2fb83b76060cce2632319fe12c 100644 GIT binary patch literal 12206 zcmd6tTZmOv7{~W;7c++^;DYHTp_0(BE`!jl!oT%_g{N`htqbQIcv{3( zYn^>NCrJwYtzVV!zm$BiI!SI#lH@M19`pn0-G21VVuAW>5`@qdcT4V4j(6L&5tJW)5$Jp%~f}bUeJDZaH>AaVEv>sz?R}JUEi{Lur zr?J;%&l%McwSXctx*U2a3_mP4NWc>pZ2}FMuqE(7x=x0!u+O zCE0o(`R2*>9`>uee{{ZjhCbeE>Tkl=sb>wqkGoK31L{i0c~8rNXA$x(5PP2c7uylA1;nJuWuus21NaOmSE%N! zZWy}(pjx8x$qs1V-vqJuV^^^K2)OecGAdUdBgGV0)9py*QqF9>p?&pAwWy|PQ|dUl z5y<`$2*nHO_F}7RgX1`Dk_HdzGwpLJXNXHkr&?_+SS`i?G2U|?M}|> z9>jhYRFi5`jg@(_F>)jL6@>a1(v4x;2i&|zlW&qCdD9-090zd;aSZ8HqiS_M@Uj>A z8wlBlbfeg=8(%(m&tGbzk^llp8w>lYr!ud_MTGb!ChcZuKl*)$S>~VuoH+=%)F~c)oRy2H;?S! z3H1IT_S~uat`EVS^nkopyEw$&1FE)nfogSitCu!L>fZlta0$fraxb>72S}TmS(W-O z%;!|@*fpz~RGVt7)Lu>0>u37>Gwatz<4yhQw`z}>BiU%)_59;%udX>e#zwud=ik_C zgMFr+^#0kf4ewiA;raX|5Xo|lk6fLM-tH?a!@ zdw^bX3%uX#MjiyQam7JgX1#XnAGy*sIj8`5UdH z5r5-=>;&(CGhn(pbnp7V`vUgWN9jHX(_QNnTRD`=^}Z4A&Ga=s$Q|G;2=(AJ`fhMl zYU##0dews;LC9AzcT7IEtEK9$F2vQ4&PzYz?6Z^RZW}06`&5rPpXl1K6=c_tV)c)4 zZ5&^*soJIG#_+UrLLcK{py#wxKy^(!cXr&{%16G6p;*)Uwo)TJSIuP+><4;36~*7| zywCoT&fXH^;5|b#YA%;A7cX{|*-TEgPqk}*vTbOgPH-Gb_FPGDloN2{p#(RMVRKOuALolBD#cugTUo|wuEByr zD45LUs1$OnNYi_}!9>TCg2l18mdE9tOp2bzp0X0at1QO^uEyKym`d7RT{zsT&=IE{12Z?r`iAj literal 4286 zcmeHL$xo9(9R2(cJb4k7O%|7+xBvkWgCbFgf}j$;X%umb2M!veCZ3H(qcL$K#5Kma z#CUK=WALI;ahH~^P}y3FE#05#>&%r31o4-gtnpL3 zI#JUmX_}TLni$ebMB})8#N5bd`ZOI9Eulfe0|^hr^FaDk9oS;cr%llzHK|=Tg&7SW zE5>MJj6Zi~2lD3`z;}fuM|Qd%<)tQUT;GYh8mq(+lb35i?(B{zyjnM&J~c^)!UYE0 zxiyGqEp8O$8Kn;7o-?BZP3Iiw=?TE&3Bhg;Vr`Wb`GWh&BNy)7{eeaKMxo1a&g11S zFE!)Eb2s?tbv~?GVU~NM-aG1T@OndX&gToE`+ER2t1MWt%nV(-PmaHAbz^0jdE7Zr z!@624K7R1ZIB#BiP+e*H?E&uT)Cs$sb2@|A+t`iDaQWf&VT;o#fEjA zW2%Mn&(3W&SS^0J{?P*$N{dZVdmzX8vkp0LH26?3-++|K!yaXRONxwmc>jmQbXxt` z)nJp}Q5>;qF>|^ehY$9`A!->2gmCS$6M1u^eaCep`HL0`Ux=I{V-mA)jsaIL4#4jZ z!Qlwv@S$FiBNC_HS<~IyZPH6jn%_jmrx@cs)I7-Qm?1Njt|KBW%iQoO1s zcKsSFOvbQx==ZWE(Yh0xnJQw6yqcTB{KS_Q8|7GLO0)*dbJ=1OTAsLM9f&0dxfE|? z&)U?kw&2}ckHo)k^I%=|FrM-Fz4e6~wyv;0JVPPSpU*|UmCM8DgE7fbE6!uvyKpS_ z{61R!xlZO>V#3qM;hfDTKN_~!qyMAlg^3;Vg z5tFea_Z#m$P2hOnUBBiOJ_P#v130+92ia+QRERxZY97EBajy6b4hC`i<{+9cIIvV` zP0WFPJ?QHTAQ%L0Tz8^?cjp+nRZi3|CtHt`$L$yr8Z#cX=N{OUr+EI9|2WS2_5QjO zPoK0SN8FR~>aDoq_0%ydRgXhr@5hh!V|J!qYRh78ksSV=sS@`h^NPf)a}bGF^MA8v{IPoKZ}KK$jqMyKbV}&- Nzk6Wh{{#N@_n*j*OK<=H diff --git a/tutorindigo/templates/indigo/lms/static/images/no_course_image.png b/tutorindigo/templates/indigo/lms/static/images/no_course_image.png new file mode 100644 index 0000000000000000000000000000000000000000..a1568b7a6765066833be6a49d6941f68a25555a1 GIT binary patch literal 3269 zcmZ`+c{CJ^*B;6`cG{cu(Rgo6z2p00NfB83nu`8N#xAW zXJb#^>xT2>1jVW$#A;oov>glB*$i$0}l$hcQ z72W>Yq$$qYykuLZ_;yKp42{rfFy-(v3Vdlfob&|E z;UH%2Pp<#VFYrZB;IsJ}Wxf z;@dm&?s*r--_q9T*?1moRoJcrgEPf6M?0ipdK26bBX#W_$8nwn-ixSx=|IT2ozmd9+XFL!U-q}-_;ot;)NP~A5IoE zl8IJf&sp8$5Y_#Y?8^sc$%21yhiAN$P^B|fKYA4?lvYV-jCkaH9xoEfF2a^}Z-rdWrHl;MDQSiI z9&V3gYmf`CphEFW=@Re1=TVOSsd{j^GI*ghyQp&bvu-02B|`P}@OfINVe!1^Wu|8apOK3#~f1AYvu zwb6)pcNR8_<;@62^aMw7HF-28&$?bY>mp0biYSU_!9KIm>O&%*Yg3xV^Oy?c5nPW> zg>%vLLm5FR)|>o$3jiwDoA-T!z6MXGm$a0Uh+B5(@=}XK^I7!OAgXiV^60iyU&W`-a&w6eLEWt zHil*!Bgdp%J1ZHfbOwq})N~Nx6Hd!@hu8p)=%{fD@y( z36+3uxHKdpB6iXUUA`kE|ZD!Un2Oq9;IpE&>zhWf zO!jO;+;oq=yO=eq8SQf5;cAw!1{*TZf5F(pW3b!L^S@?377mAllUL?;!a1E{9{%_! zsLGRPK-t;&`lBA!Gbl>+9p0pQfcPX}bD%)y*P>_0&>vcv9x0uNhHR1kI}MIT`GPHt zy8VM$T`bY^zsH8^noHrAyQ((WMSz}njf*?WF<4z!F(<4Z_4AHR&md3#AhVCE$UIx* z@uKn9M0c!Z?7cQ}w5)grGVe*dnO(123lYFCee}yl zFd;e5?TZMttlM`K%il!UYi&!<6DvESqr@?hr`k;+WD?_VONvJm_XyjbXC5bzRdkdX|6xq2 zf3Q8Eqn1xP`NeO3a310IHmmg*-)_;oHBslP^)G>3rKgB9@@K0@_RC%oq^_`1SJ-Eu zq5)oAcFku;&Y}Cz9&;If`8yw&$FY0g&JOsQ{FAY7EZM|XS{WF61}6_>ed_vBFE<-d zJo1|;?DW{?tZ#oBefhg(*>IP3b?8>dS~{ANjZln(cnuZ=h2Fmuk^~)FgDokb!W31@IDQ@TgINk7OWUJM?^1$O z-};gMOJIeCK~u{S*UNm45QDM^PB{`zOH@b_RfX7P&u6Acl*hGYqIS;(rE})7jH0S5 z9}-bFyOvEet9-$ewylSW=v|W~Cc!#JJz1{$xdB;gmxMKl{+UPztT5eXqi@v1$bD9E0OvgPyU|w@kpns@IcOj>8+RFT_~sX*aTW z6i`S01@N~$!=o7W%s`qgy5{M^*v+?pT1M;Yes<)P?6BuM*bw)XV?<@_+(azf{gfJ9 z-SzmB3Y;h7vtSu(6(D??iujCe6nlQ$o6_l~4o5F;4H_O9uWrTc(p+Ui5RmRyG!alg z*eI%%2JwTa@(5-nb43zlSOZ6O5(9~u)f%wp3k;iC_1E&F?5)BSUjHjt=_H*5P2GYH z-^Zv6Xv9D!-WxOrOqoC=W;6odrl3`1bsdUBF;aeo$~i6?MqI@THVc#;%@0ZrBN=EF z5{qfhv3IxgbHO#oja0ROj2|9@q? kA5|`B8Zc+o3_!1{N=S+V_s5un&fXIM#L~{9*$kENAH41(-2eap literal 0 HcmV?d00001 diff --git a/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss b/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss index 95b3af290..652fc8ef9 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss @@ -76,8 +76,8 @@ border: none; &:after { position: absolute; - left: -15px; - top: -15px; + left: -35px; + top: -25px; width: 100%; height: 100%; content: ""; @@ -104,7 +104,7 @@ span { display: inline-block; vertical-align: top; - padding: 8px 14px; + padding: 7px 14px; color: #374151; border-radius: 6px; background: #fff; @@ -140,8 +140,20 @@ } } .about-content { - overflow: hidden; + &:after { + display: block; + clear: both; + content: ""; + } .details { + @include media-breakpoint-up(md) { + width: calc(100% - 32% - 35px); + margin-right: 57px; + } + @include media-breakpoint-up(lg) { + width: calc(100% - 32% - 57px); + margin-right: 57px; + } .wrap-instructor-info { display: none; } @@ -238,6 +250,16 @@ background: $primary-light; padding: 24px; border-radius: 8px; + @include media-breakpoint-up(md) { + width: 32%; + } + h2 { + color:#111827; + font-size: 20px; + line-height: 28px; + font-weight: 700; + margin: 0 0 20px; + } header { padding: 0; margin: 0; @@ -249,6 +271,14 @@ .social-sharing { height: auto; text-align: left; + .sharing-message { + background: white; + border: none; + border-top: 4px solid $primary; + color: #000; + font: 10px/15px $font-family-title; + padding: 10px; + } .share { width: auto; height: auto; diff --git a/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss b/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss index a26138800..cf991fb2c 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss @@ -4,7 +4,7 @@ .courses-container { padding: 25px 0; @include media-breakpoint-up(md) { - padding: 100px 0; + padding: 30px 0; } } .course-holder { @@ -40,10 +40,15 @@ background: #fff; .course-image { .cover-image { - height: auto; + height: 162px; &:before { display: none; } + img{ + object-fit: cover; + object-position: center; + height: 100%; + } } } .course-info { @@ -120,7 +125,7 @@ .saerch-bar-discover { margin: 0 0 25px; @include media-breakpoint-up(md) { - margin: 0 0 50px; + margin: 0 0 30px; } &:after { display: block; diff --git a/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss b/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss index 85fa2b896..237f05191 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss @@ -1,5 +1,5 @@ // Include custom dashborad -#content.content-wrapper { +.window-wrap #content.content-wrapper { padding: 0 !important; margin: 0 !important; max-width: 100%; @@ -60,7 +60,7 @@ font-size: 14px; color: #6B7280; @include media-breakpoint-up(md) { - margin: 0 0 75px; + margin: 0 0 30px; font-size: 16px; line-height: 20px; } diff --git a/tutorindigo/templates/indigo/lms/static/sass/extra/_header.scss b/tutorindigo/templates/indigo/lms/static/sass/extra/_header.scss index fa0c74caa..48e06df08 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/extra/_header.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/extra/_header.scss @@ -53,7 +53,27 @@ header.global-header { margin: 0; position: relative; .toggle-user-dropdown { - padding: 9px; + padding: 9px 15px; + background: $primary-light; + color: $primary; + font-size: 14px; + font-weight: 500; + line-height: 20px; + border-radius: 6px; + margin: 12px 0; + &:after { + margin: 4px 0 0 4px; + border: 2px solid #15376D; + border-width: 2px 2px 0 0; + transform: rotate(135deg); + content: ""; + height: 5px; + position: relative; + top: 2px; + width: 5px; + display: inline-block; + vertical-align: top; + } } .dropdown-user-menu { position: absolute; @@ -73,7 +93,7 @@ header.global-header { } a { box-sizing: border-box; - padding: 16px; + padding: 10px; font-size: 14px; line-height: 20px; color: $light-drak; @@ -130,4 +150,10 @@ header.global-header { margin: 0 auto; padding: 0 15px; max-width: 1090px; + box-sizing: border-box; + &:after { + display: block; + clear: both; + content: ""; + } } \ No newline at end of file diff --git a/tutorindigo/templates/indigo/lms/static/sass/home/_home.scss b/tutorindigo/templates/indigo/lms/static/sass/home/_home.scss index 994d992d6..f7bf44ad7 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/home/_home.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/home/_home.scss @@ -26,3 +26,108 @@ section.home { } } } +#main .home.style-logout { + header { + .outer-wrapper { + .title { + width: 100%; + float: none; + margin: 0; + padding: 30px 0 0; + min-height: 20px; + @include media-breakpoint-up(sm) { + padding: 50px 0 0; + } + .heading-group { + margin: 0 0 25px; + text-align: left; + padding: 0; + @include media-breakpoint-up(sm) { + margin: 0 0 45px; + } + h1 { + color: #111827; + font-size: 20px; + font-weight: 700; + line-height: 30px; + margin: 0 0 8px; + text-align: left; + @include media-breakpoint-up(md) { + font-size: 24px; + font-weight: 700; + margin: 0 0 12px; + } + } + p { + font-size: 16px; + line-height: 20px; + color: #6B7280; + font-style: normal; + margin: 0; + } + } + .course-search { + padding: 0; + .search-field-wrapper { + &:after { + clear: both; + content: ""; + display: block; + } + .button-holder { + float: right; + button { + position: static; + margin: 0 0 0 16px; + min-width: 90px; + color: #fff; + font-size: 16px; + font-weight: 500; + line-height: 26px; + text-align: center; + padding: 6px; + height: 38px; + border-radius: 6px; + background: $primary; + font-family: $font-family-title; + border: none; + @include media-breakpoint-up(sm) { + min-width: 100px; + } + &:hover { + background: $primary; + opacity: .8; + } + } + } + .input-holder { + overflow: hidden; + border-radius: 6px; + background: $primary-light; + padding: 0 0 0 33px; + position: relative; + display: block; + svg { + position: absolute; + left: 12px; + font-size: 20px; + top: 10px; + } + input { + border: none; + box-shadow: none; + height: 38px; + width: 100%; + background: none; + outline: none; + font-size: 14px; + line-height: 20px; + padding: 9px 10px; + } + } + } + } + } + } + } +} \ No newline at end of file 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 f448d3a70..6fd42329c 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 @@ -245,6 +245,7 @@ nav.wrapper-preview-menu { @import '../../../dashbord/dashbord'; @import '../../../courseware/discover'; @import '../../../courseware/about'; +@import '../../../home/home'; diff --git a/tutorindigo/templates/indigo/lms/templates/course.html b/tutorindigo/templates/indigo/lms/templates/course.html index 52a8c1697..bb2aae8e1 100644 --- a/tutorindigo/templates/indigo/lms/templates/course.html +++ b/tutorindigo/templates/indigo/lms/templates/course.html @@ -8,7 +8,7 @@
- ${course.display_name_with_default} ${course.display_number_with_default} + ${course.display_name_with_default} ${course.display_number_with_default}