Merge lp:~rpadovani/ubuntu-it-ask/icon into lp:~ubuntu-it-ask/ubuntu-it-ask/dev

Proposed by Giuseppe Terrasi
Status: Merged
Merged at revision: 69
Proposed branch: lp:~rpadovani/ubuntu-it-ask/icon
Merge into: lp:~ubuntu-it-ask/ubuntu-it-ask/dev
Diff against target: 237 lines (+44/-65)
1 file modified
forum/skins/light/media/style/style.css (+44/-65)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-it-ask/icon
Reviewer Review Type Date Requested Status
Ubuntu-it Ask Pending
Review via email: mp+127140@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'forum/skins/light/media/images/badges.png'
0Binary files forum/skins/light/media/images/badges.png 2012-09-24 12:05:27 +0000 and forum/skins/light/media/images/badges.png 1970-01-01 00:00:00 +0000 differ0Binary files forum/skins/light/media/images/badges.png 2012-09-24 12:05:27 +0000 and forum/skins/light/media/images/badges.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/blue-up-arrow-h18px.png'
1Binary files forum/skins/light/media/images/blue-up-arrow-h18px.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/blue-up-arrow-h18px.png 1970-01-01 00:00:00 +0000 differ1Binary files forum/skins/light/media/images/blue-up-arrow-h18px.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/blue-up-arrow-h18px.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/close-small-dark.png'
2Binary files forum/skins/light/media/images/close-small-dark.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small-dark.png 1970-01-01 00:00:00 +0000 differ2Binary files forum/skins/light/media/images/close-small-dark.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small-dark.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/close-small-hover.png'
3Binary files forum/skins/light/media/images/close-small-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small-hover.png 1970-01-01 00:00:00 +0000 differ3Binary files forum/skins/light/media/images/close-small-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small-hover.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/close-small.png'
4Binary files forum/skins/light/media/images/close-small.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small.png 1970-01-01 00:00:00 +0000 differ4Binary files forum/skins/light/media/images/close-small.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/comment-delete-hover.png'
5Binary files forum/skins/light/media/images/comment-delete-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-delete-hover.png 1970-01-01 00:00:00 +0000 differ5Binary files forum/skins/light/media/images/comment-delete-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-delete-hover.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/comment-delete.png'
6Binary files forum/skins/light/media/images/comment-delete.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-delete.png 1970-01-01 00:00:00 +0000 differ6Binary files forum/skins/light/media/images/comment-delete.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/comment-edit-hover.png'
7Binary files forum/skins/light/media/images/comment-edit-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-edit-hover.png 1970-01-01 00:00:00 +0000 differ7Binary files forum/skins/light/media/images/comment-edit-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-edit-hover.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/comment-edit.png'
8Binary files forum/skins/light/media/images/comment-edit.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-edit.png 1970-01-01 00:00:00 +0000 differ8Binary files forum/skins/light/media/images/comment-edit.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-edit.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/comment-like-on.png'
9Binary files forum/skins/light/media/images/comment-like-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-like-on.png 1970-01-01 00:00:00 +0000 differ9Binary files forum/skins/light/media/images/comment-like-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-like-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/comment-like.png'
10Binary files forum/skins/light/media/images/comment-like.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-like.png 1970-01-01 00:00:00 +0000 differ10Binary files forum/skins/light/media/images/comment-like.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-like.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/convert-hover.png'
11Binary files forum/skins/light/media/images/convert-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-hover.png 1970-01-01 00:00:00 +0000 differ11Binary files forum/skins/light/media/images/convert-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-hover.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/convert-off.png'
12Binary files forum/skins/light/media/images/convert-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-off.png 1970-01-01 00:00:00 +0000 differ12Binary files forum/skins/light/media/images/convert-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/convert-to-question-hover.png'
13Binary files forum/skins/light/media/images/convert-to-question-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-to-question-hover.png 1970-01-01 00:00:00 +0000 differ13Binary files forum/skins/light/media/images/convert-to-question-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-to-question-hover.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/convert-to-question-off.png'
14Binary files forum/skins/light/media/images/convert-to-question-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-to-question-off.png 1970-01-01 00:00:00 +0000 differ14Binary files forum/skins/light/media/images/convert-to-question-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-to-question-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/edit.png'
15Binary files forum/skins/light/media/images/edit.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/edit.png 1970-01-01 00:00:00 +0000 differ15Binary files forum/skins/light/media/images/edit.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/edit.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/gray-up-arrow-h18px.png'
16Binary files forum/skins/light/media/images/gray-up-arrow-h18px.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/gray-up-arrow-h18px.png 1970-01-01 00:00:00 +0000 differ16Binary files forum/skins/light/media/images/gray-up-arrow-h18px.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/gray-up-arrow-h18px.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/grippie.png'
17Binary files forum/skins/light/media/images/grippie.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/grippie.png 1970-01-01 00:00:00 +0000 differ17Binary files forum/skins/light/media/images/grippie.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/grippie.png 1970-01-01 00:00:00 +0000 differ
=== added file 'forum/skins/light/media/images/icon.png'
18Binary files forum/skins/light/media/images/icon.png 1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/icon.png 2012-09-30 06:30:28 +0000 differ18Binary files forum/skins/light/media/images/icon.png 1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/icon.png 2012-09-30 06:30:28 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-accepted-on.png'
19Binary files forum/skins/light/media/images/vote-accepted-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-accepted-on.png 1970-01-01 00:00:00 +0000 differ19Binary files forum/skins/light/media/images/vote-accepted-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-accepted-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-accepted.png'
20Binary files forum/skins/light/media/images/vote-accepted.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-accepted.png 1970-01-01 00:00:00 +0000 differ20Binary files forum/skins/light/media/images/vote-accepted.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-accepted.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-arrow-down-on.png'
21Binary files forum/skins/light/media/images/vote-arrow-down-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-down-on.png 1970-01-01 00:00:00 +0000 differ21Binary files forum/skins/light/media/images/vote-arrow-down-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-down-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-arrow-down.png'
22Binary files forum/skins/light/media/images/vote-arrow-down.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-down.png 1970-01-01 00:00:00 +0000 differ22Binary files forum/skins/light/media/images/vote-arrow-down.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-down.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-arrow-up-on.png'
23Binary files forum/skins/light/media/images/vote-arrow-up-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-up-on.png 1970-01-01 00:00:00 +0000 differ23Binary files forum/skins/light/media/images/vote-arrow-up-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-up-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-arrow-up.png'
24Binary files forum/skins/light/media/images/vote-arrow-up.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-up.png 1970-01-01 00:00:00 +0000 differ24Binary files forum/skins/light/media/images/vote-arrow-up.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-up.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-favorite-off.png'
25Binary files forum/skins/light/media/images/vote-favorite-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-favorite-off.png 1970-01-01 00:00:00 +0000 differ25Binary files forum/skins/light/media/images/vote-favorite-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-favorite-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'forum/skins/light/media/images/vote-favorite-on.png'
26Binary files forum/skins/light/media/images/vote-favorite-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-favorite-on.png 1970-01-01 00:00:00 +0000 differ26Binary files forum/skins/light/media/images/vote-favorite-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-favorite-on.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'forum/skins/light/media/style/style.css'
--- forum/skins/light/media/style/style.css 2012-09-25 15:00:38 +0000
+++ forum/skins/light/media/style/style.css 2012-09-30 06:30:28 +0000
@@ -393,7 +393,6 @@
393393
394#top * {394#top * {
395 line-height: 40px;395 line-height: 40px;
396 height: 40px;
397}396}
398397
399#top span {398#top span {
@@ -790,13 +789,14 @@
790}789}
791790
792.medal span, .bronze, .silver, .gold {791.medal span, .bronze, .silver, .gold {
793 background: url("../images/badges.png");792 background: url("../images/icon.png");
794 text-indent: -10000px;793 text-indent: -10000px;
795 width: 18px;794 width: 18px;
796 min-height: 17px;795 height: 17px;
797 display: inline-block;796 display: inline-block;
798 background-position-y: center;797 background-position-y: top;
799 background-repeat: no-repeat;798 background-repeat: no-repeat;
799 vertical-align: middle;
800}800}
801801
802.badgecount {802.badgecount {
@@ -1274,11 +1274,6 @@
1274 -webkit-border-radius: 4px;1274 -webkit-border-radius: 4px;
1275}1275}
12761276
1277.user-edit-link {
1278 background: url("../images/edit.png") no-repeat scroll 0 0 transparent;
1279 padding-left: 20px;
1280}
1281
1282.user-info-table {1277.user-info-table {
1283 margin-bottom: 10px;1278 margin-bottom: 10px;
1284 width: 100%;1279 width: 100%;
@@ -1390,7 +1385,7 @@
13901385
1391.bronze, .badge3 {1386.bronze, .badge3 {
1392 color: #CC9933;1387 color: #CC9933;
1393 background-position: -61px !important;1388 background-position-x: -61px !important;
1394}1389}
13951390
1396.score, .accept_rate {1391.score, .accept_rate {
@@ -1775,28 +1770,31 @@
1775 width: 24px;1770 width: 24px;
1776}1771}
17771772
1773/*Icone con hover da 24px*/
1774a.post-vote.up, a.post-vote.down, a.accept-answer, .favorite-mark {
1775 background-image: url("../images/icon.png");
1776 background-repeat: no-repeat;
1777 background-color: transparent;
1778}
1779
1778a.post-vote.up {1780a.post-vote.up {
1779 background: url("../images/vote-arrow-up.png") no-repeat scroll center center transparent;1781 background-position-y: -157px;
1780}
1781
1782a.post-vote.up.on, a.post-vote.up:hover {
1783 background: url("../images/vote-arrow-up-on.png") no-repeat scroll center center transparent;
1784}1782}
17851783
1786a.post-vote.down {1784a.post-vote.down {
1787 background: url("../images/vote-arrow-down.png") no-repeat scroll center center transparent;1785 background-position-y: -132px;
1788}
1789
1790a.post-vote.down.on, a.post-vote.down:hover {
1791 background: url("../images/vote-arrow-down-on.png") no-repeat scroll center center transparent;
1792}1786}
17931787
1794a.accept-answer {1788a.accept-answer {
1795 background: url("../images/vote-accepted.png") no-repeat scroll center center transparent;1789 background-position-y: -105px;
1796}1790}
17971791
1798a.accept-answer.on, a.accept-answer:hover {1792.favorite-mark {
1799 background: url("../images/vote-accepted-on.png") no-repeat scroll center center transparent;1793 background-position-y: -185px;
1794}
1795
1796a.post-vote.up.on, a.post-vote.up:hover, a.post-vote.down.on, a.post-vote.down:hover, a.accept-answer.on, a.accept-answer:hover, .favorite-mark.on, a.favorite-mark:hover {
1797 background-position-x: -31px;
1800}1798}
18011799
1802.community-wiki {1800.community-wiki {
@@ -1817,14 +1815,6 @@
1817 padding: 0 0 3px;1815 padding: 0 0 3px;
1818}1816}
18191817
1820.favorite-mark {
1821 background: url("../images/vote-favorite-off.png") no-repeat scroll center center transparent;
1822}
1823
1824.favorite-mark.on, a.favorite-mark:hover {
1825 background: url("../images/vote-favorite-on.png") no-repeat scroll center center transparent;
1826}
1827
1828.favorite-count {1818.favorite-count {
1829 color: #777777;1819 color: #777777;
1830 font-family: Arial;1820 font-family: Arial;
@@ -1897,49 +1887,38 @@
1897 margin-left: 4px;1887 margin-left: 4px;
1898}1888}
18991889
1900a.comment-like, a.comment-delete, a.comment-edit, a.comment-convert, a.comment-convert-to-question {1890/*Icone con hover da 14px*/
1891a.comment-delete, a.comment-edit, a.comment-like, a.comment-convert, a.comment-convert-to-question {
1892 background-image: url("../images/icon.png");
1893 background-repeat: no-repeat;
1894 background-color: transparent;
1895
1901 margin-left: 2px;1896 margin-left: 2px;
1902 width: 18px;1897 width: 18px;
1903}1898}
19041899
1900a.comment-delete {
1901 background-position-y: -18px;
1902}
1903
1904a.comment-edit {
1905 background-position-y: -36px;
1906}
1907
1905a.comment-like {1908a.comment-like {
1906 background: url("../images/comment-like.png") no-repeat scroll center center transparent;1909 background-position-y: -52px;
1907}
1908
1909a.comment-like:hover, a.comment-like.on {
1910 background: url("../images/comment-like-on.png") no-repeat scroll center center transparent;
1911}
1912
1913a.comment-delete {
1914 background: url("../images/comment-delete.png") no-repeat scroll center center transparent;
1915}
1916
1917a.comment-delete:hover {
1918 background: url("../images/comment-delete-hover.png") no-repeat scroll center center transparent;
1919}1910}
19201911
1921a.comment-convert {1912a.comment-convert {
1922 background: url("../images/convert-off.png") no-repeat scroll center center transparent;1913 background-position-y: -69px;
1923}
1924
1925a.comment-convert:hover {
1926 background: url("../images/convert-hover.png") no-repeat scroll center center transparent;
1927}1914}
19281915
1929a.comment-convert-to-question {1916a.comment-convert-to-question {
1930 background: url("../images/convert-to-question-off.png") no-repeat scroll center center transparent;1917 background-position-y: -86px;
1931}1918}
19321919
1933a.comment-convert-to-question:hover {1920a.comment-delete:hover, a.comment-edit:hover, a.comment-like:hover, a.comment-like.on, a.comment-convert:hover, a.comment-convert-to-question:hover {
1934 background: url("../images/convert-to-question-hover.png") no-repeat scroll center center transparent;1921 background-position-x: -19px;
1935}
1936
1937a.comment-edit {
1938 background: url("../images/comment-edit.png") no-repeat scroll center center transparent;
1939}
1940
1941a.comment-edit:hover {
1942 background: url("../images/comment-edit-hover.png") no-repeat scroll center center transparent;
1943}1922}
19441923
1945img.subscription-remove {1924img.subscription-remove {

Subscribers

People subscribed via source and target branches

to all changes: