From d52653bef4eda976394642e10a3081636ae3e824 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Thu, 28 Feb 2013 01:20:46 +0530 Subject: [PATCH 1/4] Various fixes --- gtk-3.0/apps/granite-widgets.css | 48 +++++++++++++------------------- gtk-3.0/gtk-widgets.css | 17 +++++++---- gtk-3.0/gtk.css | 2 +- gtk-3.0/settings.ini | 2 +- 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css index b7a14dc..ff2428d 100644 --- a/gtk-3.0/apps/granite-widgets.css +++ b/gtk-3.0/apps/granite-widgets.css @@ -2,7 +2,7 @@ * dynamic notebooks * *********************/ .dynamic-notebook { - background-color: shade(@theme_bg_color, 1.02); + background-color: shade(@theme_bg_color, 1.08); background-image: none; } @@ -32,7 +32,7 @@ border-width: 1px; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-color: shade(@theme_bg_color, 1.02); + background-color: shade(@theme_bg_color, 1.08); color: @theme_fg_color; } @@ -59,17 +59,15 @@ .content-view-window { border-width: 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.8); + border-color: shade(@theme_bg_color, 0.8); border-radius: 5px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (@theme_base_color), - to (shade(@theme_base_color, 0.97))); + background-color:shade(@theme_bg_color, 1.08); + color: @theme_fg_color; } .content-view .entry { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_base_color, 0.97)), - to (@theme_base_color)); + background-color: @theme_base_color; + color: @theme_text_color; } .content-view .title, @@ -110,9 +108,9 @@ border-width: 0 0 1px 0; border-style: solid; border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.96)), - to (shade(@theme_bg_color, 0.94))); + background-image: none; + background-color: @theme_bg_color; + -GtkWidget-window-dragging: true; } @@ -152,10 +150,8 @@ *************/ GraniteWidgetsStatusBar { padding: 1px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); - + background-image: none; + background-color: @theme_bg_color; box-shadow: inset 0 1px shade(@theme_bg_color, 0.8); } @@ -177,9 +173,8 @@ GraniteWidgetsPopOver { .popover_bg { background-color: transparent; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@menu_bg_color, 1.02)), - to (shade(@menu_bg_color, 1.0))); + background-image: none; + background-color: @menu_bg_color; } GraniteWidgetsPopOver .sidebar.view, @@ -202,10 +197,8 @@ GraniteWidgetsPopOver .button:hover:active { } GraniteWidgetsPopOver .entry { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_base_color, 0.97)), - to (@theme_base_color)); - + background-image: none; + background-color: @theme_base_color; color: @theme_text_color; } @@ -216,10 +209,9 @@ GraniteWidgetsPopOver .entry { .app:hover, .app:focus { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); - + border-color: shade(@theme_selected_bg_color, 0.90); + background-image: none; + background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } @@ -269,4 +261,4 @@ GraniteWidgetsPopOver .entry { } .notify .critical { -} \ No newline at end of file +} diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 6c003a4..b684152 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -439,10 +439,15 @@ column-header:last-child .button { /**************** * drawing area * ****************/ + GtkDrawingArea { background-color: transparent; } +GtkDrawingArea:insensitive { + background-color: shade(@theme_bg_color, 0.90); +} + /************ * gucharmap * *************/ @@ -941,10 +946,10 @@ GtkTreeMenu .menuitem * { .notebook tab { padding: 3px; - border-color: shade(@theme_bg_color, 0.90); + border-color: shade(@theme_bg_color, 0.85); border-radius: 2px; background-image: none; - background-color: shade(@theme_bg_color, 0.95); + background-color: shade(@theme_bg_color, 0.90); } .notebook tab:active { @@ -1164,18 +1169,18 @@ GtkScale.mark { GtkScale.trough { margin: 7px 0; - border-color: shade(@theme_bg_color, 0.8); + border-color: shade(@theme_bg_color, 0.85); border-radius: 2px; background-image: none; - background-color: shade(@theme_bg_color, 0.95); + background-color: shade(@theme_bg_color, 0.85); } GtkScale.trough.vertical { margin: 0 7px; - border-color: shade(@theme_bg_color, 0.8); + border-color: shade(@theme_bg_color, 0.85); border-radius: 2px; background-image: none; - background-color: shade(@theme_bg_color, 0.95); + background-color: shade(@theme_bg_color, 0.85); } .menubar .menuitem .scale.highlight.left, diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index ed1e514..d6957fb 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,7 +1,7 @@ /* Default color scheme */ @define-color bg_color #dedede; @define-color fg_color #555555; -@define-color base_color #f1f1f1; +@define-color base_color #f9f9f9; @define-color text_color #555555; @define-color selected_bg_color #d64937; @define-color selected_fg_color #f9f9f9; diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index bf9b5ee..7556e6c 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,4 +1,4 @@ [Settings] -gtk-color-scheme = "base_color:#eeeeee\nbg_color:#dddddd\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#888888\nfg_color:#888888;\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#569be4" +gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555;\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937" gtk-auto-mnemonics = 1 gtk-visible-focus = automatic From b92d35ee36f3e8aad750fd803745f5a8ccba0f83 Mon Sep 17 00:00:00 2001 From: Joern Konopka Date: Sat, 2 Mar 2013 13:37:13 +0100 Subject: [PATCH 2/4] Flat Assests Icons --- .../assets/checkbox-checked-insensitive.svg | 19 +++----------- .../gtk-3.0/assets/checkbox-checked.svg | 15 ++--------- .../assets/checkbox-mixed-insensitive.svg | 9 +------ svg-sources/gtk-3.0/assets/checkbox-mixed.svg | 22 ++-------------- .../gtk-3.0/assets/checkbox-unchecked.svg | 15 ++--------- .../assets/menuitem-radio-checked-hover.svg | 16 +++--------- .../menuitem-radio-checked-insensitive.svg | 16 +++--------- .../gtk-3.0/assets/menuitem-radio-checked.svg | 16 +++--------- svg-sources/gtk-3.0/assets/radio-mixed.svg | 16 ++---------- .../assets/radio-selected-insensitive.svg | 12 +-------- svg-sources/gtk-3.0/assets/radio-selected.svg | 26 ++----------------- .../gtk-3.0/assets/radio-unselected.svg | 18 +++---------- 12 files changed, 28 insertions(+), 172 deletions(-) diff --git a/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg b/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg index f3ef9fa..94fd39e 100644 --- a/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg +++ b/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg @@ -15,7 +15,7 @@ id="svg2" version="1.1" inkscape:version="0.48.4 r9939" - sodipodi:docname="checkbox-checked.svg"> + sodipodi:docname="checkbox-checked-insensitive.svg"> - image/svg+xml - + @@ -111,7 +100,7 @@ id="layer1" transform="translate(0,-1036.3622)"> - - - - - + sodipodi:docname="menuitem-radio-checked-hover.svg"> image/svg+xml - + @@ -84,16 +84,6 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)"> - + sodipodi:docname="menuitem-radio-checked-insensitive.svg"> image/svg+xml - + @@ -96,16 +96,6 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)"> - + sodipodi:docname="menuitem-radio-checked.svg"> image/svg+xml - + @@ -96,16 +96,6 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)"> - - - - @@ -66,7 +54,7 @@ inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" - inkscape:window-width="1280" + inkscape:window-width="1366" inkscape:window-height="711" inkscape:window-x="0" inkscape:window-y="25" @@ -98,7 +86,7 @@ transform="translate(0,-1036.3622)"> - - Date: Sat, 2 Mar 2013 13:47:21 +0100 Subject: [PATCH 3/4] Exported new flat assets --- gtk-3.0/assets/checkbox-checked-insensitive.png | Bin 663 -> 494 bytes gtk-3.0/assets/checkbox-checked.png | Bin 692 -> 525 bytes gtk-3.0/assets/checkbox-mixed-insensitive.png | Bin 266 -> 254 bytes gtk-3.0/assets/checkbox-mixed.png | Bin 523 -> 252 bytes gtk-3.0/assets/checkbox-unchecked.png | Bin 507 -> 232 bytes gtk-3.0/assets/menuitem-radio-checked-hover.png | Bin 298 -> 257 bytes .../menuitem-radio-checked-insensitive.png | Bin 300 -> 249 bytes gtk-3.0/assets/menuitem-radio-checked.png | Bin 298 -> 250 bytes gtk-3.0/assets/radio-mixed.png | Bin 705 -> 538 bytes gtk-3.0/assets/radio-selected-insensitive.png | Bin 604 -> 549 bytes gtk-3.0/assets/radio-selected.png | Bin 778 -> 580 bytes gtk-3.0/assets/radio-unselected.png | Bin 736 -> 506 bytes 12 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.png b/gtk-3.0/assets/checkbox-checked-insensitive.png index 8ba72122dc604e2cb3215a434c25b737b48a2485..de1ae29dc9341017c389975da6bf49c1a6951e1f 100644 GIT binary patch delta 395 zcmV;60d)SC1?~foZGQo4Nkl1we9L)+8GEL10O07hrAF)k$)pd9y zExLhPv_4cqtHPhm1`TXeoHCBgnHJTlgGoxW`hMnpzIO&baeQ=iptY)iC^ON~mJr6F zskN%?mdZvdot{YEk@>!c|qQ{dF=JLv@BfLW#BlpTP^Q$CYu{_=s5_@%n%3!7z_s3w*5KTMJWZq zd^E~@G&%(E9DkUmNxo3@8nv5iZX4e}p2@8biG2Wo<&_l{Vle=eQaFwSKsXX1zPR`| z0AOo-2g5LYwcp-85->YAM{Z-&mnWB&#s>hbW-=s_DT2Wu`9c99#7KY%+UiJY{M-j2 p1f~7`ks^SOloz0t`0qNu19WMGOp3ak+yDRo07*qoLsWt1i~W-luK#o_tUA*^r@37X= z=~#@30a}B*-*?=Ou36vQAW0HLf@8^_d$-9Gn(lkXxxEWoessOwi^jS$$RJGkv1Q5qDWl?f}cgJKr z=G&LApwQF}ziw~a^zEIUcC^K77IRu>F~(5WHM2i6Mpq+1X_^LrwO)_4-Wnk&Ab>s- zfD*?syZd`>+Rw{NuCGSV>AO3N16n$#2%u>Ks>^wG9g z+r2~pbzKv}++_dofGCQVQr_7^p`~xEs*19#P*t3B|KWm968eJys^OpJ21QXk zFR>^J;y5CT1ZyoDn{SvtO_@GDvG;Bd&?SPRD9H1CVW4M|EQ>|t2p|N-Im_XP_biTa zfg3^~&n^q{e8$85<7d#uh{Pw8EE`U;F)u4^MBD diff --git a/gtk-3.0/assets/checkbox-checked.png b/gtk-3.0/assets/checkbox-checked.png index d53dd458f28e9e437f69654cfc2b616ac63051fc..183761f272721b3265f06610adda4dc2c2fa4545 100644 GIT binary patch delta 426 zcmV;b0agCA1&sudZGQoZNkl^%$A};9eY^J# zrzJEJSV~;T1%D1w&vCR+kjL#+Na>^!2>|ly8px}yPXibUWSbq=h|d^2tS|GlyZ-Io zm+o!?0603k$Zzm`zR6nxJstzVT2+J1)BHC8pv*UoWX(18oV`Ooihl&;lvh$RFlxFN zw02|;04VP6$KKqIQdmUk$T-Nqe-{ggKv-23(>};De(O?t7O6&M%m`(&63(FKjVxd74f{!9%WnnJ_ghXeTJa+Ev&OH{Bops9`__)pa z9_OATuUA)RRr3{)8ID!DB@!$f)qG{3UJnNAb)v{(t;LuSV}AlFl?oz)s^Yz;)9H|9 zZL-YKNSeW3BUv#ZGlTUyaU2uJ5!PD5&|*vgPztm^eZX(5Q=Pv{FglKiOzkxq7=S2> zh~tPjj)|fO5dj2|BCOy3MeEfI0Ld%IQ=WauPu9OJzQ zpaKwv25ZAUa({seB)eqazLWy-joXL_)<(Sq#ux(iv|c{LCx02Z{}3}gf{1Xi@dol7 zfN)|8bAAL>E&r$j5Cj3byF>PMlg`f{>_2~s;C&%dTY7|8+viffc?a(cQWt$| zY`5EFSsPVFPM;;dwb+Yz<{aVlRaE^E3IXR_Prx~cb17Mtq3W^M=LjdSASde7?k%AL z-un{HIZM(s?QTK0nn@Cf$P|G0N)%bDkDv5T`6#aUo-}o&X^Y*RKi@%fBN8k(lVqit gG&o*qE)p#N14*y~bd_a`U;qFB07*qoM6N<$g6Z26ZvX%Q diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png index 7ae096b239051fe329030688c08f129c5bf7b5be..aa01322a24306442701a3833b4c33328de060033 100644 GIT binary patch delta 61 zcmeBT`o}mSkFk1Uew-mwi8M!JBmWV{!~_3>Ux({|R|r*hIsZSnXG&T+LxEY8Qt^Z3 Q`V2te>FVdQ&MBb@0O~v!MgRZ+ delta 73 zcmeyz*u^ve-VgXGzrv(ewWlBc<6H0O)-yQ4mt9;41(C002ovPDHLk FV1oHxL2m#6 delta 424 zcmV;Z0ayO~0gD8XZGQoXNkl5eu*g&C&}%Rf#cH!COd0)Lx#~9VtMJu?nF3^7)_Pef;)_yKf_g z+d1D?x2~###eZ6T@%4Lk6Sg}5D5cdGc`lo+!{M+AMOJ{7fuh%Q%cqQjh=}T;j`xUka48!mO7>0ou10e`zMk%i&Jy7PN7yeXeW;_)ws6vfsj S8mx=}0000M^NklS>ClAmvHKiuat$SeO<{w@+v>OP;J>N-BxH7OZphH8as zB!qy7;O>-Cn5Kzg7#W71wzvLU`b0+76nNd}SYJUXS0RYo9p*j#_Ktx_X z+ZF{#DUov`=S)fo5dj1dt{_lV6{<=IVK<@xW`RekaMP#asaAIF{^IG z_fsrl0T!WIIsmFljByn_LRQ4u%YMs90b-1+fIGMIF1a% zNX}uu$$iV?tBIVx?+-xV_rw?oK`=8)xqm_)#9h~I0Dr$UO%#zAfKr^443U7yZD6Go zx~`||{_^|RpAYa^MdInwH0Mjxe)AIFmCqva^bg*8$Ps2Ho=A=W0000)-h`wiJBJ<#X68PF3lAn)RzAKh%+}*@ hgh|4Eve8pE28IAheQWb~R*M;cz|+;wWt~$(696;^FqQxS delta 174 zcmV;f08#&e0;&R#ZULu}ZyJBQzrS?<&A<@Nz`(%3%D}MHl~a5t!>Uz(i85gIk2m2Q zjEprf{$Bi_@% diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.png b/gtk-3.0/assets/menuitem-radio-checked-insensitive.png index acb5f48a92ba486c3acb6f11bda8bd252bf47be5..90b15715b32ff176c33b51aef43d5206bcaf74e5 100644 GIT binary patch delta 147 zcmV;E0BrxP0{H=uZhv-3L_t(IjqQ>l4uCKWMPCW%s@)Df!GRDHV7MJ>nuKD&EL(ug z5h{P$_tW2snNd?s)$}(2ZB7g!bWXLmh5SiSs}vOimSGPJ6Q} zT+Vk|5%8w60NELzXi&&tjd5|Rq#7D3=9nO(bZ!00?cMYVmJ*T1z74mw%RUinB1F2O>7L ejH5}JasvRFx+TIlc@w(;0000HqL delta 173 zcmV;e08;<@0jdI!ZULu}ZySF=<<1=S|6J@|-Y2J4A z-`|U2e0~Ooj+@fFqQ(piCFp9gdO`T_?_^@ca2oK3k%^NSF`Ne6XJ*?*j2Ht0jxe~) z%%A;(ok?8%&vy$31_p+kESx89Gx26)Q_F}iDF+1w2{SM-Fsxg*?kyoMHFymm1`K>k bq}Tue3Ewbs0Q@+^00000NkvXXu0mjfnWjoa diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png index 61779049be5f659ced5bc265f85902f154996308..ccd8b3416dbb0b24c000ea04912081f97deb2d2e 100644 GIT binary patch delta 439 zcmV;o0Z9JA1)2nqZGQomNklAg>ovwLF9djMPyklsi8B?yA}>9d1-VHj@X2C^)h4hQ|^YPFi3yfLo;Pys;C z+D;Gz@!`>Na+?eQVHj>79vvq^5X3!eI{+uiq&m54W~{ zO(s8Ieoxa2MStO`);irZ`KC>@)+t5aDvGpf^|(@0zM@u-D-=E{38fW9k-94Uc)h<- ze01>@01!pdj!+tEV|M{c6poy8y3uSt0D${vp9_i3xe0~7B;;r@pB*%sO#nc(S}hc? zn9nYS@=Xcl+7mQ#u|m&6sZfP4geH3g=`9Cf7A2YS%1k0$U&p=41dBM(<-!V$2P4(p$Y&O z!{JF7gi&-ctbww-<#~Gmm=%zNca4vt)as2&Wy!V+WnI^ylmY;xX^J?G5r*g8pWnMZ zrs9m-nueLnz zg?49SV-3PLm4E6@-F2OkWm(WP4N579$lR1t$mMbXAo;vG_WQm2N3G8v6ouQSRcN_I zr)-+$l%OD@pp=>l%}iif797_un^vJkk;jT6b+=S94a1m|l@chG70TWPhGD=hxh92o zb)nQ9*HOBzLqyPj`Vd#4`0_n;U5D*B)ze?66$JnyfPaWwNu2k3>MJtokWOLqJP5C? ztgKuI0DbTE!vAM&oY@Rv5S&o>TNkqF`~JN+j*-jd;5bgEaFeV^g8VBI$1#F|9|`4? z63YHC9M*zC(49CEX}U<5oQc_cFc@@);YCfzw`$Y#+8}q2+nwHcJWel1%ZiZ1Xf#T{ zb&h)=cUU()ue~tJnx?JZ-dJBM7K`P}MI{Np-|u#g+Px%67Dst;nPkUy>{e-c*>sC; t6#xeQ;G}L!ZhxXlL_t(Ijipn&Y8ycmJ!e)aREVwg11bCiYhzFve?S^-;Q`?y z2&2M{+@)}nEmWjT<3bokg>XEEY?}On3_;pPg)l1o1FDvQn`GytkY#T~;t+JI;ofr} zbMC#AgfhN3w2@WDyJ{e2)+9YXC9;kUG~TQJc+g5B?Sm z0CC*9o6TOGJa>bn7virnL(QJr=<*Ns@nRk|c>?5ey;pnmX1lwq9kHu92y8T@Ysg1{7}A r<6Q}c27oq%UTp0LV6`RO_MCqKta#}TdBRS-00000NkvXXu0mjfdg{u; delta 504 zcmVfN2p;XKfV#kAwbHK(}RIk;uvqZyHnD!3pNv#zltyQwcxJQg8!+JOFUkR!C$! z-Cpru!2n=PX{Xce6-i{BwUwdr=H|SJCQ{+m(}I(g;Ftf7!gW5k&+Y?Eo2B6Hh|p*> z#(e6|_}F+A0Dt;}{#qzLDwoTH<0M=5A;6#BaN20a6^;%MR;DMXRwpu<*@;YMc6xGZ z_2}?mCC;JH5|#HT=6q>8?mU;x-cFXC#C&O+V$Mqv0U!*c^#5Q0;E8I7a0N~}w`SH`|<-wpoGk0O`8UXC>?Qy={`?9|rPavW|@%^c5G{&3< z0O#EIIR4ifCBa!+r3cgL_KLMyEjp>!k=5&U@5<#%Zxq3qAXq!|S7z)Q>8!1QxCh_~ uh1O`j!-1gy;1+}jCI}t_7%HFjoPPtPLIBQDJ0k7?00009K4F3z>D;G*!Ca@MPYM@C-;_v>g{EtX)k|r|l@B99909+10!E5zK2;tn__O44Q*YO9^G(8;-!uevcnCw6H z9|2$k00O0YLI|hb*==6r3;$~sDTHtWrFsCca%*d=0fS!NyZ^wfR4UglaxUs5 zq8n>#-{Sal>wnW|bZj#5fo0hvDdl!<#6P|x4Nvgp?J)pgb!QLKYlBwIA`{E928m9d zm`vo>>Q41st>Fpui)Y0>KVNNi3awUmsyflP4PtWhZs+7bU#8i%y-7^2v8?807)%^# zt>dz|y0iD2;jfz3I%eX?B<5%~op?7lHi}2-wa=xUH(IgGY&tn3rjHaH9yZvZ4_@ox z*UM(0Oq!;r;rn-2DC0Xu*Z0TBxIY|(b7sz#IWu!M9E5XZ-0%AS_@77lzb#Y2->&md XsbuwFly}hy00000NkvXXu0mjf6g2Se delta 681 zcmV;a0#^OR1d0ZbZGQrXNklz5(AE3X$urZXx%7VBsY-HieZb(hA71K}+EBZmF?X;bF*Tn!S;>MG_ z)jjXrlY7r4X2v8w6pJ|~US*;JF%1Gj#HiF(|?2jm5RleAl@*fS&3OO zLz-q500#Yj-R-)bH|WoUX>-MK-T>f90V?ej_ehADTbWEU7Bkbju0sd`08mQ7_kFl- zukrh&(PE{3tvq*@LUYV06^pM(6YF$>$xa(`j*hCqK|5tEs7 zyWKhymjyAGJDrZ_`#zW%%#8fnIu7RwIMt&#)uT9^Dh diff --git a/gtk-3.0/assets/radio-unselected.png b/gtk-3.0/assets/radio-unselected.png index 9face32a318cddfcf838f1ba35f3af7bdea171a1..538ee5b1497e5889d9e9765a718afcebd029e6c3 100644 GIT binary patch delta 407 zcmV;I0cif<1^NS!ZGQoGNkldayM>!AEG*qeMP#7_a)Mtyzi(!w z8IY7+J~?+p@Pa@OL{CJ7U;(lKaoM+awp)*#0F0a)h{9WAOn=$wX6-ah4@E@0_tk2- z*n|*rsX08i_MM1uHvprL?u*tsd;Ij-y(CEvd?X6*pFDrD*J`!y-Xve`3E=+z{*S8q z{_7J-K`?s{i;F2&l3AtfUnX-2x|=-j#I z5;J4*e2AiTCf;JA9x?R*fQg61JS3)_$6@$wv0g0PX%I!*Onk|c=ZOPrmZjVGt4hL|1-Cf*WKj)EZQ8e`CC z1W-yr2=Nz`QV4PVW1rzl=t+nTQ&|0HbtKA^aA*F=Y9_n=up4OU)A4p>A zdD<6JN+_j3L?9vvA+B0*jsZ9j5tLF;O2X56Esc|V5`VyqP?4$$(M+hCGLZvwC3Y=b zy(JS5ZI*SMbF0-zuY*Md{F5^d9}8k0W?7b5Ymw(Un0Z#jC`$+D9GK@| ztBc{)Sn05-AZ^V196*U(bJ={&$`K Y0LM9E`2!umJOBUy07*qoM6N<$g4T~DiU0rr From b4c2577a484810b7ed1d09b9283a77841f2190db Mon Sep 17 00:00:00 2001 From: Joern Konopka Date: Sat, 2 Mar 2013 23:57:53 +0100 Subject: [PATCH 4/4] merge --- gtk-3.0/settings.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index db52c52..7556e6c 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,8 +1,4 @@ [Settings] -<<<<<<< HEAD gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555;\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937" -======= -gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937" ->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3 gtk-auto-mnemonics = 1 gtk-visible-focus = automatic