mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Ian 2012-12-22 13:28:46 +01:00
commit c3123d70d8
5 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
templates/2k11/admin/font/fontello.eot
View File

Binary file not shown.

33
templates/2k11/admin/font/fontello.svg
View File

@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20100429 at Tue Dec 4 00:30:45 2012
Created by FontForge 20100429 at Wed Dec 19 16:28:57 2012
By root
Copyright (C) 2012 by original authors @ fontello.com
</metadata>
@ -16,10 +16,10 @@ Copyright (C) 2012 by original authors @ fontello.com
panose-1="2 0 6 3 0 0 0 0 0 0"
ascent="850"
descent="-150"
bbox="15.8333 -61.3077 1001 761"
bbox="15.6316 -61.7752 1002.95 761.775"
underline-thickness="50"
underline-position="-100"
unicode-range="U+2302-1F554"
unicode-range="U+2302-1F6AB"
/>
<missing-glyph horiz-adv-x="364"
d="M33 0v666h265v-666h-265zM66 33h199v600h-199v-600z" />
@ -59,6 +59,9 @@ q-11 0 -19 -8l-54 -54q-7 -8 -7 -17z" />
<glyph glyph-name="uni2716" unicode="&#x2716;"
d="M16 350q0 171 120 291t290.5 120t290.5 -120t120 -291t-120 -291t-290.5 -120t-290.5 120t-120 291zM214 214q0 -5 5 -12l59 -60q13 -13 24 0l126 125l112 -114q5 -5 13 -5q6 0 11 5l58 58q12 12 0 24l-113 113l126 126q12 12 0 24l-60 59q-13 13 -24 0l-126 -125
l-113 114q-6 5 -12 5q-5 0 -13 -5l-56 -58q-13 -12 0 -24l112 -113l-124 -125q-5 -6 -5 -12z" />
<glyph glyph-name="uni2757" unicode="&#x2757;"
d="M16 350q0 171 120 291t290.5 120t290.5 -120t120 -291t-120 -291t-290.5 -120t-290.5 120t-120 291zM377 626q-16 0 -16 -16l8 -380q2 -15 15 -15h84q15 0 15 15l9 380q0 14 -16 16h-99zM365 76q0 -16 15 -16h93q6 0 11 5t5 11v90q0 6 -5 11t-11 5h-93q-15 0 -15 -16v-90
z" />
<glyph glyph-name="uni2795" unicode="&#x2795;"
d="M16 350q0 171 120 291t290.5 120t290.5 -120t120 -291t-120 -291t-290.5 -120t-290.5 120t-120 291zM190 309q0 -17 16 -17h161v-177q0 -17 17 -17h85q16 0 16 17v177h162q6 0 11 5t5 12v81q0 7 -5 12t-11 5h-162v178q0 17 -16 17h-85q-17 0 -17 -17v-178h-161
q-16 0 -16 -17v-81z" />
@ -80,6 +83,9 @@ M369 547q0 -6 4.5 -11t10.5 -5h97q15 0 15 16v85q0 15 -15 15h-97q-15 0 -15 -15v-85
d="M28 392q124 198 328 255q64 19 134 19q138 0 259 -72q123 -72 203 -202q25 -41 0 -84q-126 -199 -328 -255q-64 -19 -134 -19q-135 0 -258 72q-124 72 -204 202q-12 19 -12 42q0 21 12 42zM297 538q-123 -62 -202 -188q107 -168 278 -220q55 -17 117 -17q117 0 224 64
q101 61 171 173q-86 136 -218 197q55 -65 55 -151q0 -98 -69.5 -167.5t-167 -69.5t-167 69.5t-69.5 167.5q0 76 48 142zM332 396q0 -11 8.5 -20t20.5 -9t21 9t9 20q0 40 27.5 67.5t66.5 27.5q13 0 21.5 9t8.5 21t-8.5 20.5t-21.5 8.5q-50 0 -86.5 -26.5t-54.5 -67.5
q-12 -28 -12 -60z" />
<glyph glyph-name="uniE70D" unicode="&#xe70d;" horiz-adv-x="996"
d="M16 691q0 25 18.5 43.5t43.5 18.5h234q41 0 85 -27q15 -10 21 -17l344 -384q17 -19 17.5 -44t-17.5 -44l-270 -269q-18 -18 -44.5 -19t-43.5 19l-344 383q-17 19 -30.5 49t-13.5 57v234zM116 592q0 -24 18.5 -42t42.5 -18q23 0 41.5 18.5t18.5 41.5q0 24 -18 42.5
t-42 18.5q-25 0 -43 -18t-18 -43zM422 752h90q28 0 59.5 -13.5t46.5 -30.5l344 -384q18 -20 18 -45.5t-18 -43.5l-269 -269q-18 -18 -44.5 -18.5t-44.5 18.5l-6 7l264 264q18 18 18 44t-18 44l-344 384q-30 36 -96 43z" />
<glyph glyph-name="uniE718" unicode="&#xe718;" horiz-adv-x="1017"
d="M16 401q0 148 145 254t347.5 106t347.5 -106t145 -254q0 -147 -145 -255q-143 -106 -347 -106q-48 0 -93 7q-110 -87 -265 -108q-12 -2 -20.5 9t0.5 21q6 7 17 18t19.5 20.5t14.5 21.5q18 30 28 85q-89 50 -141.5 124.5t-52.5 162.5z" />
<glyph glyph-name="uniE720" unicode="&#xe720;" horiz-adv-x="1017"
@ -99,6 +105,10 @@ q-17 0 -17 16v86h-86q-7 0 -12 5t-5 13z" />
<glyph glyph-name="uniE751" unicode="&#xe751;"
d="M547 133q-85 -57 -189 -57q-140 0 -242 100q-100 98 -100 242t100 242q101 101 242 101q143 0 242 -101q100 -103 100 -242q0 -106 -57 -188l185 -184q9 -10 9 -25q0 -12 -9 -24l-49 -48q-10 -10 -24.5 -10t-23.5 10zM153 418q0 -68 35 -116.5t91 -72.5q38 -16 79 -16
q67 0 115.5 35t73.5 89q16 40 16 81q0 83 -60 145q-59 61 -145 61q-67 0 -115.5 -36t-72.5 -91q-17 -40 -17 -79zM221 402v33q0 17 17 17h240q17 0 17 -17v-33q0 -8 -5 -13t-12 -5h-240q-7 0 -12 5t-5 13z" />
<glyph glyph-name="uniE760" unicode="&#xe760;" horiz-adv-x="1018"
d="M97 341q4 14 18.5 21.5t31.5 3.5l225 -78q23 -9 23.5 -22t-21.5 -23l-103 -51q42 -61 108 -98.5t152 -29.5q117 8 193 94q38 42 57 100q6 17 26 12l79 -26q19 -8 11 -26q-55 -161 -206 -235q-155 -76 -315 -23q-139 49 -216 176l-105 -50q-22 -13 -33 -4t-3 33zM121 482
q26 78 80.5 139.5t125.5 95.5q153 76 315 23q139 -49 216 -176l105 50q22 12 33.5 3.5t2.5 -31.5l-78 -227q-4 -14 -17.5 -21.5t-31.5 -3.5l-225 78q-24 9 -24.5 21.5t20.5 23.5l104 51q-40 61 -107 98t-152 30q-117 -8 -194 -94q-38 -42 -57 -100q-5 -17 -25 -12l-79 26
q-19 8 -12 26z" />
<glyph glyph-name="uniE78E" unicode="&#xe78e;" horiz-adv-x="797"
d="M16 330q0 102 47 183.5t120 132.5q7 5 15.5 3.5t12.5 -7.5l46 -68q12 -14 -5 -27q-52 -35 -83.5 -90.5t-31.5 -126.5q0 -110 76 -185.5t185 -75.5q107 0 185 76q77 74 77 185q0 71 -32 126.5t-83 90.5q-16 13 -5 27l45 68q12 13 29 4q74 -51 120.5 -132.5t46.5 -183.5
q0 -158 -112.5 -270.5t-270.5 -112.5t-271 112q-111 112 -111 271zM338 371v362q0 20 20 20h81q7 0 13.5 -5.5t6.5 -14.5v-362q0 -20 -20 -20h-81q-20 0 -20 20z" />
@ -135,6 +145,13 @@ d="M56 -45q-17 0 -28.5 11.5t-11.5 28.5v111q0 17 11.5 28t28.5 11h869q15 0 26.5 -1
h-869zM16 594v112q0 17 11.5 28t28.5 11h869q15 0 26.5 -11.5t11.5 -27.5v-112q0 -15 -11.5 -27t-26.5 -12h-869q-17 0 -28.5 11t-11.5 28z" />
<glyph glyph-name="uniF0DC" unicode="&#xf0dc;" horiz-adv-x="663"
d="M16 255q0 16 11.5 28t27.5 12h553q16 0 28 -11.5t12 -28.5t-12 -28l-276 -276q-11 -12 -28 -12t-29 12l-276 276q-11 11 -11 28zM16 445q0 17 11 28l276 276q12 12 29 12t28 -12l276 -276q12 -11 12 -28t-12 -28.5t-28 -11.5h-553q-16 0 -27.5 12t-11.5 28z" />
<glyph glyph-name="uniF0DD" unicode="&#xf0dd;" horiz-adv-x="663"
d="M16 488q0 16 11.5 28t27.5 12h554q15 0 27 -12t12 -28q0 -17 -12 -28l-276 -276q-11 -12 -28 -12q-18 0 -28 12l-277 276q-11 11 -11 28z" />
<glyph glyph-name="uniF0DE" unicode="&#xf0de;" horiz-adv-x="663"
d="M16 212q0 17 11 28l276 276q12 12 29 12t28 -12l276 -276q12 -11 12 -28q0 -16 -12 -28t-27 -12h-554q-16 0 -27.5 12t-11.5 28z" />
<glyph glyph-name="uniF0E0" unicode="&#xf0e0;" horiz-adv-x="979"
d="M75 -45q-24 0 -41.5 17.5t-17.5 41.5v466q6 -7 21 -17l261 -199q82 -66 138 -82q27 -9 53 -9q73 0 149 57q32 23 89 68.5t84 65.5l142 107q6 4 10 9v-466q0 -24 -17 -41.5t-41 -17.5h-830zM17 692q0 20 18.5 36.5t39.5 16.5h830q21 0 39 -16.5t18 -36.5q0 -28 -32 -73
q-29 -38 -57 -61l-248 -187q-10 -7 -29.5 -23t-37 -28t-34 -20.5t-33.5 -8.5h-2q-28 0 -71 31q-12 8 -34 26l-30 23l-124 94l-124 93q-53 43 -80 99q-9 19 -9 35z" />
<glyph glyph-name="u1F304" unicode="&#x1f304;" horiz-adv-x="979"
d="M75 -45q-24 0 -41.5 17.5t-17.5 41.5v672q0 24 17.5 41.5t41.5 17.5h830q24 0 41 -17.5t17 -41.5v-672q0 -24 -17 -41.5t-41 -17.5h-830zM885 34v632h-790v-632h790zM174 167l142 185l97 -80l182 276l211 -218v-217h-632v54zM174 507q0 34 23 57t57 23q32 0 55.5 -23.5
t23.5 -56.5t-23.5 -56t-56 -23t-56 23t-23.5 56z" />
@ -153,6 +170,14 @@ h-158q-17 0 -28 11.5t-11 28.5v257h-158q-17 0 -20 7z" />
<glyph glyph-name="u1F4E5" unicode="&#x1f4e5;" horiz-adv-x="979"
d="M943 311q20 0 20 -20v-316q0 -20 -20 -20h-907q-20 0 -20 20v316q0 8 5.5 14t14.5 6h118q20 0 20 -20v-178h632v178q0 8 5.5 14t14.5 6h117zM194 441q3 8 20 8h158v257q0 17 11 28t28 11h158q16 0 28 -11t12 -28v-257h158q16 0 18.5 -8.5t-8.5 -19.5l-259 -261
q-12 -11 -28.5 -11t-28.5 11l-259 261q-11 11 -8 20z" />
<glyph glyph-name="u1F500" unicode="&#x1f500;" horiz-adv-x="979"
d="M36 66q-9 0 -14.5 6t-5.5 14v79q0 8 5.5 14t14.5 6h112q50 0 99 59q35 40 93 132l44 68q11 18 40.5 57.5t57 62.5t58.5 40q39 21 93 21h104v95q0 22 13.5 25t29.5 -11l172 -143q11 -9 11 -23q0 -15 -11 -24l-172 -142q-16 -14 -29.5 -11t-13.5 25v90h-104q-29 0 -52 -16
q-42 -27 -95 -105l-48 -77q-37 -58 -64.5 -95.5t-56.5 -67.5q-77 -79 -169 -79h-112zM36 507q-9 0 -14.5 5.5t-5.5 13.5v79q0 20 20 20h112q95 0 173 -82q21 -22 45 -54l-60 -92q-1 -3 -4 -7t-5 -7q-39 55 -72 88q-35 36 -77 36h-112zM416 204l30 45l28 43q2 3 5 8.5t5 9.5
q40 -57 72 -87q38 -36 77 -36h104v98q0 22 13.5 25t29.5 -11l172 -142q11 -9 11 -24q0 -14 -11 -23l-172 -143q-16 -14 -29.5 -11t-13.5 25v87h-104q-94 0 -173 83q-27 28 -44 53z" />
<glyph glyph-name="u1F50D" unicode="&#x1f50d;"
d="M547 133q-90 -57 -189 -57q-140 0 -242 100q-100 100 -100 242q0 144 100 242q101 101 242 101q138 0 241 -101q101 -102 101 -242q0 -99 -57 -188l185 -184q9 -10 9 -25q0 -16 -32.5 -49t-49.5 -33q-15 0 -24 10zM153 418q0 -68 35 -116.5t91 -72.5q38 -16 79 -16
q67 0 115.5 35.5t73.5 89.5q16 40 16 80q0 84 -61 145q-59 61 -144 61q-67 0 -115.5 -36t-72.5 -91q-17 -40 -17 -79zM229 418q0 43 22.5 74t55.5 45q27 11 51 11q11 0 18 -8t7 -18.5t-7 -18t-18 -7.5q-33 0 -55.5 -22.5t-22.5 -55.5q0 -10 -7.5 -17.5t-17.5 -7.5
q-12 0 -19 7.5t-7 17.5z" />
<glyph glyph-name="u1F512" unicode="&#x1f512;" horiz-adv-x="676"
d="M76 -53q-23 0 -41.5 18.5t-18.5 42.5v321q0 43 40 57v85q0 117 82 199q83 83 200 83t200 -83q82 -82 82 -199v-85q40 -14 40 -57v-321q0 -24 -18.5 -42.5t-41.5 -18.5h-524zM499 390v81q0 104 -99 148q-29 12 -62 12q-54 0 -92 -27.5t-56 -70.5q-13 -29 -13 -62v-81h322z
M270 32h136l-33 146q33 20 33 58q0 29 -20 49.5t-48 20.5t-48 -20.5t-20 -49.5q0 -39 33 -57z" />
@ -167,5 +192,7 @@ q-11 15 -11 21z" />
<glyph glyph-name="u1F554" unicode="&#x1f554;"
d="M16 350q0 171 120 291t290.5 120t290.5 -120t120 -291t-120 -291t-290.5 -120t-290.5 120t-120 291zM139 350q0 -119 84 -203t203 -84t203.5 84t84.5 203t-84.5 203t-203.5 84t-203 -84t-84 -203zM342 268v239q0 17 12 29t29 12h41q18 0 29.5 -11.5t11.5 -29.5v-157h104
q16 0 28.5 -12t12.5 -29v-41q0 -17 -12.5 -29t-28.5 -12h-186q-17 0 -29 12t-12 29z" />
<glyph glyph-name="u1F6AB" unicode="&#x1f6ab;"
d="M16 350q0 171 120 291t290.5 120t290.5 -120t120 -291t-120 -291t-290.5 -120t-290.5 120t-120 291zM581 591q-72 46 -155 46q-119 0 -203 -84t-84 -203q0 -84 46 -155zM272 108q73 -45 154 -45q119 0 203.5 84t84.5 203q0 81 -45 155z" />
</font>
</defs></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
templates/2k11/admin/font/fontello.ttf
View File

Binary file not shown.

BIN
templates/2k11/admin/font/fontello.woff
View File

Binary file not shown.

9
templates/2k11/admin/style.css
View File

@ -396,6 +396,7 @@ nav ol { padding: 0; }
.icon-edit:before { content: '\270d'; } /* '✍' */
.icon-ok-circle:before { content: '\2714'; } /* '✔' */
.icon-cancel-circle:before { content: '\2716'; } /* '✖' */
.icon-attention-circle:before { content: '\2757'; } /* '❗' */
.icon-plus-circle:before { content: '\2795'; } /* '➕' */
.icon-minus-circle:before { content: '\2796'; } /* '➖' */
.icon-ccw:before { content: '\27f2'; } /* '⟲' */
@ -403,12 +404,14 @@ nav ol { padding: 0; }
.icon-help-circle:before { content: '\e704'; } /* '' */
.icon-info-circle:before { content: '\e705'; } /* '' */
.icon-eye:before { content: '\e70a'; } /* '' */
.icon-tags:before { content: '\e70d'; } /* '' */
.icon-comment:before { content: '\e718'; } /* '' */
.icon-chat:before { content: '\e720'; } /* '' */
.icon-trash:before { content: '\e729'; } /* '' */
.icon-resize-full:before { content: '\e744'; } /* '' */
.icon-zoom-in:before { content: '\e750'; } /* '' */
.icon-zoom-out:before { content: '\e751'; } /* '' */
.icon-arrows-cw:before { content: '\e760'; } /* '' */
.icon-off:before { content: '\e78e'; } /* '' */
.icon-move:before { content: '\f047'; } /* '' */
.icon-link-ext:before { content: '\f08e'; } /* '' */
@ -421,16 +424,22 @@ nav ol { padding: 0; }
.icon-resize-full-alt:before { content: '\f0b2'; } /* '' */
.icon-menu:before { content: '\f0c9'; } /* '' */
.icon-sort:before { content: '\f0dc'; } /* '' */
.icon-sort-down:before { content: '\f0dd'; } /* '' */
.icon-sort-up:before { content: '\f0de'; } /* '' */
.icon-mail-alt:before { content: '\f0e0'; } /* '' */
.icon-picture:before { content: '🌄'; } /* '\1f304' */
.icon-user:before { content: '👤'; } /* '\1f464' */
.icon-users:before { content: '👥'; } /* '\1f465' */
.icon-folder-open:before { content: '📂'; } /* '\1f4c2' */
.icon-upload:before { content: '📤'; } /* '\1f4e4' */
.icon-download:before { content: '📥'; } /* '\1f4e5' */
.icon-shuffle:before { content: '🔀'; } /* '\1f500' */
.icon-search:before { content: '🔍'; } /* '\1f50d' */
.icon-lock:before { content: '🔒'; } /* '\1f512' */
.icon-lock-open:before { content: '🔓'; } /* '\1f513' */
.icon-link:before { content: '🔗'; } /* '\1f517' */
.icon-clock:before { content: '🕔'; } /* '\1f554' */
.icon-block:before { content: '🚫'; } /* '\1f6ab' */
.icon_link {
display: inline-block;