From 42ff337ad2b6002afe7659b061a8987c1f91d187 Mon Sep 17 00:00:00 2001 From: Cory Chaplin Date: Sun, 2 Mar 2014 14:08:16 +0100 Subject: [PATCH] Switch chanlist from an id to a css class --- client/assets/css/style.css | 4 ++-- client/assets/themes/basic/style.css | 14 +++++++------- client/assets/themes/cli/style.css | 14 +++++++------- client/assets/themes/mini/style.css | 12 ++++++------ client/assets/themes/relaxed/style.css | 14 +++++++------- client/src/applets/chanlist.js | 4 ++-- client/src/index.html.tmpl | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/client/assets/css/style.css b/client/assets/css/style.css index 2215f4b..dfaa408 100644 --- a/client/assets/css/style.css +++ b/client/assets/css/style.css @@ -467,9 +467,9 @@ html, body { height:100%; } } #kiwi .ui_menu .ui_menu_foot .close { } -#kiwi .applet #chanlist .icon-sort-down:before, #kiwi .applet #chanlist .icon-sort-up:before { +#kiwi .applet .applet_chanlist .icon-sort-down:before, #kiwi .applet .applet_chanlist .icon-sort-up:before { padding-left: 1em; } -#kiwi .applet #chanlist td { +#kiwi .applet .applet_chanlist td { min-width: 120px; } \ No newline at end of file diff --git a/client/assets/themes/basic/style.css b/client/assets/themes/basic/style.css index 7295569..aee4195 100644 --- a/client/assets/themes/basic/style.css +++ b/client/assets/themes/basic/style.css @@ -296,27 +296,27 @@ border-bottom-right-radius:0; border-top-right-radius:0; } -#kiwi #chanlist { +#kiwi .applet_chanlist { margin: 0.5em 1em; } -#kiwi #chanlist table { +#kiwi .applet_chanlist table { border-collapse: collapse; width: 100%; } -#kiwi #chanlist thead { +#kiwi .applet_chanlist thead { text-align: center; } -#kiwi #chanlist tbody td { +#kiwi .applet_chanlist tbody td { border: 1px solid #C4C4C4; padding: 0.3em 1em; } -#kiwi #chanlist .chanlist_name, #kiwi #chanlist .chanlist_num_users { +#kiwi .applet_chanlist .chanlist_name, #kiwi .applet_chanlist .chanlist_num_users { border-width: 0 1px 0 0; } -#kiwi #chanlist .chanlist_topic { +#kiwi .applet_chanlist .chanlist_topic { border-width: 0; } -#kiwi #chanlist tr:nth-child(even) { +#kiwi .applet_chanlist tr:nth-child(even) { background: none repeat scroll 0 0 #DBDBDB; } diff --git a/client/assets/themes/cli/style.css b/client/assets/themes/cli/style.css index 63910a6..6d47354 100644 --- a/client/assets/themes/cli/style.css +++ b/client/assets/themes/cli/style.css @@ -233,27 +233,27 @@ #kiwi.chanlist_treeview .tabs ul li { display:block; float:none; } #kiwi.chanlist_treeview .tabs ul li .activity { float:right; } #kiwi.chanlist_treeview .tabs ul li.active { padding-left:1em; } -#kiwi #chanlist { +#kiwi .applet_chanlist { margin: 0.5em 1em; } -#kiwi #chanlist table { +#kiwi .applet_chanlist table { border-collapse: collapse; width: 100%; } -#kiwi #chanlist thead { +#kiwi .applet_chanlist thead { text-align: center; } -#kiwi #chanlist tbody td { +#kiwi .applet_chanlist tbody td { border: 1px solid #454545; padding: 0.3em 1em; } -#kiwi #chanlist .chanlist_name, #kiwi #chanlist .chanlist_num_users { +#kiwi .applet_chanlist .chanlist_name, #kiwi .applet_chanlist .chanlist_num_users { border-width: 0 1px 0 0; } -#kiwi #chanlist .chanlist_topic { +#kiwi .applet_chanlist .chanlist_topic { border-width: 0; } -#kiwi #chanlist tr:nth-child(even) { +#kiwi .applet_chanlist tr:nth-child(even) { background: none repeat scroll 0 0 #2B2929; } diff --git a/client/assets/themes/mini/style.css b/client/assets/themes/mini/style.css index 5e8b685..82e3239 100644 --- a/client/assets/themes/mini/style.css +++ b/client/assets/themes/mini/style.css @@ -116,24 +116,24 @@ #kiwi #chanlist { margin: 0.5em 1em; } -#kiwi #chanlist table { +#kiwi .applet_chanlist table { border-collapse: collapse; width: 100%; } -#kiwi #chanlist thead { +#kiwi .applet_chanlist thead { text-align: center; } -#kiwi #chanlist tbody td { +#kiwi .applet_chanlist tbody td { border: 1px solid #C4C4C4; padding: 0.3em 1em; } -#kiwi #chanlist .chanlist_name, #kiwi #chanlist .chanlist_num_users { +#kiwi .applet_chanlist .chanlist_name, #kiwi .applet_chanlist .chanlist_num_users { border-width: 0 1px 0 0; } -#kiwi #chanlist .chanlist_topic { +#kiwi .applet_chanlist .chanlist_topic { border-width: 0; } -#kiwi #chanlist tr:nth-child(even) { +#kiwi .applet_chanlist tr:nth-child(even) { background: none repeat scroll 0 0 #DBDBDB; } diff --git a/client/assets/themes/relaxed/style.css b/client/assets/themes/relaxed/style.css index 4e23ac7..b64076a 100644 --- a/client/assets/themes/relaxed/style.css +++ b/client/assets/themes/relaxed/style.css @@ -357,27 +357,27 @@ border-bottom-right-radius:0; border-top-right-radius:0; } -#kiwi #chanlist { +#kiwi .applet_chanlist { margin: 0.5em 1em; } -#kiwi #chanlist table { +#kiwi .applet_chanlist table { border-collapse: collapse; width: 100%; } -#kiwi #chanlist thead { +#kiwi .applet_chanlist thead { text-align: center; } -#kiwi #chanlist tbody td { +#kiwi .applet_chanlist tbody td { border: 1px solid #C4C4C4; padding: 0.3em 1em; } -#kiwi #chanlist .chanlist_name, #kiwi #chanlist .chanlist_num_users { +#kiwi .applet_chanlist .chanlist_name, #kiwi .applet_chanlist .chanlist_num_users { border-width: 0 1px 0 0; } -#kiwi #chanlist .chanlist_topic { +#kiwi .applet_chanlist .chanlist_topic { border-width: 0; } -#kiwi #chanlist tr:nth-child(even) { +#kiwi .applet_chanlist tr:nth-child(even) { background: none repeat scroll 0 0 #DBDBDB; } diff --git a/client/src/applets/chanlist.js b/client/src/applets/chanlist.js index 60d73c2..e21e306 100644 --- a/client/src/applets/chanlist.js +++ b/client/src/applets/chanlist.js @@ -45,8 +45,8 @@ } // Clean the sorting icon and add the new one - $('#chanlist #users_title').find('span').remove(); - $('#chanlist #channel_name_title').find('span').remove(); + $('.applet_chanlist #users_title').find('span').remove(); + $('.applet_chanlist #channel_name_title').find('span').remove(); switch (this.order) { case 'user_desc': default: diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl index 270b22b..bd9af3c 100644 --- a/client/src/index.html.tmpl +++ b/client/src/index.html.tmpl @@ -338,7 +338,7 @@