From d4077cd185f83569793abb7add89fcf18a03d58b Mon Sep 17 00:00:00 2001 From: Aryan Kaushik <34372791+Aryan20@users.noreply.github.com> Date: Thu, 15 Jul 2021 23:14:25 +0530 Subject: [PATCH] Modified title bar and updated the version of code --- lib-core.sh | 4 ++-- lib-install.sh | 4 ---- .../gtk/common-assets/sidebar-assets.txt | 6 ++++++ .../sidebar-view-active-180px-dark.png | Bin 0 -> 269 bytes .../sidebar-view-active-180px-dark@2.png | Bin 0 -> 367 bytes .../sidebar-view-active-180px.png | Bin 0 -> 269 bytes .../sidebar-view-active-180px@2.png | Bin 0 -> 367 bytes .../sidebar-view-checked-180px-dark.png | Bin 0 -> 263 bytes .../sidebar-view-checked-180px-dark@2.png | Bin 0 -> 363 bytes .../sidebar-view-checked-180px.png | Bin 0 -> 263 bytes .../sidebar-view-checked-180px@2.png | Bin 0 -> 363 bytes .../sidebar-view-hover-180px-dark.png | Bin 0 -> 261 bytes .../sidebar-view-hover-180px-dark@2.png | Bin 0 -> 382 bytes .../sidebar-view-hover-180px.png | Bin 0 -> 261 bytes .../sidebar-view-hover-180px@2.png | Bin 0 -> 382 bytes src/main/gtk-3.0/gtk.gresource.xml | 12 +++++++++++ src/main/gtk-3.0/make_gresource_xml.sh | 6 +++--- src/main/gtk-4.0/gtk.gresource.xml | 12 +++++++++++ src/main/gtk-4.0/make_gresource_xml.sh | 6 +++--- src/sass/_colors.scss | 19 +++++++++++++----- src/sass/cinnamon/_common.scss | 4 ++-- src/sass/gnome-shell/common/_panel.scss | 2 +- 22 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark@2.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px@2.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark@2.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px@2.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark@2.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px.png create mode 100644 src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px@2.png diff --git a/lib-core.sh b/lib-core.sh index 860d48f..dd5bac3 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -84,7 +84,7 @@ OPACITY_VARIANTS=('normal' 'solid') ALT_VARIANTS=('normal' 'alt') THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green' 'grey') ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void') -SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280') +SIDEBAR_SIZE_VARIANTS=('default' '180' '220' '240' '260' '280') PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75') NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy') @@ -500,7 +500,7 @@ check_param() { -n) name="${value}"; variant_found="skip" ;; -s) - for i in {0..4}; do + for i in {0..5}; do if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then sidebar_size="${value}"; variant_found="true"; break fi diff --git a/lib-install.sh b/lib-install.sh index 0e639bd..8f2fbdb 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -288,7 +288,6 @@ install_darky() { local opacity="$(destify ${1})" local theme="$(destify ${2})" - install_theme_deps sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-dark.scss" "${WHITESUR_TMP_DIR}/darky-3.css" sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark.scss" "${WHITESUR_TMP_DIR}/darky-4.css" } @@ -327,7 +326,6 @@ install_shelly() { TARGET_DIR="${6}" fi - install_theme_deps mkdir -p "${TARGET_DIR}" mkdir -p "${TARGET_DIR}/assets" @@ -397,8 +395,6 @@ install_theemy() { echo -e "${desktop_entry}" > "${TARGET_DIR}/index.theme" - install_theme_deps - #--------------------GTK-3.0--------------------# mkdir -p "${TMP_DIR_T}" diff --git a/src/assets/gtk/common-assets/sidebar-assets.txt b/src/assets/gtk/common-assets/sidebar-assets.txt index 328650d..124802c 100644 --- a/src/assets/gtk/common-assets/sidebar-assets.txt +++ b/src/assets/gtk/common-assets/sidebar-assets.txt @@ -1,3 +1,9 @@ +sidebar-view-hover-180px +sidebar-view-active-180px +sidebar-view-checked-180px +sidebar-view-hover-180px-dark +sidebar-view-active-180px-dark +sidebar-view-checked-180px-dark sidebar-view-hover-200px sidebar-view-active-200px sidebar-view-checked-200px diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..b48ecbd65303fde53294a76f9ad349414ae3c06e GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^TYy-Gg&9a%t?6h2Qk(@Ik;M!Qe1}1p@p%4<6riAF ziEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0v=0X`wFK>9y!pi(n?Do_Pi zNswPK1HXWjw2Yd8p)vcWd-6chC{Gv15Rc=@2@K3z&&>>BHl8Fgf#J2!DkgT7#ilE> zzqqI@HU?5ADvPawREf&s^dQL|Dch_sD=sc}>jyGSVzmsU!gibF=xhkMp27U&*<=Y* e>9kG(W5(0BjrXM1+_44P!r@qnQXs`y;1OBOz#!WW!i@b-Kc)f& zB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSQVH-0aRt)<34tw~y)S|4 zcuIo&f*BYE1Z5PJv~>&&jaM($&jN~X@pN$v$+-9SmLlJw01=mq{x=+0nL1OLeLVs) zR5p3P;B#P{)T%Jyg2~fdzU~?CpPPPP_u$9Opnp+Yo^N{Ce0cr~2z@??11S8SGLf85b5fHnZ_!Fy=Dm z+KKoI)qZq)?YZu=8~^8-GlThlX|5O6^w+X{?~wXBdtd1Nq)5Fy`;&_cl(ZK!?f|-< N!PC{xWt~$(698LLn$!RQ literal 0 HcmV?d00001 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px.png new file mode 100644 index 0000000000000000000000000000000000000000..219a997bb97f4b2def708d01c92bed13c2bbb0a7 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^TYy-Gg&9a%t?6h2Qk(@Ik;M!Qe1}1p@p%4<6riAF ziEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0v=0X`wFK$?L;kbyyffdOa@ zCm8WEFmQvpTzfR5ErIe}B|(0{4EzF8(lTlWhQ{oh?#Tm1qdZ+4Lp+WrConK?JvTFi z*?5w~1cui>tC-kT7Mrfj{^Fvt*ceEes4TVyQY9*j(}N^?q-?Xkthl(?tslrRiPbWY u3fpaxqq8C4dIs~8XOksNrPDeEj2TbgHr|t3bH^5F3xlVtpUXO@geCywmrDEq literal 0 HcmV?d00001 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-active-180px@2.png new file mode 100644 index 0000000000000000000000000000000000000000..a486a67be2e03cc4123177e546b214b8edcc1ea1 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0y~yV9WrrEm)X=q>@qnQXs`y;1OBOz#!WW!i@b-Kc)f& zB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSQVH-0aRt&~Ai%)D4>Sx+ z0vSAD#Ld6}w42LtHMb{F5l=~wUoZosfS`<`lD3Y4q4Da)`dL8nEuJopAsP4H-csZ{ z6d>Yq(f@`6D^q6*v#&=$hRP=I7kmzklUfxfTrhc>%hx^Q{d3dr>mK}=8T2n|%kvFy zDzm)S#@;AfKQlb>&cY@;tHt)W_VBzm6WaUDEncpB;&#Y$7VKO48~l>Tssk8q1umbuRYg&cH{p%b7nB#FU|GBn*Lgr?;TQKXYUKW dpA@N=XMb{Wfs*!O#vLHfd%F6$taD0e0s!#pd2av! literal 0 HcmV?d00001 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..8fd196a893d67d6d78bbd19133291c2d875c6a10 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^TYy-Gg&9a%t?6h2Qk(@Ik;M!Qe1}1p@p%4<6riAF ziEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0x00X`wFK>9xp@Y>hz5Xgd( zAirP+ZXOX)8CeyzFSeYEfr1g9E{-7{$CDEnn74NEt!n(Hz@~EGl4EE>L&_Gm(%w85 zBdg|JZrhb4V;y4`-=5g>Zh?`6Y1Ne%fs5UH<$#QgT_FjATUM84-iSz87AxHDIAs>^ dW`~ZM3<+iPcYO?yx(Bp_!PC{xWt~$(698O{WcC06 literal 0 HcmV?d00001 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px-dark@2.png new file mode 100644 index 0000000000000000000000000000000000000000..c14de82e417bc1349ea940f2e9457bb12e68a43f GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0y~yV9WrrEm)X=q>@qnQXs`y;1OBOz#!WW!i@b-Kc)f& zB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSQVj43aRt)<@q+V;uYUp+ zahC-71v4=6@QO-EDk!R`@hNcK0t#>Oba4#HxcBy!F5jU55toPIw^$V>PF>R=AhK(k z>VsX)kGfKrRknUnzZ06|T{M6G?Kzv9&YxehWtBy#+Rfkl{CA#HyKS7l&Syt9+g**t z?)PJ6m2B;{%UE13UVG84KBi=K@4VPA-qL$_yl|BMTY6DVF5|)i$7VKODH9Av2}{X| zg)bKN#wqp9zg(8~Y(n!tKk3-~=Sze>^G)g7_3X_@uOE-fe(&D#mtoasg?rx*8OH$K O&*16m=d#Wzp$PyEBA;mh literal 0 HcmV?d00001 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px.png new file mode 100644 index 0000000000000000000000000000000000000000..60e291de20de0093d277259a98fc7c4a3391fe3f GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^TYy-Gg&9a%t?6h2Qk(@Ik;M!Qe1}1p@p%4<6riAF ziEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0x00X`wFK$?L;oPj|UXaxfU z570a?;sbI8m+V^tl;kW4@(X6*<`EHY`C;uzv_JUM}Zd21Kns>W{$ zY$^vXIff=Qq-#Z6_Oyh tWp!ERjfjM0vBK?+Q)cmQcIcSNkWe;%*T(>2 literal 0 HcmV?d00001 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-checked-180px@2.png new file mode 100644 index 0000000000000000000000000000000000000000..f9b87e1b852ef6c1311e855f1bbbe0e8d623a2c7 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0y~yV9WrrEm)X=q>@qnQXs`y;1OBOz#!WW!i@b-Kc)f& zB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSQVj43aRt&~Aj-fX!oa}8 zz`)JG0JM(-jQD`|F4$}G3#fv-B*-tAfsuz-R6}r10mBOsD^^5wQ&?N7o`SWkj+1zyg{E{uJEK1dG z{@&-m^PJjk zi)wNi7Zx}+v++uqU@%HpN=__%v9LEzsc-(}vb1Ltn*aGp$L2p@BJ`PWO5d($Z$5hc fcvSX#_l~~|t3E5-`+mqc2IO&1S3j3^P69xp@Y>hz5Xgd( zAirP+b`D-XAz=wg?+1sE00qN5T^vI^jwdHDFmLVRTh;hYg-zwaCCAW&hLkOArM-DB zMpn(c+_o!9#yZ9>zCE$$-2x*C)2b^k0vEgY$^jV}yFwB|)|ExSyd06RELOOE7w=}5 bj+qSd<@5h!C4TJ#+Q8uH>gTe~DWM4f;Rt0{ literal 0 HcmV?d00001 diff --git a/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark@2.png b/src/assets/gtk/common-assets/sidebar-assets/sidebar-view-hover-180px-dark@2.png new file mode 100644 index 0000000000000000000000000000000000000000..4c727f2b6a3a7cfb17d038b49d090acc62e916b8 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0y~yV9WrrEm)X=q>@qnQXs`y;1OBOz#!WW!i@b-Kc)f& zB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSQV;M6aRt)04ojsyv<5p1XWbrOdIl z#xHt}e=R&)8gbp@%N6O`DKD0q|5Cd+*Su=Ni_PZ0G%tqde~Dgn*yh3l$7VKODU%Eg z#tWef&zvuMFXF$KVS94xy%!Jb)6zaW)~jDs&Mygm;Q2J}k!(ijgO97u?>o9`=G&uh bkN;$}D%=0YQrWr)=oJP}S3j3^P6$r;B5V$MNI@2Ij3@e5)G2sj#UW zxa1g`(2%l)t+Y4K#mK68m)mwl$ymqO#kVK+yjx%-VOn+NMc`uhUO6BmV^>H*$hxxV nmzN_Fmc@qnQXs`y;1OBOz#!WW!i@b-Kc)f& zB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSQV;M6aRt&yK!kxoh=D*6B~N1!_1k|4ie21X7}UOoXqQ894|$;gA39{?rxd%8G=WZZju zYauU_qlC*tTfGXMcOsm;3k0S(Flv06TF^9ym3fwvfCiH|Q+;5BN7`SV%Jog>&oB8B zy7fkT>h!lNPiM8~E}v5=b8M~gi(cbj3(uBDT=)2LMY?v%i>2nj)Gp37ubS{;v-vO0 zi{bfSq8A;uxv;>onT=POX=ZoHp`0r)dp4@ux#l!lvw9k(9>KB#sOM)MG tK8<@Mn-Tipassets/paned-separator@2.png assets/paned-separator-dark.png assets/paned-separator-dark@2.png + assets/sidebar-view-hover-180px.png + assets/sidebar-view-hover-180px@2.png + assets/sidebar-view-active-180px.png + assets/sidebar-view-active-180px@2.png + assets/sidebar-view-checked-180px.png + assets/sidebar-view-checked-180px@2.png + assets/sidebar-view-hover-180px-dark.png + assets/sidebar-view-hover-180px-dark@2.png + assets/sidebar-view-active-180px-dark.png + assets/sidebar-view-active-180px-dark@2.png + assets/sidebar-view-checked-180px-dark.png + assets/sidebar-view-checked-180px-dark@2.png assets/sidebar-view-hover-200px.png assets/sidebar-view-hover-200px@2.png assets/sidebar-view-active-200px.png diff --git a/src/main/gtk-3.0/make_gresource_xml.sh b/src/main/gtk-3.0/make_gresource_xml.sh index 0aa3774..d9a944b 100755 --- a/src/main/gtk-3.0/make_gresource_xml.sh +++ b/src/main/gtk-3.0/make_gresource_xml.sh @@ -1,8 +1,8 @@ #! /bin/bash -INDEX="../../assets/gtk-3.0/common-assets/assets.txt" -SINDEX="../../assets/gtk-3.0/common-assets/sidebar-assets.txt" -WINDEX="../../assets/gtk-3.0/windows-assets/assets.txt" +INDEX="../../assets/gtk/common-assets/assets.txt" +SINDEX="../../assets/gtk/common-assets/sidebar-assets.txt" +WINDEX="../../assets/gtk/windows-assets/assets.txt" if [ -f gtk.gresource.xml ]; then rm -rf gtk.gresource.xml diff --git a/src/main/gtk-4.0/gtk.gresource.xml b/src/main/gtk-4.0/gtk.gresource.xml index fc02016..559f526 100644 --- a/src/main/gtk-4.0/gtk.gresource.xml +++ b/src/main/gtk-4.0/gtk.gresource.xml @@ -121,6 +121,18 @@ assets/paned-separator@2.png assets/paned-separator-dark.png assets/paned-separator-dark@2.png + assets/sidebar-view-hover-180px.png + assets/sidebar-view-hover-180px@2.png + assets/sidebar-view-active-180px.png + assets/sidebar-view-active-180px@2.png + assets/sidebar-view-checked-180px.png + assets/sidebar-view-checked-180px@2.png + assets/sidebar-view-hover-180px-dark.png + assets/sidebar-view-hover-180px-dark@2.png + assets/sidebar-view-active-180px-dark.png + assets/sidebar-view-active-180px-dark@2.png + assets/sidebar-view-checked-180px-dark.png + assets/sidebar-view-checked-180px-dark@2.png assets/sidebar-view-hover-200px.png assets/sidebar-view-hover-200px@2.png assets/sidebar-view-active-200px.png diff --git a/src/main/gtk-4.0/make_gresource_xml.sh b/src/main/gtk-4.0/make_gresource_xml.sh index 0aa3774..d9a944b 100755 --- a/src/main/gtk-4.0/make_gresource_xml.sh +++ b/src/main/gtk-4.0/make_gresource_xml.sh @@ -1,8 +1,8 @@ #! /bin/bash -INDEX="../../assets/gtk-3.0/common-assets/assets.txt" -SINDEX="../../assets/gtk-3.0/common-assets/sidebar-assets.txt" -WINDEX="../../assets/gtk-3.0/windows-assets/assets.txt" +INDEX="../../assets/gtk/common-assets/assets.txt" +SINDEX="../../assets/gtk/common-assets/sidebar-assets.txt" +WINDEX="../../assets/gtk/windows-assets/assets.txt" if [ -f gtk.gresource.xml ]; then rm -rf gtk.gresource.xml diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 030e4a8..96e4ea4 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -11,9 +11,9 @@ // Base colors $base_color: if($variant == 'light', #ffffff, #161925); -$text_color: if($variant == 'light', #c4c4c4, #e7e7e7); +$text_color: if($variant == 'light', #363636, #dadada); $bg_color: if($variant == 'light', #f5f5f5, #303643); -$fg_color: if($variant == 'light', #161925, #dedede); +$fg_color: if($variant == 'light', #242424, #dedede); $alt_fg_color: if($variant == 'light', #424242, #afafaf); $hint_fg_color: if($variant == 'light', #565656, #999999); @@ -72,13 +72,13 @@ $light_borders_color: if($variant == 'light', rgba(black, 0.08), r $dark_borders_color: if($variant == 'light', rgba(black, 0.08), rgba(black, 0.15)); $solid_borders_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 8%)); $dark_solid_borders_color: if($variant == 'light', darken($bg_color, 12%), darken($bg_color, 5%)); -$highlight_color: if($variant == 'light', rgba(white, 0.65), rgba(white, 0.1)); +$highlight_color: if($variant == 'light', rgba(white, 0.15), rgba(white, 0.1)); // Background colors $dark_bg_color: rgba(black, 0.6); $alt_dark_bg_color: rgba(black, 0.3); $solid_bg_color: if($variant == 'light', #eeeeee, #555555); // for gnome-shell keyboard -$alt_solid_bg_color: if($variant == 'light', #c0c0c0, #161925); // for gnome-shell keyboard +$alt_solid_bg_color: if($variant == 'light', #c0c0c0, #242424); // for gnome-shell keyboard // Link colors $link_color: #3484e2; @@ -102,6 +102,15 @@ $disabled_bg_color: if($variant == 'light', mix($bg_color, $base // Headerbar colors $header_bg: if($variant == 'light', #ffffff, #0c0e14); +@if $trans=='true' and $variant=='light' { + $header_bg: transparentize(#ffffff, 0.1); +} @else if $trans=='true' and $variant=='dark' { + $header_bg: transparentize(#0c0e14, 0.1); +} @else if $trans=='false' and $variant=='light' { + $header_bg: #ffffff; +} @else if $trans=='false' and $variant=='dark' { + $header_bg: #0c0e14; +} $dark_header_bg: if($trans == 'true', rgba($base_color, 0.95), $base_color); $header_highlight: if($variant == 'dark', #252525, #f5f5f5); @@ -163,7 +172,7 @@ $panel_fg: if($trans == 'true', white, $text_color); @if $trans == 'true' { $panel_bg: if($variant == 'light', rgba(white, $panel_opacity/2 + 0.08), rgba(black, $panel_opacity)); } @if $black == 'true' { $panel_fg: $text_color; } -$dash_bg: if($variant == 'light', rgba(#f1f1f1, $panel_opacity + 0.2), rgba(#222222, $panel_opacity/2 + 0.6)); +$dash_bg: if($variant == 'light', rgba(#d1d1d1, $panel_opacity + 0.33), rgba(#222222, $panel_opacity/2 + 0.6)); $dash_fg: if($variant == 'light', black, white); // Entry colors diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss index d149817..274c353 100644 --- a/src/sass/cinnamon/_common.scss +++ b/src/sass/cinnamon/_common.scss @@ -601,8 +601,8 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) } .workspace-thumbnail-indicator { - outline: 2px solid red; - border: 1px solid green; + outline: 2px solid $borders_color; + border: 1px solid $highlight_color; } .window-close:rtl { diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss index 28b91a9..7c05bee 100644 --- a/src/sass/gnome-shell/common/_panel.scss +++ b/src/sass/gnome-shell/common/_panel.scss @@ -157,7 +157,7 @@ } Gjs_ui_panel_AppMenuButton.panel-button, - .menubar-button, // For Fildem global menu + // .menubar-button, // For Fildem global menu .desktop-name-label { // For Unite font-weight: bold !important; }