From 6590d24151c556321489b7c362d78bb224107c5b Mon Sep 17 00:00:00 2001 From: Maharshi Patel Date: Fri, 15 Sep 2023 12:04:17 +0530 Subject: [PATCH] fix: dark mode, timeline, logo colors * changed variables from gray-* to dark mode compatible ones. * timeline style fixes * change logo with new black colors. --- .../print_format_builder.css | 4 +- frappe/public/css/bootstrap.css | 4 +- frappe/public/images/frappe-favicon.svg | 6 +- .../public/images/frappe-framework-logo.png | Bin 1978 -> 3109 bytes .../public/images/frappe-framework-logo.svg | 2 +- frappe/public/images/frappe-logo.png | Bin 1978 -> 3109 bytes .../js/form_builder/components/FieldTypes.vue | 2 +- .../js/frappe/file_uploader/FileUploader.vue | 32 +++---- .../js/frappe/form/footer/form_timeline.js | 4 + frappe/public/js/frappe/list/list_sidebar.js | 2 +- .../public/js/frappe/ui/toolbar/navbar.html | 2 +- frappe/public/scss/common/buttons.scss | 19 ++-- frappe/public/scss/common/controls.scss | 2 +- frappe/public/scss/common/css_variables.scss | 11 ++- frappe/public/scss/common/flex.scss | 2 +- frappe/public/scss/common/global.scss | 2 +- frappe/public/scss/common/grid.scss | 9 +- frappe/public/scss/common/icons.scss | 2 +- frappe/public/scss/common/quill.scss | 10 +-- frappe/public/scss/desk/css_variables.scss | 2 + frappe/public/scss/desk/dark.scss | 85 ++++++++++++------ frappe/public/scss/desk/desktop.scss | 30 +++---- frappe/public/scss/desk/filters.scss | 1 + frappe/public/scss/desk/form.scss | 48 ++++++++-- frappe/public/scss/desk/frappe_datatable.scss | 4 +- frappe/public/scss/desk/global.scss | 3 + frappe/public/scss/desk/list.scss | 2 +- frappe/public/scss/desk/navbar.scss | 5 +- frappe/public/scss/desk/page.scss | 2 +- frappe/public/scss/desk/sidebar.scss | 4 +- frappe/public/scss/desk/theme_switcher.scss | 15 +++- frappe/public/scss/desk/timeline.scss | 14 +-- frappe/public/scss/desk/variables.scss | 2 +- frappe/public/scss/element/checkbox.scss | 22 ++--- frappe/public/scss/espresso/_colors.scss | 2 + frappe/public/scss/espresso/_typography.scss | 5 +- frappe/templates/styles/discussion_style.css | 2 +- 37 files changed, 232 insertions(+), 131 deletions(-) diff --git a/frappe/printing/page/print_format_builder/print_format_builder.css b/frappe/printing/page/print_format_builder/print_format_builder.css index 0c4a50f17c..b2ca181345 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.css +++ b/frappe/printing/page/print_format_builder/print_format_builder.css @@ -71,7 +71,9 @@ } .print-format-builder-section-head .section-label { - @include get_textstyle("lg", "medium"); + font-size: var(--text-lg); + font-weight: var(--weight-medium); + letter-spacing: 0.015em; color: var(--text-color); vertical-align: middle; margin-left: var(--margin-sm); diff --git a/frappe/public/css/bootstrap.css b/frappe/public/css/bootstrap.css index d4ce177bae..ab165529f8 100644 --- a/frappe/public/css/bootstrap.css +++ b/frappe/public/css/bootstrap.css @@ -2622,8 +2622,8 @@ tbody.collapse.in { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, .15); border-radius: 4px; - -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); - box-shadow: 0 6px 12px rgba(0, 0, 0, .175); + -webkit-box-shadow: 0px 0px 1px rgba(0,0,0,0.200), 0px 1px 3px rgba(0,0,0,0.050), 0px 10px 24px -3px rgba(0,0,0,0.100); + box-shadow: 0px 0px 1px rgba(0,0,0,0.200), 0px 1px 3px rgba(0,0,0,0.050), 0px 10px 24px -3px rgba(0,0,0,0.100); } .dropdown-menu.pull-right { right: 0; diff --git a/frappe/public/images/frappe-favicon.svg b/frappe/public/images/frappe-favicon.svg index 40abde3d41..f4bb424bca 100644 --- a/frappe/public/images/frappe-favicon.svg +++ b/frappe/public/images/frappe-favicon.svg @@ -2,16 +2,16 @@ - + diff --git a/frappe/public/images/frappe-framework-logo.png b/frappe/public/images/frappe-framework-logo.png index b9b6380c822c664927ec5c6db4f746bee74497bc..226a92fa9d69f9232fee8d65f31d37397fb75457 100644 GIT binary patch literal 3109 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 diff --git a/frappe/public/images/frappe-framework-logo.svg b/frappe/public/images/frappe-framework-logo.svg index 398c360a4a..1c3e2d821b 100644 --- a/frappe/public/images/frappe-framework-logo.svg +++ b/frappe/public/images/frappe-framework-logo.svg @@ -1,5 +1,5 @@ - + diff --git a/frappe/public/images/frappe-logo.png b/frappe/public/images/frappe-logo.png index b9b6380c822c664927ec5c6db4f746bee74497bc..226a92fa9d69f9232fee8d65f31d37397fb75457 100644 GIT binary patch literal 3109 zcmdT`hf~wp7QVk91|=xqqbnuwT+2!m2+|@TNEwvpq7;FIrl5c!QbLDBhDDZ@vY^1D zDHfC#fy5|XQGeTzNfB81dx)GfLs2=%7SJQi-KQcD3U{_U4QiMw^PBI~@MhaL?n8Tg#vet9^8?6V0;Sw|}EvX_$M*k?@HcZ`J>-5?US^ts&N#U8r@ z0s3k=9dEfjlbx87`P>T?<10Os>T2xh(9jEyoekHxpy)#NmrxPncstwY4;p*m= z*QsGjB~dlLuC1+&b1eAv0!9JccCB}|=cF#K$=EyT{my!4XQzkBuGG2|^hllHaegEy zB3?K8BJ>Tp7TE>$|C82rJKp<^*hJ*BuaY~3p)D~JC)&v{YgRSVxNmB5=_R0K3RhZp zgbAaV1{Wz*37HyhwxIv13vT07d^l5Lo*-Cj{M#*9-~7a9t_WMUJ&>IyrXOEeb7yzk z@C|=F9{;SNK~U<@a;+@Nmqz|dn1$Mu4bbSwr9AIMix+)^BIsjuyfZK!7yZFGO zhDO+8V%MI;Z%n49a2d$&mwmyHdSuQZMUnKlkHa%Ug0me83jc>y{Zj)S7s(P$o6C(U z+?n17b_gO%*0SS_#OMTzR<-wuCx4)?K7Z6fM}T+F(1M|c-1mME zX*ER0)JV*E4ke8QzXsNB2O6N-O*%vb=HpW3+nJdet2pym^jIna@QF#BS6w9YB;ghg zA~kE{G11C0YXNmNs0!<>lDd#+nteN;Y}Q6-MX2h2sT<@O*1mb z)e`*5GpXBUpzT&M@d@q{x!bL;ukX6NzBlkm?YHB0A}<@CJt+zK^x?UyO#HZy0&F>a zh1VMqwVB~jl!*j$zvEVzqiB@K^wN1ubRA$mJ&+kkL#z`wW1~t#g)hdc8PlS+q#gj;RH>XZnTn0h+ouhi_yz3F5ZqPQp}LgBI50_%qH({Yrw3tG8>@xn5oabE!HPH=ILOUL~E63 zwioeuyx`VtKAZJ|q8^N>d$gTdtPT_SRR7IGt5^A|WuYfkDlDE#hlnaTOrR+s+$ zG%?n<1;cDVWGw4peoB{o6m>4WV`O9`^R0;{pgekh{Z5rRE-}gE-lWeqXX;;^OO==yi+&?z!naYvoSUksC zaDt$TLzpLw>DI+4-#2gWQ!H&S-3CSZMx2dLM_<>@*o)Pju?HFF8Z-Jw*G4iNR2(gz z?~!QBR?bzl{t`Eh+q-%%1C8?3@otH)*Qv(KAJKqS>@jzB1{xdfUb@gY<5;Kj*z7gV z=;`LsisLyca9fLq;lc^-Nn{1`6_P!I zd>I(3)EF2VS{N990ficX>Pih57+xhXFj&oCU=S~uvn$XBDAAG{;hE;^%b*2hb1<+n z3NbJPS&Tr)z$nE4G7ZRL@M4sPvx68lplX;H7}_%#SfFa6fHVkr05M1pgl1mAh%j*h z6I^x50%kaSDoESPtEbijDb50q$YKTtZeb8+WSBKaf`Ng_C^ICYB*NFnDmgz_FEJ%Q zDOIl`w*aJz!KT6r$jnVGNmQuF&B-gas<2f8tFQvHLBje<3ScEA*|tg%z5xo(`9-M; zrg|oN21<5Z3JMA~MJZ`kK`w4k?LeNbQbtKhft9{~d3m{Bxv^e;QM$gNrKP35fswwE zkuFe$ZgFK^Nn(X=Ua>O75STeGsl~}fnFS@8`FRQ;a}$&DOG|8(lt3220mPjpnP~`{ z@`|C}0(wv%B%^PrXP}QwTWUon4s9SAh&HglAlBJ{472ht%1i}1800KFLmRLKC}Ifb z*?>&3a?a1mFA6S5Oil$UM;Ag@9gta(niJuYnVXtd47S0-0ICUH2CL3Ugia$fOJto$ zGEkj1`k+un3S~$Xf<=LGXvbxv4^IzvTuE17Gy-!+lBbJfNCo5Dxwb`D90c5=-Tp{) zbwmpk@bn#Ev|!M5Wzkfb)8IUzn8hebNvP|H>w%_?<*wV0HJA4s*<};_O7H#bRbMmG zmd^8kUmV?-UTs}z%j5J}tw5{&(rK@IauwQ%eno9hfkw{Wpj69bFC91do%4Yg-iGiA`ZLSn}kd-64T;ZZAfOpic$z zi5KBcPh^1Nz%_2|GjeO&d>UByRTF({@|T8f7krjV#|Nu zD%UX_@~SlxT~`S(OvXsN-%6UP%mzUfxPLG;gy3TLGWb?z9SI3{5I$dpoSKpVY zWe<1Xnfm?H8tZwxwq5UEy?=I9^Uh-|Yc3tutzG+M^|jm|3*3(z@k9kJK5c4vjJ4YG z;v&8+svJ3AUS52iof>vVH-o=~i~Y>SOxyggfosm3StC2+qEuz6&8EdtiMJUfE=@}> zHQ`z5cEgOJZOhY0SzhN=g4=i-6mu)X+z(I4YRP3z@Q9vw^`gNN%9J;}U+4O}{Qm~? z-En4B%cn8?zx(uYddJK}YlFO3=BM8{OMkJ;jlagfQ-Ax{ed)8NE1vA>l{uOJ(;_OF zDfrluUZa;iTN2gepWi!o_W13;Aw6NmV(Q!1827KeZ(6=!W}#8kN7vtzKVIUD-otaV zXJ(@?O(mMQ{j_&z$)FJlCVj ztw*}=?3BudksnIm|C}s(CXwghganqRlZws;DiVzeMJEJ!INcOx$QZFWHwkj6wGUqD z<65Vda?L!=75(~qS9Il#ubWOEi(fmvI!eCeWtyocf9XZ#$_dl#R`1-grLW=j*I#e% t>5E-Y{ko<;llQix-SVv~x6ZKr!F=!ddGV?M|T3$vgl6 diff --git a/frappe/public/js/form_builder/components/FieldTypes.vue b/frappe/public/js/form_builder/components/FieldTypes.vue index a186effe59..ca215bd3aa 100644 --- a/frappe/public/js/form_builder/components/FieldTypes.vue +++ b/frappe/public/js/form_builder/components/FieldTypes.vue @@ -79,7 +79,7 @@ function on_drag_end(evt) { display: block !important; background-color: var(--bg-light-gray); border-radius: var(--border-radius); - border: 0.5px solid var(--gray-400); + border: 0.5px solid var(--dark-border-color); padding: 0.5rem 0.75rem; font-size: var(--text-sm); cursor: pointer; diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue index 66dcebd8c7..1df4d93aa2 100644 --- a/frappe/public/js/frappe/file_uploader/FileUploader.vue +++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue @@ -15,12 +15,12 @@
@@ -34,26 +34,26 @@ > diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js index 7a2a6d8bf9..d9961e9977 100644 --- a/frappe/public/js/frappe/form/footer/form_timeline.js +++ b/frappe/public/js/frappe/form/footer/form_timeline.js @@ -153,7 +153,9 @@ class FormTimeline extends BaseTimeline { this.timeline_items.push(this.get_modified_message()); this.timeline_items.push(...this.get_communication_timeline_contents()); this.timeline_items.push(...this.get_comment_timeline_contents()); + this.timeline_wrapper.addClass("only_communication_timeline"); if (!this.only_communication) { + this.timeline_wrapper.removeClass("only_communication_timeline"); this.timeline_items.push(...this.get_view_timeline_contents()); this.timeline_items.push(...this.get_energy_point_timeline_contents()); this.timeline_items.push(...this.get_version_timeline_contents()); @@ -166,6 +168,8 @@ class FormTimeline extends BaseTimeline { this.timeline_items.push(...this.get_info_timeline_contents()); this.timeline_items.push(...this.get_milestone_timeline_contents()); } + + } get_view_timeline_contents() { diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index 9c395972a7..41f8ca6c2d 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -275,7 +275,7 @@ frappe.views.ListSidebar = class ListSidebar { this.insights_banner = $(`
- ${message} ${cta} → + ${message} ${cta} →
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index 06b082f014..7ca3dd32d5 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -1,7 +1,7 @@