Merge lp:~elementary-design/egtk/3-14 into lp:~elementary-design/egtk/trunk
- 3-14
- Merge into trunk
Status: | Superseded | ||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~elementary-design/egtk/3-14 | ||||||||||||||||||||||||||||||||
Merge into: | lp:~elementary-design/egtk/trunk | ||||||||||||||||||||||||||||||||
Diff against target: |
1524 lines (+173/-1002) (has conflicts) 12 files modified
gtk-3.0/apps.css (+6/-0) gtk-3.0/assets/spinner-01.svg (+0/-151) gtk-3.0/assets/spinner-02.svg (+0/-108) gtk-3.0/assets/spinner-03.svg (+0/-108) gtk-3.0/assets/spinner-04.svg (+0/-108) gtk-3.0/assets/spinner-05.svg (+0/-108) gtk-3.0/assets/spinner-06.svg (+0/-108) gtk-3.0/assets/spinner-07.svg (+0/-108) gtk-3.0/assets/spinner-08.svg (+0/-108) gtk-3.0/gtk-widgets-dark.css (+20/-13) gtk-3.0/gtk-widgets.css (+119/-82) gtk-3.0/white.css (+28/-0) Text conflict in gtk-3.0/gtk-widgets-dark.css Text conflict in gtk-3.0/gtk-widgets.css |
||||||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp:~elementary-design/egtk/3-14 | ||||||||||||||||||||||||||||||||
Related bugs: |
|
||||||||||||||||||||||||||||||||
Related blueprints: |
Rounded corners on right click menu
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
elementary UX | Pending | ||
Review via email: mp+237192@code.launchpad.net |
This proposal supersedes a proposal from 2014-10-05.
This proposal has been superseded by a proposal from 2014-10-05.
Commit message
Description of the change
updates for gtk 3.14
- 348. By Danielle Foré
-
derp duplicate stuff
- 349. By Danielle Foré
-
sync up with trunk a wee bit
- 350. By Danielle Foré
-
sync
- 351. By Danielle Foré
-
sync more
- 352. By Danielle Foré
-
merge trunk
- 353. By Danielle Foré
-
I dunno what this even is
- 354. By Danielle Foré
-
merge trunk
- 355. By Danielle Foré
-
make some changes to shadows based on material design concepts
- 356. By Danielle Foré
-
merge trunk
- 357. By Danielle Foré
-
support .frame.flat
- 358. By Danielle Foré
-
undo change to notebook.frame
- 359. By Danielle Foré
-
flatter menus with icon arrows
- 360. By Danielle Foré
-
merge trunk
- 361. By Danielle Foré
-
submenus have larger shadows, restore shadow on panel submenu
- 362. By Danielle Foré
-
update gala notification shadows
- 363. By Danielle Foré
-
remove unecessary reference to panel shadow
- 364. By Danielle Foré
-
style for dark search bar
- 365. By Danielle Foré
-
add workaround for granite thinpaned
- 366. By Danielle Foré
-
okay screw it, no full width menu seps
- 367. By Danielle Foré
-
no text shadow on selected list row
- 368. By Danielle Foré
-
smaller h3
- 369. By Danielle Foré
-
re-kill panel shadow
- 370. By Danielle Foré
-
another workaround for thin pane
- 371. By Danielle Foré
-
make image buttons have flat active states
- 372. By Danielle Foré
-
include buttons that identify as flat
- 373. By Danielle Foré
-
make granite popover fully opaque
- 374. By Sam Hewitt
-
make inactive tabs have less visible color
- 375. By Danielle Foré
-
make sure to preserve treeview selection background in popovers
- 376. By Danielle Foré
-
more tab label padding
- 377. By Danielle Foré
-
add plank theme
- 378. By Danielle Foré
-
some syncing with trunk
- 379. By Danielle Foré
-
set titlebar highlight based on titlebar color instead of #fff
- 380. By Danielle Foré
-
merge trunk
- 381. By Danielle Foré
-
initial title color variable separation
- 382. By Danielle Foré
-
fix backdrop and insensitive and make sure we don't break dark theme
- 383. By Danielle Foré
-
try to fix up dark scales a bit
- 384. By Danielle Foré
-
create a style for vertical spin buttons
- 385. By Danielle Foré
-
change border widths to fix focus style in vertical spin buttons
- 386. By Danielle Foré
-
rtl support for backdrop back button
- 387. By Danielle Foré
-
some changes to selection and focus colors
- 388. By Danielle Foré
-
some changes to notebook
- 389. By Danielle Foré
-
a little something special for flat buttons in dialogs
- 390. By Danielle Foré
-
adjust that a bit
- 391. By Danielle Foré
-
straight up rip off GNOME's levelbar style for now
- 392. By Danielle Foré
-
do image-buttons to reduce possibility of style error further
- 393. By Danielle Foré
-
try to guard against dark theme, also support popover
- 394. By Danielle Foré
-
gotta have more padding because of bigger icons
- 395. By Danielle Foré
-
make insensitive entry much more flat
- 396. By Danielle Foré
-
make levelbar way sexier
- 397. By Danielle Foré
-
add middle level for levelbar
- 398. By Danielle Foré
-
levelbar backdrop
- 399. By Danielle Foré
-
workarounds for synaptic
- 400. By Danielle Foré
-
set insensitive color using mix
- 401. By Danielle Foré
-
darker insensitive color in notebook header
- 402. By Danielle Foré
-
dark theme insensitive shadow
- 403. By Danielle Foré
-
revert insensitive color changes in light theme
- 404. By Danielle Foré
-
some changes to infobar and error classes
- 405. By Danielle Foré
-
success color
- 406. By Danielle Foré
-
gala button
- 407. By Danielle Foré
-
adjust dark dialog border color
- 408. By Danielle Foré
-
update infobar and levelbar styles to use color variables
- 409. By Danielle Foré
-
active style for desctructive action
- 410. By Danielle Foré
-
oops wrong selector
- 411. By Danielle Foré
-
them typos tho
- 412. By Danielle Foré
-
attempt to resolve conflict
Unmerged revisions
Preview Diff
1 | === modified file 'gtk-3.0/apps.css' |
2 | --- gtk-3.0/apps.css 2014-10-05 19:37:29 +0000 |
3 | +++ gtk-3.0/apps.css 2014-10-05 20:28:11 +0000 |
4 | @@ -115,6 +115,11 @@ |
5 | font-weight: normal; |
6 | } |
7 | |
8 | +.panel .window-frame.menu.csd, |
9 | +.panel .window-frame.popup.csd { |
10 | + box-shadow: none; |
11 | +} |
12 | + |
13 | .panel-shadow { |
14 | background-image: none; |
15 | background-color: transparent; |
16 | @@ -166,6 +171,7 @@ |
17 | color: @selected_fg_color; |
18 | text-shadow: 0 1px 1px alpha (#000, 0.25); |
19 | icon-shadow: 0 1px 1px alpha (#000, 0.25); |
20 | + margin: 6px 0; |
21 | } |
22 | |
23 | .search-entry-large, |
24 | |
25 | === removed file 'gtk-3.0/assets/spinner-01.svg' |
26 | --- gtk-3.0/assets/spinner-01.svg 2013-09-06 07:58:53 +0000 |
27 | +++ gtk-3.0/assets/spinner-01.svg 1970-01-01 00:00:00 +0000 |
28 | @@ -1,151 +0,0 @@ |
29 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
30 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
31 | - |
32 | -<svg |
33 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
34 | - xmlns:cc="http://creativecommons.org/ns#" |
35 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
36 | - xmlns:svg="http://www.w3.org/2000/svg" |
37 | - xmlns="http://www.w3.org/2000/svg" |
38 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
39 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
40 | - version="1.0" |
41 | - width="16" |
42 | - height="16" |
43 | - id="svg3315" |
44 | - inkscape:version="0.48.4 r9939" |
45 | - sodipodi:docname="spinner-01.svg"> |
46 | - <sodipodi:namedview |
47 | - pagecolor="#ffffff" |
48 | - bordercolor="#666666" |
49 | - borderopacity="1" |
50 | - objecttolerance="10" |
51 | - gridtolerance="10" |
52 | - guidetolerance="10" |
53 | - inkscape:pageopacity="0" |
54 | - inkscape:pageshadow="2" |
55 | - inkscape:window-width="1280" |
56 | - inkscape:window-height="756" |
57 | - id="namedview25" |
58 | - showgrid="false" |
59 | - inkscape:zoom="17.5625" |
60 | - inkscape:cx="6.3202847" |
61 | - inkscape:cy="8" |
62 | - inkscape:window-x="0" |
63 | - inkscape:window-y="22" |
64 | - inkscape:window-maximized="1" |
65 | - inkscape:current-layer="svg3315" /> |
66 | - <metadata |
67 | - id="metadata25"> |
68 | - <rdf:RDF> |
69 | - <cc:Work |
70 | - rdf:about=""> |
71 | - <dc:format>image/svg+xml</dc:format> |
72 | - <dc:type |
73 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
74 | - </cc:Work> |
75 | - </rdf:RDF> |
76 | - </metadata> |
77 | - <defs |
78 | - id="defs3317" /> |
79 | - <path |
80 | - d="m 8.0000004,11.335842 0,4.164158" |
81 | - inkscape:connector-curvature="0" |
82 | - id="path3279" |
83 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
84 | - <path |
85 | - d="m 8.0000004,0.4999995 0,4.1660435" |
86 | - inkscape:connector-curvature="0" |
87 | - id="path3281" |
88 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
89 | - <path |
90 | - d="m 8.8633802,11.222176 1.077763,4.022268" |
91 | - inkscape:connector-curvature="0" |
92 | - id="path2629" |
93 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
94 | - <path |
95 | - d="m 6.0588576,0.7555558 1.0782509,4.024089" |
96 | - inkscape:connector-curvature="0" |
97 | - id="path2631" |
98 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
99 | - <path |
100 | - d="M 9.6679217,10.888924 11.75,14.495191" |
101 | - inkscape:connector-curvature="0" |
102 | - id="path3403" |
103 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
104 | - <path |
105 | - d="M 4.2500002,1.504809 6.3330217,5.1127085" |
106 | - inkscape:connector-curvature="0" |
107 | - id="path3405" |
108 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
109 | - <path |
110 | - d="m 10.358797,10.358796 2.944504,2.944505" |
111 | - inkscape:connector-curvature="0" |
112 | - id="path3407" |
113 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
114 | - <path |
115 | - d="M 2.6966993,2.6966987 5.6425369,5.6425362" |
116 | - inkscape:connector-curvature="0" |
117 | - id="path3409" |
118 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
119 | - <path |
120 | - d="M 10.888925,9.667921 14.495191,11.75" |
121 | - inkscape:connector-curvature="0" |
122 | - id="path3415" |
123 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
124 | - <path |
125 | - d="M 1.5048096,4.2499996 5.112709,6.3330208" |
126 | - inkscape:connector-curvature="0" |
127 | - id="path3417" |
128 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
129 | - <path |
130 | - d="m 11.222177,8.863379 4.022268,1.077763" |
131 | - inkscape:connector-curvature="0" |
132 | - id="path3419" |
133 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
134 | - <path |
135 | - d="M 0.75555653,6.0588567 4.7796456,7.1371076" |
136 | - inkscape:connector-curvature="0" |
137 | - id="path3421" |
138 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
139 | - <path |
140 | - d="M 11.335842,7.9999995 15.5,8" |
141 | - inkscape:connector-curvature="0" |
142 | - id="path3423" |
143 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
144 | - <path |
145 | - d="M 0.5,8 4.6660435,8" |
146 | - inkscape:connector-curvature="0" |
147 | - id="path3425" |
148 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
149 | - <path |
150 | - d="M 11.222176,7.1366196 15.244444,6.0588567" |
151 | - inkscape:connector-curvature="0" |
152 | - id="path3427" |
153 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
154 | - <path |
155 | - d="M 0.75555628,9.941142 4.7796452,8.862891" |
156 | - inkscape:connector-curvature="0" |
157 | - id="path3429" |
158 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
159 | - <path |
160 | - d="M 1.5048094,11.75 5.1127089,9.666978" |
161 | - inkscape:connector-curvature="0" |
162 | - id="path3433" |
163 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
164 | - <path |
165 | - d="M 2.6966996,13.3033 5.6425372,10.357462" |
166 | - inkscape:connector-curvature="0" |
167 | - id="path3437" |
168 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
169 | - <path |
170 | - d="m 4.2499999,14.495191 2.0830218,-3.6079" |
171 | - inkscape:connector-curvature="0" |
172 | - id="path2407" |
173 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
174 | - <path |
175 | - d="M 6.0588584,15.244443 7.1371093,11.220354" |
176 | - inkscape:connector-curvature="0" |
177 | - id="path2413" |
178 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
179 | -</svg> |
180 | |
181 | === removed file 'gtk-3.0/assets/spinner-02.svg' |
182 | --- gtk-3.0/assets/spinner-02.svg 2013-09-06 07:58:53 +0000 |
183 | +++ gtk-3.0/assets/spinner-02.svg 1970-01-01 00:00:00 +0000 |
184 | @@ -1,108 +0,0 @@ |
185 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
186 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
187 | - |
188 | -<svg |
189 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
190 | - xmlns:cc="http://creativecommons.org/ns#" |
191 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
192 | - xmlns:svg="http://www.w3.org/2000/svg" |
193 | - xmlns="http://www.w3.org/2000/svg" |
194 | - version="1.0" |
195 | - width="16" |
196 | - height="16" |
197 | - id="svg3315"> |
198 | - <metadata |
199 | - id="metadata25"> |
200 | - <rdf:RDF> |
201 | - <cc:Work |
202 | - rdf:about=""> |
203 | - <dc:format>image/svg+xml</dc:format> |
204 | - <dc:type |
205 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
206 | - <dc:title></dc:title> |
207 | - </cc:Work> |
208 | - </rdf:RDF> |
209 | - </metadata> |
210 | - <defs |
211 | - id="defs3317" /> |
212 | - <path |
213 | - d="M 5.6412036,10.358797 2.6966992,13.303301" |
214 | - id="path3279" |
215 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
216 | - <path |
217 | - d="M 13.303301,2.696699 10.357464,5.6425366" |
218 | - id="path3281" |
219 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
220 | - <path |
221 | - d="M 6.3320793,10.888924 4.2499999,14.495191" |
222 | - id="path2629" |
223 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
224 | - <path |
225 | - d="M 11.75,1.5048094 9.6669784,5.1127085" |
226 | - id="path2631" |
227 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
228 | - <path |
229 | - d="M 7.1366208,11.222176 6.0588567,15.244444" |
230 | - id="path3403" |
231 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
232 | - <path |
233 | - d="M 9.9411431,0.75555604 8.8628916,4.7796449" |
234 | - id="path3405" |
235 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
236 | - <path |
237 | - d="M 8.0000005,11.335842 7.9999998,15.5" |
238 | - id="path3407" |
239 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
240 | - <path |
241 | - d="m 8.0000002,0.49999973 10e-8,4.16604337" |
242 | - id="path3409" |
243 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
244 | - <path |
245 | - d="m 8.86338,11.222177 1.077763,4.022267" |
246 | - id="path3415" |
247 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
248 | - <path |
249 | - d="M 6.0588574,0.75555604 7.1371091,4.7796446" |
250 | - id="path3417" |
251 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
252 | - <path |
253 | - d="m 9.6679219,10.888924 2.0820791,3.606267" |
254 | - id="path3419" |
255 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
256 | - <path |
257 | - d="M 4.2500003,1.5048092 6.3330225,5.1127084" |
258 | - id="path3421" |
259 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
260 | - <path |
261 | - d="m 10.358797,10.358796 2.944504,2.944505" |
262 | - id="path3423" |
263 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
264 | - <path |
265 | - d="M 2.696699,2.6966991 5.6425366,5.6425367" |
266 | - id="path3425" |
267 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
268 | - <path |
269 | - d="M 10.888924,9.6679203 14.495191,11.75" |
270 | - id="path3427" |
271 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
272 | - <path |
273 | - d="M 1.5048099,4.2499993 5.112709,6.3330213" |
274 | - id="path3429" |
275 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
276 | - <path |
277 | - d="M 0.75555608,6.058857 4.7796453,7.1371083" |
278 | - id="path3433" |
279 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
280 | - <path |
281 | - d="m 0.50000076,7.9999996 4.16604374,-2e-7" |
282 | - id="path3437" |
283 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
284 | - <path |
285 | - d="M 0.75555572,9.941143 4.7796451,8.8628913" |
286 | - id="path2407" |
287 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
288 | - <path |
289 | - d="M 1.5048107,11.75 5.1127098,9.6669782" |
290 | - id="path2413" |
291 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
292 | -</svg> |
293 | |
294 | === removed file 'gtk-3.0/assets/spinner-03.svg' |
295 | --- gtk-3.0/assets/spinner-03.svg 2013-09-06 07:58:53 +0000 |
296 | +++ gtk-3.0/assets/spinner-03.svg 1970-01-01 00:00:00 +0000 |
297 | @@ -1,108 +0,0 @@ |
298 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
299 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
300 | - |
301 | -<svg |
302 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
303 | - xmlns:cc="http://creativecommons.org/ns#" |
304 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
305 | - xmlns:svg="http://www.w3.org/2000/svg" |
306 | - xmlns="http://www.w3.org/2000/svg" |
307 | - version="1.0" |
308 | - width="16" |
309 | - height="16" |
310 | - id="svg3315"> |
311 | - <metadata |
312 | - id="metadata25"> |
313 | - <rdf:RDF> |
314 | - <cc:Work |
315 | - rdf:about=""> |
316 | - <dc:format>image/svg+xml</dc:format> |
317 | - <dc:type |
318 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
319 | - <dc:title></dc:title> |
320 | - </cc:Work> |
321 | - </rdf:RDF> |
322 | - </metadata> |
323 | - <defs |
324 | - id="defs3317" /> |
325 | - <path |
326 | - d="m 4.6641585,7.9999995 -4.16415844,4e-7" |
327 | - id="path3279" |
328 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
329 | - <path |
330 | - d="m 15.5,7.9999994 -4.166043,5e-7" |
331 | - id="path3281" |
332 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
333 | - <path |
334 | - d="M 4.7778243,8.8633795 0.75555595,9.9411428" |
335 | - id="path2629" |
336 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
337 | - <path |
338 | - d="m 15.244445,6.0588573 -4.02409,1.0782505" |
339 | - id="path2631" |
340 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
341 | - <path |
342 | - d="M 5.1110763,9.667921 1.504809,11.75" |
343 | - id="path3403" |
344 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
345 | - <path |
346 | - d="M 14.495191,4.2499996 10.887292,6.3330211" |
347 | - id="path3405" |
348 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
349 | - <path |
350 | - d="M 5.641204,10.358797 2.6966991,13.303301" |
351 | - id="path3407" |
352 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
353 | - <path |
354 | - d="M 13.303301,2.6966987 10.357464,5.6425363" |
355 | - id="path3409" |
356 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
357 | - <path |
358 | - d="M 6.3320795,10.888924 4.2499999,14.495191" |
359 | - id="path3415" |
360 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
361 | - <path |
362 | - d="M 11.750001,1.504809 9.6669794,5.1127084" |
363 | - id="path3417" |
364 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
365 | - <path |
366 | - d="M 7.1366212,11.222176 6.0588575,15.244444" |
367 | - id="path3419" |
368 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
369 | - <path |
370 | - d="M 9.9411435,0.75555598 8.8628926,4.779645" |
371 | - id="path3421" |
372 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
373 | - <path |
374 | - d="M 8.0000007,11.335842 8,15.5" |
375 | - id="path3423" |
376 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
377 | - <path |
378 | - d="m 8.0000002,0.49999939 0,4.16604351" |
379 | - id="path3425" |
380 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
381 | - <path |
382 | - d="m 8.8633809,11.222176 1.0777622,4.022268" |
383 | - id="path3427" |
384 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
385 | - <path |
386 | - d="M 6.0588582,0.75555563 7.1371092,4.7796446" |
387 | - id="path3429" |
388 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
389 | - <path |
390 | - d="m 4.2500002,1.5048088 2.083022,3.6078995" |
391 | - id="path3433" |
392 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
393 | - <path |
394 | - d="m 2.6967002,2.696699 2.945838,2.9458376" |
395 | - id="path3437" |
396 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
397 | - <path |
398 | - d="M 1.5048092,4.2499993 5.1127093,6.3330211" |
399 | - id="path2407" |
400 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
401 | - <path |
402 | - d="M 0.75555722,6.0588578 4.7796463,7.1371087" |
403 | - id="path2413" |
404 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
405 | -</svg> |
406 | |
407 | === removed file 'gtk-3.0/assets/spinner-04.svg' |
408 | --- gtk-3.0/assets/spinner-04.svg 2013-09-06 07:58:53 +0000 |
409 | +++ gtk-3.0/assets/spinner-04.svg 1970-01-01 00:00:00 +0000 |
410 | @@ -1,108 +0,0 @@ |
411 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
412 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
413 | - |
414 | -<svg |
415 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
416 | - xmlns:cc="http://creativecommons.org/ns#" |
417 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
418 | - xmlns:svg="http://www.w3.org/2000/svg" |
419 | - xmlns="http://www.w3.org/2000/svg" |
420 | - version="1.0" |
421 | - width="16" |
422 | - height="16" |
423 | - id="svg3315"> |
424 | - <metadata |
425 | - id="metadata25"> |
426 | - <rdf:RDF> |
427 | - <cc:Work |
428 | - rdf:about=""> |
429 | - <dc:format>image/svg+xml</dc:format> |
430 | - <dc:type |
431 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
432 | - <dc:title></dc:title> |
433 | - </cc:Work> |
434 | - </rdf:RDF> |
435 | - </metadata> |
436 | - <defs |
437 | - id="defs3317" /> |
438 | - <path |
439 | - d="M 5.6412041,5.6412031 2.6966992,2.6966988" |
440 | - id="path3279" |
441 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
442 | - <path |
443 | - d="M 13.303301,13.3033 10.357464,10.357463" |
444 | - id="path3281" |
445 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
446 | - <path |
447 | - d="M 5.1110761,6.3320789 1.5048091,4.2499994" |
448 | - id="path2629" |
449 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
450 | - <path |
451 | - d="M 14.495191,11.750001 10.887292,9.6669776" |
452 | - id="path2631" |
453 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
454 | - <path |
455 | - d="M 4.7778241,7.1366204 0.75555587,6.0588565" |
456 | - id="path3403" |
457 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
458 | - <path |
459 | - d="M 15.244444,9.9411425 11.220356,8.8628913" |
460 | - id="path3405" |
461 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
462 | - <path |
463 | - d="m 4.6641579,8.0000004 -4.16415813,-7e-7" |
464 | - id="path3407" |
465 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
466 | - <path |
467 | - d="m 15.5,7.9999994 -4.166043,5e-7" |
468 | - id="path3409" |
469 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
470 | - <path |
471 | - d="M 4.7778243,8.8633795 0.7555558,9.9411427" |
472 | - id="path3415" |
473 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
474 | - <path |
475 | - d="M 15.244445,6.0588572 11.220356,7.1371086" |
476 | - id="path3417" |
477 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
478 | - <path |
479 | - d="M 5.1110764,9.6679211 1.5048094,11.75" |
480 | - id="path3419" |
481 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
482 | - <path |
483 | - d="M 14.495191,4.2499999 10.887292,6.333022" |
484 | - id="path3421" |
485 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
486 | - <path |
487 | - d="M 5.6412039,10.358797 2.696699,13.303301" |
488 | - id="path3423" |
489 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
490 | - <path |
491 | - d="M 13.303301,2.6966985 10.357464,5.6425361" |
492 | - id="path3425" |
493 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
494 | - <path |
495 | - d="m 6.3320799,10.888925 -2.08208,3.606266" |
496 | - id="path3427" |
497 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
498 | - <path |
499 | - d="M 11.750001,1.5048094 9.6669791,5.1127086" |
500 | - id="path3429" |
501 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
502 | - <path |
503 | - d="M 9.9411434,0.75555561 8.8628921,4.7796448" |
504 | - id="path3433" |
505 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
506 | - <path |
507 | - d="m 8.0000007,0.50000029 3e-7,4.16604381" |
508 | - id="path3437" |
509 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
510 | - <path |
511 | - d="M 6.0588574,0.75555526 7.1371092,4.7796447" |
512 | - id="path2407" |
513 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
514 | - <path |
515 | - d="M 4.2500001,1.5048102 6.3330222,5.1127094" |
516 | - id="path2413" |
517 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
518 | -</svg> |
519 | |
520 | === removed file 'gtk-3.0/assets/spinner-05.svg' |
521 | --- gtk-3.0/assets/spinner-05.svg 2013-09-06 07:58:53 +0000 |
522 | +++ gtk-3.0/assets/spinner-05.svg 1970-01-01 00:00:00 +0000 |
523 | @@ -1,108 +0,0 @@ |
524 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
525 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
526 | - |
527 | -<svg |
528 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
529 | - xmlns:cc="http://creativecommons.org/ns#" |
530 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
531 | - xmlns:svg="http://www.w3.org/2000/svg" |
532 | - xmlns="http://www.w3.org/2000/svg" |
533 | - version="1.0" |
534 | - width="16" |
535 | - height="16" |
536 | - id="svg3315"> |
537 | - <metadata |
538 | - id="metadata25"> |
539 | - <rdf:RDF> |
540 | - <cc:Work |
541 | - rdf:about=""> |
542 | - <dc:format>image/svg+xml</dc:format> |
543 | - <dc:type |
544 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
545 | - <dc:title></dc:title> |
546 | - </cc:Work> |
547 | - </rdf:RDF> |
548 | - </metadata> |
549 | - <defs |
550 | - id="defs3317" /> |
551 | - <path |
552 | - d="m 8.0000006,4.6641578 -4e-7,-4.16415832" |
553 | - id="path3279" |
554 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
555 | - <path |
556 | - d="m 8.0000006,15.499999 0,-4.166042" |
557 | - id="path3281" |
558 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
559 | - <path |
560 | - d="M 7.1366206,4.7778237 6.0588572,0.7555553" |
561 | - id="path2629" |
562 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
563 | - <path |
564 | - d="M 9.9411424,15.244444 8.8628925,11.220355" |
565 | - id="path2631" |
566 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
567 | - <path |
568 | - d="M 6.3320791,5.1110757 4.2500001,1.5048084" |
569 | - id="path3403" |
570 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
571 | - <path |
572 | - d="M 11.75,14.49519 9.6669792,10.887292" |
573 | - id="path3405" |
574 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
575 | - <path |
576 | - d="M 5.6412031,5.6412034 2.6966991,2.6966984" |
577 | - id="path3407" |
578 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
579 | - <path |
580 | - d="M 13.303301,13.3033 10.357464,10.357463" |
581 | - id="path3409" |
582 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
583 | - <path |
584 | - d="M 5.1110761,6.3320789 1.5048091,4.2499992" |
585 | - id="path3415" |
586 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
587 | - <path |
588 | - d="M 14.495191,11.750001 10.887292,9.6669789" |
589 | - id="path3417" |
590 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
591 | - <path |
592 | - d="M 4.7778241,7.1366205 0.75555618,6.0588568" |
593 | - id="path3419" |
594 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
595 | - <path |
596 | - d="M 15.244444,9.9411428 11.220355,8.862892" |
597 | - id="path3421" |
598 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
599 | - <path |
600 | - d="m 4.6641579,8.0000003 -4.16415817,-6e-7" |
601 | - id="path3423" |
602 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
603 | - <path |
604 | - d="m 15.5,7.9999993 -4.166043,4e-7" |
605 | - id="path3425" |
606 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
607 | - <path |
608 | - d="M 4.7778239,8.8633805 0.75555582,9.9411428" |
609 | - id="path3427" |
610 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
611 | - <path |
612 | - d="M 15.244444,6.0588575 11.220355,7.1371086" |
613 | - id="path3429" |
614 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
615 | - <path |
616 | - d="M 14.495191,4.2499996 10.887292,6.3330215" |
617 | - id="path3433" |
618 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
619 | - <path |
620 | - d="M 13.303301,2.6966995 10.357463,5.6425376" |
621 | - id="path3437" |
622 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
623 | - <path |
624 | - d="M 11.750001,1.5048086 9.6669791,5.1127087" |
625 | - id="path2407" |
626 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
627 | - <path |
628 | - d="M 9.9411423,0.75555657 8.8628914,4.7796456" |
629 | - id="path2413" |
630 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
631 | -</svg> |
632 | |
633 | === removed file 'gtk-3.0/assets/spinner-06.svg' |
634 | --- gtk-3.0/assets/spinner-06.svg 2013-09-06 07:58:53 +0000 |
635 | +++ gtk-3.0/assets/spinner-06.svg 1970-01-01 00:00:00 +0000 |
636 | @@ -1,108 +0,0 @@ |
637 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
638 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
639 | - |
640 | -<svg |
641 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
642 | - xmlns:cc="http://creativecommons.org/ns#" |
643 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
644 | - xmlns:svg="http://www.w3.org/2000/svg" |
645 | - xmlns="http://www.w3.org/2000/svg" |
646 | - version="1.0" |
647 | - width="16" |
648 | - height="16" |
649 | - id="svg3315"> |
650 | - <metadata |
651 | - id="metadata25"> |
652 | - <rdf:RDF> |
653 | - <cc:Work |
654 | - rdf:about=""> |
655 | - <dc:format>image/svg+xml</dc:format> |
656 | - <dc:type |
657 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
658 | - <dc:title></dc:title> |
659 | - </cc:Work> |
660 | - </rdf:RDF> |
661 | - </metadata> |
662 | - <defs |
663 | - id="defs3317" /> |
664 | - <path |
665 | - d="M 10.358797,5.6412034 13.303301,2.6966986" |
666 | - id="path3279" |
667 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
668 | - <path |
669 | - d="M 2.6967002,13.3033 5.6425368,10.357464" |
670 | - id="path3281" |
671 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
672 | - <path |
673 | - d="M 9.6679212,5.1110755 11.750001,1.5048084" |
674 | - id="path2629" |
675 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
676 | - <path |
677 | - d="M 4.2499994,14.49519 6.3330222,10.887292" |
678 | - id="path2631" |
679 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
680 | - <path |
681 | - d="M 8.8633797,4.7778235 9.9411436,0.75555526" |
682 | - id="path3403" |
683 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
684 | - <path |
685 | - d="m 6.0588575,15.244443 1.078251,-4.024087" |
686 | - id="path3405" |
687 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
688 | - <path |
689 | - d="m 7.9999997,4.6641573 7e-7,-4.16415821" |
690 | - id="path3407" |
691 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
692 | - <path |
693 | - d="m 8.0000006,15.499999 0,-4.166043" |
694 | - id="path3409" |
695 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
696 | - <path |
697 | - d="M 7.1366206,4.7778236 6.0588574,0.75555512" |
698 | - id="path3415" |
699 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
700 | - <path |
701 | - d="M 9.9411424,15.244444 8.8628916,11.220355" |
702 | - id="path3417" |
703 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
704 | - <path |
705 | - d="M 6.332079,5.1110757 4.2500001,1.5048088" |
706 | - id="path3419" |
707 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
708 | - <path |
709 | - d="M 11.75,14.49519 9.666978,10.887291" |
710 | - id="path3421" |
711 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
712 | - <path |
713 | - d="M 5.6412032,5.6412033 2.6966991,2.6966984" |
714 | - id="path3423" |
715 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
716 | - <path |
717 | - d="M 13.303301,13.3033 10.357464,10.357463" |
718 | - id="path3425" |
719 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
720 | - <path |
721 | - d="M 5.1110752,6.3320793 1.5048091,4.2499993" |
722 | - id="path3427" |
723 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
724 | - <path |
725 | - d="M 14.49519,11.75 10.887291,9.6669781" |
726 | - id="path3429" |
727 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
728 | - <path |
729 | - d="M 15.244444,9.9411425 11.220355,8.8628916" |
730 | - id="path3433" |
731 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
732 | - <path |
733 | - d="m 15.5,8 -4.166044,10e-8" |
734 | - id="path3437" |
735 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
736 | - <path |
737 | - d="m 15.244445,6.0588569 -4.02409,1.0782517" |
738 | - id="path2407" |
739 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
740 | - <path |
741 | - d="M 14.49519,4.2499994 10.887291,6.3330216" |
742 | - id="path2413" |
743 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
744 | -</svg> |
745 | |
746 | === removed file 'gtk-3.0/assets/spinner-07.svg' |
747 | --- gtk-3.0/assets/spinner-07.svg 2013-09-06 07:58:53 +0000 |
748 | +++ gtk-3.0/assets/spinner-07.svg 1970-01-01 00:00:00 +0000 |
749 | @@ -1,108 +0,0 @@ |
750 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
751 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
752 | - |
753 | -<svg |
754 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
755 | - xmlns:cc="http://creativecommons.org/ns#" |
756 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
757 | - xmlns:svg="http://www.w3.org/2000/svg" |
758 | - xmlns="http://www.w3.org/2000/svg" |
759 | - version="1.0" |
760 | - width="16" |
761 | - height="16" |
762 | - id="svg3315"> |
763 | - <metadata |
764 | - id="metadata25"> |
765 | - <rdf:RDF> |
766 | - <cc:Work |
767 | - rdf:about=""> |
768 | - <dc:format>image/svg+xml</dc:format> |
769 | - <dc:type |
770 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
771 | - <dc:title></dc:title> |
772 | - </cc:Work> |
773 | - </rdf:RDF> |
774 | - </metadata> |
775 | - <defs |
776 | - id="defs3317" /> |
777 | - <path |
778 | - d="M 11.335842,7.9999999 15.5,7.9999993" |
779 | - id="path3279" |
780 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
781 | - <path |
782 | - d="m 0.50000126,7.9999998 4.16604164,4e-7" |
783 | - id="path3281" |
784 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
785 | - <path |
786 | - d="M 11.222176,7.1366199 15.244445,6.0588567" |
787 | - id="path2629" |
788 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
789 | - <path |
790 | - d="M 0.75555616,9.9411417 4.7796448,8.8628921" |
791 | - id="path2631" |
792 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
793 | - <path |
794 | - d="m 10.888924,6.3320784 3.606268,-2.082079" |
795 | - id="path3403" |
796 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
797 | - <path |
798 | - d="M 1.5048101,11.749999 5.1127079,9.6669788" |
799 | - id="path3405" |
800 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
801 | - <path |
802 | - d="m 10.358797,5.6412024 2.944505,-2.944504" |
803 | - id="path3407" |
804 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
805 | - <path |
806 | - d="M 2.6967002,13.3033 5.6425374,10.357463" |
807 | - id="path3409" |
808 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
809 | - <path |
810 | - d="M 9.6679213,5.1110754 11.750001,1.5048084" |
811 | - id="path3415" |
812 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
813 | - <path |
814 | - d="M 4.2499994,14.49519 6.3330215,10.887291" |
815 | - id="path3417" |
816 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
817 | - <path |
818 | - d="M 8.8633796,4.7778234 9.9411433,0.75555553" |
819 | - id="path3419" |
820 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
821 | - <path |
822 | - d="M 6.0588574,15.244443 7.1371083,11.220354" |
823 | - id="path3421" |
824 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
825 | - <path |
826 | - d="m 7.9999998,4.6641573 6e-7,-4.16415822" |
827 | - id="path3423" |
828 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
829 | - <path |
830 | - d="m 8.0000006,15.499999 0,-4.166043" |
831 | - id="path3425" |
832 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
833 | - <path |
834 | - d="M 7.1366196,4.7778233 6.0588573,0.75555517" |
835 | - id="path3427" |
836 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
837 | - <path |
838 | - d="M 9.9411424,15.244443 8.8628914,11.220354" |
839 | - id="path3429" |
840 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
841 | - <path |
842 | - d="M 11.75,14.49519 9.6669783,10.887291" |
843 | - id="path3433" |
844 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
845 | - <path |
846 | - d="M 13.303301,13.3033 10.357463,10.357463" |
847 | - id="path3437" |
848 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
849 | - <path |
850 | - d="M 14.495192,11.75 10.887291,9.6669781" |
851 | - id="path2407" |
852 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
853 | - <path |
854 | - d="M 15.244444,9.9411417 11.220355,8.8628909" |
855 | - id="path2413" |
856 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
857 | -</svg> |
858 | |
859 | === removed file 'gtk-3.0/assets/spinner-08.svg' |
860 | --- gtk-3.0/assets/spinner-08.svg 2013-09-06 07:58:53 +0000 |
861 | +++ gtk-3.0/assets/spinner-08.svg 1970-01-01 00:00:00 +0000 |
862 | @@ -1,108 +0,0 @@ |
863 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
864 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
865 | - |
866 | -<svg |
867 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
868 | - xmlns:cc="http://creativecommons.org/ns#" |
869 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
870 | - xmlns:svg="http://www.w3.org/2000/svg" |
871 | - xmlns="http://www.w3.org/2000/svg" |
872 | - version="1.0" |
873 | - width="16" |
874 | - height="16" |
875 | - id="svg3315"> |
876 | - <metadata |
877 | - id="metadata25"> |
878 | - <rdf:RDF> |
879 | - <cc:Work |
880 | - rdf:about=""> |
881 | - <dc:format>image/svg+xml</dc:format> |
882 | - <dc:type |
883 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
884 | - <dc:title></dc:title> |
885 | - </cc:Work> |
886 | - </rdf:RDF> |
887 | - </metadata> |
888 | - <defs |
889 | - id="defs3317" /> |
890 | - <path |
891 | - d="M 10.358796,10.358796 13.303301,13.3033" |
892 | - id="path3279" |
893 | - style="opacity:0.2;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
894 | - <path |
895 | - d="M 2.6967,2.6966995 5.642536,5.6425361" |
896 | - id="path3281" |
897 | - style="fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
898 | - <path |
899 | - d="M 10.888924,9.6679202 14.495192,11.75" |
900 | - id="path2629" |
901 | - style="opacity:0.175;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
902 | - <path |
903 | - d="M 1.50481,4.2499987 5.112708,6.3330215" |
904 | - id="path2631" |
905 | - style="opacity:0.875;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
906 | - <path |
907 | - d="m 11.222176,8.8633787 4.022269,1.0777644" |
908 | - id="path3403" |
909 | - style="opacity:0.15;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
910 | - <path |
911 | - d="M 0.75555729,6.0588565 4.779644,7.1371078" |
912 | - id="path3405" |
913 | - style="opacity:0.75;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
914 | - <path |
915 | - d="m 11.335843,7.9999992 4.164158,7e-7" |
916 | - id="path3407" |
917 | - style="opacity:0.125;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
918 | - <path |
919 | - d="m 0.50000119,7.9999997 4.16604281,2e-7" |
920 | - id="path3409" |
921 | - style="opacity:0.675;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
922 | - <path |
923 | - d="M 11.222176,7.1366199 15.244445,6.0588567" |
924 | - id="path3415" |
925 | - style="opacity:0.1;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
926 | - <path |
927 | - d="M 0.75555609,9.9411416 4.779645,8.8628908" |
928 | - id="path3417" |
929 | - style="opacity:0.6;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
930 | - <path |
931 | - d="M 10.888924,6.3320782 14.495191,4.2499994" |
932 | - id="path3419" |
933 | - style="opacity:0.075;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
934 | - <path |
935 | - d="M 1.50481,11.749999 5.1127091,9.6669772" |
936 | - id="path3421" |
937 | - style="opacity:0.55;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
938 | - <path |
939 | - d="M 10.358797,5.6412025 13.303302,2.6966984" |
940 | - id="path3423" |
941 | - style="opacity:0.05;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
942 | - <path |
943 | - d="M 2.6967001,13.3033 5.6425374,10.357463" |
944 | - id="path3425" |
945 | - style="opacity:0.5;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
946 | - <path |
947 | - d="M 9.6679207,5.1110745 11.750001,1.5048084" |
948 | - id="path3427" |
949 | - style="opacity:0.025;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
950 | - <path |
951 | - d="M 4.25,14.495189 6.333022,10.88729" |
952 | - id="path3429" |
953 | - style="opacity:0.45;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
954 | - <path |
955 | - d="m 6.0588574,15.244443 1.078251,-4.024089" |
956 | - id="path3433" |
957 | - style="opacity:0.4;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
958 | - <path |
959 | - d="m 8.0000005,15.499999 -7e-7,-4.166043" |
960 | - id="path3437" |
961 | - style="opacity:0.35;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
962 | - <path |
963 | - d="M 9.9411437,15.244444 8.8628914,11.220354" |
964 | - id="path2407" |
965 | - style="opacity:0.3;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
966 | - <path |
967 | - d="M 11.750001,14.49519 9.6669787,10.88729" |
968 | - id="path2413" |
969 | - style="opacity:0.25;fill:none;stroke:#878787;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> |
970 | -</svg> |
971 | |
972 | === modified file 'gtk-3.0/gtk-widgets-dark.css' |
973 | --- gtk-3.0/gtk-widgets-dark.css 2014-10-05 20:20:53 +0000 |
974 | +++ gtk-3.0/gtk-widgets-dark.css 2014-10-05 20:28:11 +0000 |
975 | @@ -352,8 +352,14 @@ |
976 | background-image: none; |
977 | border-color: alpha (#000, 0.40); |
978 | |
979 | +<<<<<<< TREE |
980 | box-shadow: inset 0 0 0 1px alpha (#000, 0.10); |
981 | |
982 | +======= |
983 | + box-shadow: inset 0 0 0 1px alpha (#000, 0.10), |
984 | + 0 1px 0 0 alpha (#fff, 0.05);; |
985 | + |
986 | +>>>>>>> MERGE-SOURCE |
987 | border-color: alpha (#000, 0.37); |
988 | |
989 | text-shadow: 0 1px alpha (#000, 0.4); |
990 | @@ -478,7 +484,7 @@ |
991 | |
992 | .dynamic-notebook .notebook tab:active { |
993 | box-shadow: inset 0 0 0 1px alpha (#fff, 0.05), |
994 | - 0 0 0 1px shade (@titlebar_color, 0.56); |
995 | + 0 0 1px 1px alpha (#000, 0.15); |
996 | } |
997 | |
998 | .dynamic-notebook .notebook tab:active:backdrop { |
999 | @@ -496,9 +502,9 @@ |
1000 | 0 0 0 1px shade (@titlebar_color, 0.56); |
1001 | } |
1002 | |
1003 | -.dynamic-notebook .notebook tab .button, |
1004 | -.dynamic-notebook .notebook tab .button:hover, |
1005 | -.dynamic-notebook .notebook tab .button:hover:active, |
1006 | +.dynamic-notebook .notebook tab > .button, |
1007 | +.dynamic-notebook .notebook tab > .button:hover, |
1008 | +.dynamic-notebook .notebook tab > .button:hover:active, |
1009 | .notebook tab .button:hover, |
1010 | .notebook tab .button:hover:active { |
1011 | padding: 0; |
1012 | @@ -506,8 +512,8 @@ |
1013 | border-color: alpha (#000, 0.29); |
1014 | } |
1015 | |
1016 | -.dynamic-notebook .notebook tab .button:hover:active, |
1017 | -.notebook tab .button:hover:active { |
1018 | +.dynamic-notebook .notebook tab > .button:hover:active, |
1019 | +.notebook tab > .button:hover:active { |
1020 | background-color: alpha (#000, 0.10); |
1021 | } |
1022 | |
1023 | @@ -520,13 +526,6 @@ |
1024 | -GtkComboBox-shadow-type: none; |
1025 | } |
1026 | |
1027 | -GtkComboBox .separator { |
1028 | - /* always disable separators */ |
1029 | - -GtkWidget-wide-separators: true; |
1030 | - -GtkWidget-horizontal-separator: 0; |
1031 | - -GtkWidget-vertical-separator: 0; |
1032 | -} |
1033 | - |
1034 | GtkComboBox.combobox-entry .entry:last-child, |
1035 | GtkComboBox.combobox-entry .button:last-child { |
1036 | background-image: linear-gradient(to bottom, |
1037 | @@ -569,12 +568,20 @@ |
1038 | ********/ |
1039 | |
1040 | .content-view .menu, |
1041 | +<<<<<<< TREE |
1042 | .menu, |
1043 | .popup { |
1044 | background-color: @base_color; |
1045 | background-image: none; |
1046 | |
1047 | border-color: alpha (#000, 0.4); |
1048 | +======= |
1049 | +.menu, |
1050 | +.popup { |
1051 | + box-shadow: inset 0 0 0 1px alpha (#fff, 0.02), |
1052 | + inset 0 1px 0 0 alpha (#fff, 0.07), |
1053 | + inset 0 -1px 0 0 alpha (#fff, 0.01); |
1054 | +>>>>>>> MERGE-SOURCE |
1055 | } |
1056 | |
1057 | .menu .menuitem:active, |
1058 | |
1059 | === modified file 'gtk-3.0/gtk-widgets.css' |
1060 | --- gtk-3.0/gtk-widgets.css 2014-10-05 20:27:44 +0000 |
1061 | +++ gtk-3.0/gtk-widgets.css 2014-10-05 20:28:11 +0000 |
1062 | @@ -23,7 +23,7 @@ |
1063 | |
1064 | -GtkScrolledWindow-scrollbar-spacing: 0; |
1065 | -GtkScrolledWindow-scrollbars-within-bevel: 1; |
1066 | - -GtkPaned-handle-size: 8px; |
1067 | + -GtkPaned-handle-size: 1px; |
1068 | |
1069 | -GtkWidget-link-color: @link_color; |
1070 | -GtkWidget-visited-link-color: @link_color; |
1071 | @@ -109,27 +109,25 @@ |
1072 | * Miscellaneous * |
1073 | ****************/ |
1074 | |
1075 | -@keyframes spinner { |
1076 | - 0% { background-image: url("assets/spinner-01.svg"); } |
1077 | - 14% { background-image: url("assets/spinner-02.svg"); } |
1078 | - 28% { background-image: url("assets/spinner-03.svg"); } |
1079 | - 42% { background-image: url("assets/spinner-04.svg"); } |
1080 | - 56% { background-image: url("assets/spinner-05.svg"); } |
1081 | - 70% { background-image: url("assets/spinner-06.svg"); } |
1082 | - 84% { background-image: url("assets/spinner-07.svg"); } |
1083 | - 100% { background-image: url("assets/spinner-08.svg"); } |
1084 | +@keyframes spin { |
1085 | + to { |
1086 | + -gtk-icon-transform: rotate(1turn); |
1087 | + } |
1088 | } |
1089 | |
1090 | .spinner { |
1091 | - background-color: transparent; |
1092 | - background-image: url("assets/spinner-01.svg"); |
1093 | - background-repeat: no-repeat; |
1094 | - background-position: center; |
1095 | + background-image: none; |
1096 | + opacity: 0; |
1097 | + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); |
1098 | } |
1099 | |
1100 | .spinner:active { |
1101 | - background-image: url("assets/spinner-01.svg"); |
1102 | - animation: spinner 600ms infinite linear; |
1103 | + opacity: 0.8; |
1104 | + animation: spin 600ms linear infinite; |
1105 | +} |
1106 | + |
1107 | +.spinner:active:insensitive { |
1108 | + opacity: 0.4; |
1109 | } |
1110 | |
1111 | .view.rubberband, |
1112 | @@ -157,30 +155,18 @@ |
1113 | color: @menu_separator; |
1114 | } |
1115 | |
1116 | +GtkPaned { |
1117 | + margin: 8px; |
1118 | +} |
1119 | + |
1120 | .pane-separator, |
1121 | .pane-separator:prelight, |
1122 | .pane-separator:selected { |
1123 | - border: 1px solid shade (@base_color, 0.55); |
1124 | - border-width: 0 1px; |
1125 | - |
1126 | - background-image: url("assets/pane-handle.svg"), |
1127 | - linear-gradient(to right, |
1128 | - @base_color, |
1129 | - shade (@base_color, 0.88) |
1130 | - ); |
1131 | - background-position: 50%; |
1132 | - background-repeat: no-repeat; |
1133 | -} |
1134 | - |
1135 | -.pane-separator.vertical, |
1136 | -.pane-separator.vertical:prelight, |
1137 | -.pane-separator.vertical:selected { |
1138 | - border-width: 1px 0; |
1139 | - |
1140 | - background-image: url("assets/pane-handle.svg"), |
1141 | - linear-gradient(to bottom, |
1142 | - @base_color, |
1143 | - shade (@base_color, 0.88) |
1144 | + background-color: shade (@base_color, 0.55); |
1145 | + /* background-image: none does not hide the grip handle */ |
1146 | + background-image: linear-gradient(to right, |
1147 | + shade (@base_color, 0.55), |
1148 | + shade (@base_color, 0.55) |
1149 | ); |
1150 | } |
1151 | |
1152 | @@ -217,11 +203,19 @@ |
1153 | padding: 4px; |
1154 | |
1155 | transition: all 200ms ease-out; |
1156 | - background-clip: padding-box; |
1157 | - |
1158 | -gtk-icon-style: symbolic; |
1159 | } |
1160 | |
1161 | + |
1162 | +/* Rounded Search Entries |
1163 | + |
1164 | +GtkSearchEntry.entry, |
1165 | +GraniteWidgetsSearchBar.entry { |
1166 | + border-radius: 12px; |
1167 | +} |
1168 | + |
1169 | +*/ |
1170 | + |
1171 | .entry:selected, |
1172 | .entry:selected:focus { |
1173 | background-color: @selected_bg_color; |
1174 | @@ -335,10 +329,6 @@ |
1175 | .progressbar, |
1176 | .progressbar row, |
1177 | .progressbar row:hover { |
1178 | - color: @selected_fg_color; |
1179 | - text-shadow: 0 1px alpha (#000, 0.3); |
1180 | - icon-shadow: 0 1px alpha (#000, 0.3); |
1181 | - |
1182 | background-image: linear-gradient(to bottom, |
1183 | shade (@selected_bg_color, 1.30), |
1184 | shade (@selected_bg_color, 1.20) 50%, |
1185 | @@ -415,15 +405,10 @@ |
1186 | |
1187 | .trough row:selected, |
1188 | .trough row:selected:focused { |
1189 | - color: @text_color; |
1190 | - |
1191 | border-image: linear-gradient(to bottom, |
1192 | shade (@selected_bg_color, 0.87), |
1193 | shade (@selected_bg_color, 0.80) |
1194 | ) 1 1 1 1; |
1195 | - |
1196 | - text-shadow: 0 1px alpha (#fff, 0.4); |
1197 | - icon-shadow: 0 1px alpha (#fff, 0.4); |
1198 | } |
1199 | |
1200 | .progressbar.vertical { |
1201 | @@ -488,7 +473,7 @@ |
1202 | box-shadow: inset 0 0 0 1px alpha (#fff, 0.10), |
1203 | inset 0 1px 0 0 alpha (#fff, 0.90), |
1204 | inset 0 -1px 0 0 alpha (#fff, 0.30), |
1205 | - 0 1px 2px alpha (@selected_bg_color, 0.95); |
1206 | + 0 1px 1px alpha (@selected_bg_color, 0.95); |
1207 | } |
1208 | |
1209 | .scale.slider:backdrop { |
1210 | @@ -715,7 +700,10 @@ |
1211 | |
1212 | .button:active, |
1213 | .button:hover:active, |
1214 | -.button:focus:active { |
1215 | +.button:focus:active, |
1216 | +.button:checked, |
1217 | +.button:hover:checked, |
1218 | +.button:focus:checked { |
1219 | background-color: alpha (#000, 0.05); |
1220 | background-image: none; |
1221 | border-color: alpha (#000, 0.25); |
1222 | @@ -787,7 +775,7 @@ |
1223 | color: #fff; |
1224 | |
1225 | box-shadow: 0 1px 0 1px alpha (#000, 0.30); |
1226 | - text-shadow: 0 1px 0 1px alpha (#000, 0.30); |
1227 | + text-shadow: 0 1px 0 alpha (#000, 0.30); |
1228 | |
1229 | background-clip: border-box; |
1230 | } |
1231 | @@ -1004,7 +992,7 @@ |
1232 | .dynamic-notebook .notebook.header { |
1233 | background-image: linear-gradient(to bottom, |
1234 | alpha (#000, 0.10), |
1235 | - alpha (#000, 0.00) 15% |
1236 | + alpha (#000, 0.00) 3px |
1237 | ), |
1238 | linear-gradient(to bottom, |
1239 | shade (@titlebar_color, 0.8), |
1240 | @@ -1020,7 +1008,7 @@ |
1241 | background-color: shade (@titlebar_color, 0.96); |
1242 | background-image: linear-gradient(to bottom, |
1243 | alpha (#000, 0.08), |
1244 | - alpha (#000, 0.00) 12% |
1245 | + alpha (#000, 0.00) 3px |
1246 | ); |
1247 | |
1248 | border-color: shade (@titlebar_color, 0.70); |
1249 | @@ -1096,7 +1084,7 @@ |
1250 | icon-shadow: 0 1px alpha (#fff, 0.4); |
1251 | |
1252 | box-shadow: inset 0 0 0 1px alpha (#fff, 0.20), |
1253 | - 0 0 0 1px shade (@titlebar_color, 0.56); |
1254 | + 0 0 1px 1px alpha (#000, 0.15); |
1255 | |
1256 | border-image: none; |
1257 | |
1258 | @@ -1110,7 +1098,7 @@ |
1259 | ); |
1260 | border-color: shade (@titlebar_color, 0.70); |
1261 | box-shadow: inset 0 0 0 1px alpha (#fff, 0.20), |
1262 | - 0 0 0 1px shade (@titlebar_color, 0.70); |
1263 | + 0 0 1px 1px alpha (#000, 0.10); |
1264 | } |
1265 | |
1266 | .notebook.header { |
1267 | @@ -1321,6 +1309,7 @@ |
1268 | } |
1269 | |
1270 | .content-view .menu, |
1271 | +<<<<<<< TREE |
1272 | .menu, |
1273 | .popup { |
1274 | padding: 0 1px; |
1275 | @@ -1329,6 +1318,21 @@ |
1276 | background-image: none; |
1277 | |
1278 | border: 1px solid alpha (#000, 0.4); |
1279 | +======= |
1280 | +.menu, |
1281 | +.popup { |
1282 | + padding: 4px 0; |
1283 | + border-radius: 4px; |
1284 | + background-color: transparent; |
1285 | + background-image: linear-gradient(to bottom, |
1286 | + alpha (@bg_color, 0.98), |
1287 | + alpha (@bg_color, 0.98) 80%, |
1288 | + alpha (shade(@bg_color, 0.92), 0.98) |
1289 | + ); |
1290 | + box-shadow: inset 0 0 0 1px alpha (#fff, 0.10), |
1291 | + inset 0 1px 0 0 alpha (#fff, 0.90), |
1292 | + inset 0 -1px 0 0 alpha (#fff, 0.30); |
1293 | +>>>>>>> MERGE-SOURCE |
1294 | } |
1295 | |
1296 | |
1297 | @@ -1413,7 +1417,7 @@ |
1298 | .menuitem.radio:hover, |
1299 | .menuitem.check:insensitive, |
1300 | .menuitem.radio:insensitive { |
1301 | - background-image: none; |
1302 | + -gtk-icon-source: none; |
1303 | background-color: transparent; |
1304 | box-shadow: none; |
1305 | } |
1306 | @@ -1438,17 +1442,17 @@ |
1307 | } |
1308 | |
1309 | .check { |
1310 | - background-image: url("assets/check.svg"); |
1311 | + -gtk-icon-source: url("assets/check.svg"); |
1312 | background-repeat: no-repeat; |
1313 | background-position: center; |
1314 | } |
1315 | |
1316 | .check:focus { |
1317 | - background-image: url("assets/check-focus.svg"); |
1318 | + -gtk-icon-source: url("assets/check-focus.svg"); |
1319 | } |
1320 | |
1321 | .radio { |
1322 | - background-image: url("assets/radio.svg"); |
1323 | + -gtk-icon-source: url("assets/radio.svg"); |
1324 | background-repeat: no-repeat; |
1325 | background-position: center; |
1326 | } |
1327 | @@ -1459,13 +1463,17 @@ |
1328 | } |
1329 | |
1330 | .check:active, |
1331 | -.menuitem.check:active { |
1332 | - background-image: url("assets/check-active.svg"); |
1333 | +.check:checked, |
1334 | +.menuitem.check:active, |
1335 | +.menuitem.check:checked { |
1336 | + -gtk-icon-source: url("assets/check-active.svg"); |
1337 | } |
1338 | |
1339 | .radio:active, |
1340 | -.menuitem.radio:active { |
1341 | - background-image: url("assets/radio-active.svg"); |
1342 | +.radio:checked, |
1343 | +.menuitem.radio:active, |
1344 | +.menuitem.radio:checked { |
1345 | + -gtk-icon-source: url("assets/radio-active.svg"); |
1346 | } |
1347 | |
1348 | /*********** |
1349 | @@ -1574,7 +1582,10 @@ |
1350 | |
1351 | .header-bar .button.image-button:active, |
1352 | .header-bar .button.image-button:hover:active, |
1353 | -.header-bar .button.image-button:focus:active { |
1354 | +.header-bar .button.image-button:focus:active, |
1355 | +.header-bar .button.image-button:checked, |
1356 | +.header-bar .button.image-button:hover:checked, |
1357 | +.header-bar .button.image-button:focus:checked { |
1358 | background-color: alpha (#000, 0.10); |
1359 | border: 1px solid @border_color; |
1360 | box-shadow: inset 0 0 0 1px alpha (#000, 0.05), |
1361 | @@ -1935,14 +1946,21 @@ |
1362 | background-color: @base_color; |
1363 | } |
1364 | |
1365 | -GtkListBoxRow:selected, |
1366 | -GtkListBoxRow:selected:backdrop, |
1367 | +.list-row.button { |
1368 | + background-image: none; |
1369 | + border: none; |
1370 | + border-radius: 0; |
1371 | + box-shadow: none; |
1372 | +} |
1373 | + |
1374 | +.list-row.button:selected, |
1375 | +.list-row.button:selected:backdrop, |
1376 | .view:selected { |
1377 | background-color: shade (@base_color, 0.80); |
1378 | color: @text_color; |
1379 | } |
1380 | |
1381 | -GtkListBoxRow:selected:focus, |
1382 | +.list-row.button:selected:focus, |
1383 | .view:selected:focus { |
1384 | background-color: @selected_bg_color; |
1385 | color: @selected_fg_color; |
1386 | @@ -2155,10 +2173,6 @@ |
1387 | -GtkTreeView-vertical-separator: 6px; |
1388 | } |
1389 | |
1390 | -.source-list.category-expander { |
1391 | - color: transparent; |
1392 | -} |
1393 | - |
1394 | .sidebar .view:prelight, |
1395 | .source-list.view:prelight { |
1396 | background-color: shade (@titlebar_color, 1.10); |
1397 | @@ -2242,14 +2256,9 @@ |
1398 | ) 1 1 1 1; |
1399 | } |
1400 | |
1401 | -.sidebar-pane-separator, |
1402 | -.sidebar-pane-separator:prelight, |
1403 | -.sidebar-pane-separator:selected { |
1404 | - |
1405 | - border-width: 0; |
1406 | - -GtkPaned-handle-size: 1; |
1407 | - background-image: none; |
1408 | - background-color: shade (@titlebar_color, 0.75); |
1409 | +.source-list.category-expander, |
1410 | +.source-list.category-expander:backdrop { |
1411 | + color: transparent; |
1412 | } |
1413 | |
1414 | .source-list.category-expander, |
1415 | @@ -2453,7 +2462,8 @@ |
1416 | * Popover * |
1417 | **********/ |
1418 | |
1419 | -GtkPopover { |
1420 | +.popover, |
1421 | +.popover.osd { |
1422 | border-radius: 5px; |
1423 | background-clip: border-box; |
1424 | background-color: @bg_color; |
1425 | @@ -2468,6 +2478,8 @@ |
1426 | text-shadow: none; |
1427 | } |
1428 | |
1429 | + |
1430 | +.popover .view, |
1431 | GtkPopover .view { |
1432 | background-color: transparent; |
1433 | } |
1434 | @@ -2600,7 +2612,6 @@ |
1435 | color: shade (@titlebar_color, 1.20); |
1436 | } |
1437 | |
1438 | - |
1439 | .titlebar .separator { |
1440 | color: transparent; |
1441 | } |
1442 | @@ -2650,6 +2661,24 @@ |
1443 | margin: 8px; |
1444 | } |
1445 | |
1446 | +.window-frame.dialog { |
1447 | + border-radius: 4px; |
1448 | +} |
1449 | + |
1450 | +.window-frame.menu.csd, |
1451 | +.window-frame.popup.csd { |
1452 | + border-radius: 4px; |
1453 | + box-shadow: 0 0 0 1px alpha (#000, 0.20), |
1454 | + 0 2px 7px 0 alpha (#000, 0.35); |
1455 | + margin: 0; |
1456 | +} |
1457 | + |
1458 | +.window-frame.tooltip.csd { |
1459 | + border-radius: 3px; |
1460 | + box-shadow: none; |
1461 | + margin: 0; |
1462 | +} |
1463 | + |
1464 | .window-frame:backdrop { |
1465 | box-shadow: 0 0 0 1px alpha (#000, 0.3), |
1466 | 0 6px 10px -3px alpha (#000, 0.90); |
1467 | @@ -2659,6 +2688,15 @@ |
1468 | * Dialog * |
1469 | ***************/ |
1470 | |
1471 | +GtkDialog.csd, |
1472 | +GtkMessageDialog.csd { |
1473 | + border-radius: 4px; |
1474 | +} |
1475 | + |
1476 | +GtkDialog.background { |
1477 | + border-radius: 0 0 4px 4px; |
1478 | +} |
1479 | + |
1480 | .prompt, |
1481 | GtkMessageDialog { |
1482 | -GtkDialog-button-spacing: 0; |
1483 | @@ -2707,7 +2745,6 @@ |
1484 | box-shadow: inset 1px 0 0 0 alpha (#fff, 0.20), |
1485 | inset -1px 0 0 0 alpha (#fff, 0.20), |
1486 | inset 0 -1px 0 0 alpha (#fff, 0.30); |
1487 | - |
1488 | } |
1489 | |
1490 | GtkDialog .toolbar { |
1491 | |
1492 | === added file 'gtk-3.0/white.css' |
1493 | --- gtk-3.0/white.css 1970-01-01 00:00:00 +0000 |
1494 | +++ gtk-3.0/white.css 2014-10-05 20:28:11 +0000 |
1495 | @@ -0,0 +1,28 @@ |
1496 | + |
1497 | +.titlebar.default-decoration { |
1498 | + border: none; |
1499 | + |
1500 | + background-image: none; |
1501 | + background-color: @bg_color; |
1502 | + |
1503 | + box-shadow: inset 1px 0 0 0 alpha (#fff, 0.20), |
1504 | + inset -1px 0 0 0 alpha (#fff, 0.20), |
1505 | + inset 0 1px 0 0 #fff; |
1506 | +} |
1507 | + |
1508 | +.toolbar { |
1509 | + background-image: linear-gradient(to bottom, |
1510 | + @bg_color, |
1511 | + shade (@bg_color, 0.90) |
1512 | + ); |
1513 | +} |
1514 | + |
1515 | +.toolbar .button { |
1516 | + border-color: transparent; |
1517 | + background-image: none; |
1518 | + box-shadow: none; |
1519 | +} |
1520 | + |
1521 | +.menubar { |
1522 | + background-color: @bg_color; |
1523 | +} |
1524 | \ No newline at end of file |