From 2f70dd732d422a081977a89f9ebbe91446bb6ba9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 22 Aug 2013 02:57:18 +0800 Subject: [PATCH 01/63] BS3 basic integration; btn-large to btn-lg (inc FA); navbar fixed --- public/css/style.less | 4 - public/templates/admin/categories.tpl | 2 +- public/templates/admin/facebook.tpl | 2 +- public/templates/admin/gplus.tpl | 2 +- public/templates/admin/index.tpl | 8 +- public/templates/admin/motd.tpl | 2 +- public/templates/admin/settings.tpl | 2 +- public/templates/admin/topics.tpl | 2 +- public/templates/admin/twitter.tpl | 2 +- public/templates/category.tpl | 2 +- public/templates/header.tpl | 95 +- public/templates/home.tpl | 2 +- public/templates/install/basic.tpl | 4 +- public/templates/install/mail.tpl | 2 +- public/templates/install/privileges.tpl | 4 +- public/templates/install/redis.tpl | 2 +- public/templates/install/social.tpl | 4 +- public/templates/outgoing.tpl | 4 +- public/templates/topic.tpl | 4 +- .../bootstrap/css/bootstrap-responsive.css | 1109 --- .../css/bootstrap-responsive.min.css | 9 - public/vendor/bootstrap/css/bootstrap.css | 8638 +++++++++-------- public/vendor/bootstrap/css/bootstrap.min.css | 8 +- .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../bootstrap/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes public/vendor/bootstrap/js/bootstrap.js | 2579 +++-- public/vendor/bootstrap/js/bootstrap.min.js | 10 +- .../vendor/fontawesome/css/font-awesome.css | 20 +- .../fontawesome/css/font-awesome.min.css | 6 +- src/routes/api.js | 2 +- 30 files changed, 5893 insertions(+), 6637 deletions(-) delete mode 100644 public/vendor/bootstrap/css/bootstrap-responsive.css delete mode 100644 public/vendor/bootstrap/css/bootstrap-responsive.min.css delete mode 100644 public/vendor/bootstrap/img/glyphicons-halflings-white.png delete mode 100644 public/vendor/bootstrap/img/glyphicons-halflings.png diff --git a/public/css/style.less b/public/css/style.less index 2f4185fadf..d347f829d6 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -390,10 +390,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { } } -body .navbar .nodebb-inline-block { - display:inline-block; -} - #right-menu{ float:right; } diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl index 06366a5bb3..e143d55c27 100644 --- a/public/templates/admin/categories.tpl +++ b/public/templates/admin/categories.tpl @@ -34,7 +34,7 @@ - +