Fix icon alignment

assets/scripts/foreground.js

@@ -13,52 +13,51 @@ jQuery(document).ready(function() {
   // to make this easier, we move it here and loaded earlier to speed up transform
   jQuery("#pt-notifications").prependTo("#echo-notifications");
   
-  // Add classes for font-awesome
+  // Append font-awesome icons
+  jQuery('[id^=ca-nstab] a').prepend('<i class="fa fa-file fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-talk a').prepend('<i class="fa fa-comments-o fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-edit a').prepend('<i class="fa fa-pencil-square-o fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-viewsource a').prepend('<i class="fa fa-book fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-form_edit a').prepend('<i class="fa fa-pencil-square fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-history a').prepend('<i class="fa fa-archive fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-delete a').prepend('<i class="fa fa-trash-o fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-move a').prepend('<i class="fa fa-truck fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-protect a').prepend('<i class="fa fa-shield fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-unprotect a').prepend('<i class="fa fa-shield fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-watch a').prepend('<i class="fa fa-star-o fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-unwatch a').prepend('<i class="fa fa-star fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-purge a').prepend('<i class="fa fa-refresh fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-undelete a').prepend('<i class="fa fa-undo fa-fw"></i>&nbsp; ')
+  jQuery('li#ca-ask_delete_permanently a').prepend('<i class="fa fa-cut fa-fw"></i>&nbsp; ')
 
-  jQuery('[id^=ca-nstab] a').addClass('fa fa-file fa-fw').text(' ' + jQuery('[id^=ca-nstab] a').text());
-  jQuery('li#ca-talk a').addClass('fa fa-comments fa-fw').text(' ' + jQuery('li#ca-talk a').text());
-  jQuery('li#ca-talk.new a').addClass('fa fa-comments-o fa-fw').text(' ' + jQuery('li#ca-talk.new a').text());
-  jQuery('li#ca-edit a').addClass('fa fa-pencil-square-o fa-fw').text(' ' + jQuery('li#ca-edit a').text());
-  jQuery('li#ca-viewsource a').addClass('fa fa-book fa-fw').text(' ' + jQuery('li#ca-viewsource a').text());
-  jQuery('li#ca-form_edit a').addClass('fa fa-pencil-square fa-fw').text(' ' + jQuery('li#ca-form_edit a').text());
-  jQuery('li#ca-history a').addClass('fa fa-archive fa-fw').text(' ' + jQuery('li#ca-history a').text());
-  jQuery('li#ca-delete a').addClass('fa fa-trash-o fa-fw').text(' ' + jQuery('li#ca-delete a').text());
-  jQuery('li#ca-undelete a').addClass('fa fa-undo fa-fw').text(' ' + jQuery('li#ca-undelete a').text());
-  jQuery('li#ca-move a').addClass('fa fa-truck fa-fw').text(' ' + jQuery('li#ca-move a').text());
-  jQuery('li#ca-protect a').addClass('fa fa-shield fa-fw').text(' ' + jQuery('li#ca-protect a').text());
-  jQuery('li#ca-unprotect a').addClass('fa fa-shield fa-fw').text(' ' + jQuery('li#ca-unprotect a').text());
-  jQuery('li#ca-watch a').addClass('fa fa-star-o fa-fw').text(' ' + jQuery('li#ca-watch a').text());
-  jQuery('li#ca-unwatch a').addClass('fa fa-star fa-fw').text(' ' + jQuery('li#ca-unwatch a').text());
-  jQuery('li#ca-purge a').addClass('fa fa-refresh fa-fw').text(' ' + jQuery('li#ca-purge a').text());
-  jQuery('li#ca-ask_delete_permanently a').addClass('fa fa-cut fa-fw').text(' ' + jQuery('li#ca-ask_delete_permanently a').text());
-  if ( jQuery( '#ca-addsection' ).length ) {
-        jQuery('li#ca-addsection a').addClass('fa fa-plus fa-fw').text(' ' + jQuery('li#ca-addsection a').attr('title').replace(/\[.+/g,""));
-  }
+if ( jQuery( '#ca-addsection' ).length ) {
+  jQuery('li#ca-addsection a').html('<i class="fa fa-plus fa-fw"></i>&nbsp; ' + jQuery('li#ca-addsection a').attr('title').replace(/\[.+/g,""))
+}
 
-  jQuery('li#pt-userpage a').addClass('fa fa-user').text(' ' + jQuery('li#pt-userpage a').text());
-  jQuery('li#pt-mytalk a').addClass('fa fa-comments').text(' ' + jQuery('li#pt-mytalk a').text());
-  jQuery('li#pt-adminlinks a').addClass('fa fa-bolt').text(' ' + jQuery('li#pt-adminlinks a').text());
-  jQuery('li#pt-preferences a').addClass('fa fa-ellipsis-h').text(' ' + jQuery('li#pt-preferences a').text());
-  jQuery('li#pt-watchlist a').addClass('fa fa-th-list').text(' ' + jQuery('li#pt-watchlist a').text());
-  jQuery('li#pt-mycontris a').addClass('fa fa-smile-o').text(' ' + jQuery('li#pt-mycontris a').text());
-  jQuery('li#pt-logout a').addClass('fa fa-power-off').text(' ' + jQuery('li#pt-logout a').text());
+  jQuery('li#pt-userpage a').prepend('<i class="fa fa-user fa-fw"></i>&nbsp; ')
+  jQuery('li#pt-mytalk a').prepend('<i class="fa fa-comments fa-fw"></i>&nbsp; ')
+  jQuery('li#pt-adminlinks a').prepend('<i class="fa fa-bolt fa-fw"></i>&nbsp; ')
+  jQuery('li#pt-preferences a').prepend('<i class="fa fa-ellipsis-h fa-fw"></i>&nbsp; ')
+  jQuery('li#pt-watchlist a').prepend('<i class="fa fa-th-list fa-fw"></i>&nbsp; ')
+  jQuery('li#pt-mycontris a').prepend('<i class="fa fa-smile-o fa-fw"></i>&nbsp; ')
+  jQuery('li#pt-logout a').prepend('<i class="fa fa-power-off fa-fw"></i>&nbsp; ')
 
-  jQuery('li#t-smwbrowselink a').addClass('fa fa-eye').text(' ' + jQuery('li#t-smwbrowselink a').text());
-  jQuery('li#t-whatlinkshere a').addClass('fa fa-arrows').text(' ' + jQuery('li#t-whatlinkshere a').text());
-  jQuery('li#t-blockip a').addClass('fa fa-ban').text(' ' + jQuery('li#t-blockip a').text());
-  jQuery('li#t-recentchangeslinked a').addClass('fa fa-bars').text(' ' + jQuery('li#t-recentchangeslinked a').text());
-  jQuery('li#t-contributions a').addClass('fa fa-smile-o').text(' ' + jQuery('li#t-contributions a').text());
-  jQuery('li#t-log a').addClass('fa fa-bars').text(' ' + jQuery('li#t-log a').text());
-  jQuery('li#t-emailuser a').addClass('fa fa-envelope').text(' ' + jQuery('li#t-emailuser a').text());
-  jQuery('li#t-userrights a').addClass('fa fa-gavel').text(' ' + jQuery('li#t-userrights a').text());
-  jQuery('li#t-upload a').addClass('fa fa-upload').text(' ' + jQuery('li#t-upload a').text());
-  jQuery('li#t-specialpages a').addClass('fa fa-magic').text(' ' + jQuery('li#t-specialpages a').text());
-  jQuery('li#t-print a').addClass('fa fa-print').text(' ' + jQuery('li#t-print a').text());
-  jQuery('li#t-permalink a').addClass('fa fa-dot-circle-o').text(' ' + jQuery('li#t-permalink a').text());
-  jQuery('li#t-info a').addClass('fa fa-info').text(' ' + jQuery('li#t-info a').text());
+  jQuery('li#t-smwbrowselink a').prepend('<i class="fa fa-eye fa-fw"></i>&nbsp; ')
+  jQuery('li#t-whatlinkshere a').prepend('<i class="fa fa-arrows fa-fw"></i>&nbsp; ')
+  jQuery('li#t-blockip a').prepend('<i class="fa fa-ban fa-fw"></i>&nbsp; ')
+  jQuery('li#t-recentchangeslinked a').prepend('<i class="fa fa-bars fa-fw"></i>&nbsp; ')
+  jQuery('li#t-contributions a').prepend('<i class="fa fa-smile-o fa-fw"></i>&nbsp; ')
+  jQuery('li#t-log a').prepend('<i class="fa fa-bars fa-fw"></i>&nbsp; ')
+  jQuery('li#t-emailuser a').prepend('<i class="fa fa-envelope fa-fw"></i>&nbsp; ')
+  jQuery('li#t-userrights a').prepend('<i class="fa fa-gavel fa-fw"></i>&nbsp; ')
+  jQuery('li#t-upload a').prepend('<i class="fa fa-upload fa-fw"></i>&nbsp; ')
+  jQuery('li#t-specialpages a').prepend('<i class="fa fa-magic fa-fw"></i>&nbsp; ')
+  jQuery('li#t-print a').prepend('<i class="fa fa-print fa-fw"></i>&nbsp; ')
+  jQuery('li#t-permalink a').prepend('<i class="fa fa-dot-circle-o fa-fw"></i>&nbsp; ')
+  jQuery('li#t-info a').prepend('<i class="fa fa-info fa-fw"></i>&nbsp; ')
 
-  jQuery('ul#toolbox-dropdown.dropdown>li#n-recentchanges a').addClass('fa fa-tasks').text(' ' + jQuery('ul#toolbox-dropdown.dropdown>li#n-recentchanges a').text());
-  jQuery('ul#toolbox-dropdown.dropdown>li#n-help a').addClass('fa fa-question').text(' ' + jQuery('ul#toolbox-dropdown.dropdown>li#n-help a').text());
+  jQuery('ul#toolbox-dropdown.dropdown>li#n-recentchanges a').prepend('<i class="fa fa-tasks fa-fw"></i>&nbsp; ')
+  jQuery('ul#toolbox-dropdown.dropdown>li#n-help a').prepend('<i class="fa fa-question fa-fw"></i>&nbsp; ')
 
 
   // Turn categories into labels

assets/stylesheets/font-awesome.css

@@ -6,8 +6,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('/w/skins/foreground/assets/fonts/fontawesome-webfont.eot?v=4.0.3');
-  src: url('/w/skins/foreground/assets/fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('/w/skins/foreground/assets/fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('/w/skins/foreground/assets/fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('/w/skins/foreground/assets/fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
+  src: url('/mw/skins/foreground/assets/fonts/fontawesome-webfont.eot?v=4.0.3');
+  src: url('/mw/skins/foreground/assets/fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('/mw/skins/foreground/assets/fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('/mw/skins/foreground/assets/fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('/mw/skins/foreground/assets/fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

assets/stylesheets/foundation.css

@@ -1306,7 +1306,7 @@ blockquote p {
     display: inherit !important; } }
 button, .button, .multipleTemplateAdder {
   border-style: solid;
-  border-width: 1px;
+  border-width: 0px;
   cursor: pointer;
   font-family: inherit;
   font-weight: bold;