Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

BS3 basic integration; btn-large to btn-lg (inc FA); navbar fixed

Browse Source
This commit is contained in:
psychobunny
2013-08-22 02:57:18 +08:00
parent 3f793ae902
commit 2f70dd732d
30 changed files with 6908 additions and 7652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/style.less
View File

@@ -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{ #right-menu{
float:right; float:right;
} }

2
public/templates/admin/categories.tpl
View File

@@ -34,7 +34,7 @@
<!-- END categories --> <!-- END categories -->
</ul> </ul>
<button class="btn btn-large btn-primary" id="save">Save</button> <button class="btn btn-lg btn-primary" id="save">Save</button>
</div> </div>
<div id="icons" style="display:none;"><div class="icon-container"><div class="row"> <div id="icons" style="display:none;"><div class="icon-container"><div class="row">

2
public/templates/admin/facebook.tpl
View File

@@ -14,7 +14,7 @@
</div> </div>
</form> </form>
<button class="btn btn-large btn-primary" id="save">Save</button> <button class="btn btn-lg btn-primary" id="save">Save</button>
<script> <script>
nodebb_admin.prepare(); nodebb_admin.prepare();

2
public/templates/admin/gplus.tpl
View File

@@ -14,7 +14,7 @@
</div> </div>
</form> </form>
<button class="btn btn-large btn-primary" id="save">Save</button> <button class="btn btn-lg btn-primary" id="save">Save</button>
<script> <script>
nodebb_admin.prepare(); nodebb_admin.prepare();

8
public/templates/admin/index.tpl
View File

@@ -3,10 +3,10 @@
<h1>Welcome to NodeBB</h1> <h1>Welcome to NodeBB</h1>
<br /> <br />
<p> <p>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-large"><i class="icon-comment"></i> NodeBB Forum</a> <a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="icon-comment"></i> NodeBB Forum</a>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-large"><i class="icon-github-alt"></i> Get Plugins</a> <a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="icon-github-alt"></i> Get Plugins</a>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-large"><i class="icon-github-alt"></i> Get Themes</a> <a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="icon-github-alt"></i> Get Themes</a>
<a target="_blank" href="http://www.nodebb.org" class="btn btn-large"><i class="icon-twitter"></i> dcplabs</a> <a target="_blank" href="http://www.nodebb.org" class="btn btn-default btn-lg"><i class="icon-twitter"></i> dcplabs</a>
</p> </p>
<p><small>You are running <strong>NodeBB v{version}</strong>. This is where we will check to make sure your <strong>NodeBB</strong> is latest, etc.</small></p> <p><small>You are running <strong>NodeBB v{version}</strong>. This is where we will check to make sure your <strong>NodeBB</strong> is latest, etc.</small></p>
</div> </div>

2
public/templates/admin/motd.tpl
View File

@@ -15,7 +15,7 @@
</form> </form>
</div> </div>
<button class="btn btn-large btn-primary" id="save" checked>Save</button> <button class="btn btn-lg btn-primary" id="save" checked>Save</button>
<script> <script>
nodebb_admin.prepare(); nodebb_admin.prepare();

2
public/templates/admin/settings.tpl
View File

@@ -60,7 +60,7 @@
</div> </div>
</form> </form>
<button class="btn btn-large btn-primary" id="save">Save</button> <button class="btn btn-lg btn-primary" id="save">Save</button>
<script> <script>
nodebb_admin.prepare(); nodebb_admin.prepare();

2
public/templates/admin/topics.tpl
View File

@@ -20,7 +20,7 @@
</ul> </ul>
<div class="text-center"> <div class="text-center">
<button id="topics_loadmore" class="btn btn-large">Load More Topics</button> <button id="topics_loadmore" class="btn btn-lg">Load More Topics</button>
</div> </div>
<script type="text/javascript" src="{relative_path}/src/forum/admin/topics.js"></script> <script type="text/javascript" src="{relative_path}/src/forum/admin/topics.js"></script>

2
public/templates/admin/twitter.tpl
View File

@@ -14,7 +14,7 @@
</div> </div>
</form> </form>
<button class="btn btn-large btn-primary" id="save">Save</button> <button class="btn btn-lg btn-primary" id="save">Save</button>
<script> <script>
nodebb_admin.prepare(); nodebb_admin.prepare();

2
public/templates/category.tpl
View File

@@ -12,7 +12,7 @@
</div> </div>
<div> <div>
<button id="new_post" class="btn btn-primary btn-large {show_topic_button}">New Topic</button> <button id="new_post" class="btn btn-primary btn-lg {show_topic_button}">New Topic</button>
<div class="inline-block pull-right"> <div class="inline-block pull-right">
<a target="_blank" href="../{category_id}.rss"><i class="icon-rss-sign icon-2x"></i></a>&nbsp; <a target="_blank" href="../{category_id}.rss"><i class="icon-rss-sign icon-2x"></i></a>&nbsp;

41
public/templates/header.tpl
View File

@@ -4,7 +4,6 @@
<title>{browserTitle}</title> <title>{browserTitle}</title>
{meta_tags} {meta_tags}
<link href="{cssSrc}" rel="stylesheet" media="screen"> <link href="{cssSrc}" rel="stylesheet" media="screen">
<link href="{relative_path}/vendor/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css"> <link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css">
<script> <script>
var RELATIVE_PATH = "{relative_path}"; var RELATIVE_PATH = "{relative_path}";
@@ -34,17 +33,40 @@
<body> <body>
<div id="mobile-menu-overlay"> <div id="mobile-menu-overlay">
</div> </div>
<div class="navbar navbar-inverse navbar-fixed-top" id="header-menu">
<div class="navbar-inner"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<a class="brand" href="/">{title}</a> <div class="navbar-header">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
<ul id="main-nav" class="nav nodebb-inline-block"> </div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
<div class="navbar navbar-inverse navbar-fixed-top" id="header-menu">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">{title}</a>
</div>
<div class="navbar-collapse collapse">
<ul id="main-nav" class="nav navbar-nav">
<li> <li>
<a href="/recent">Recent</a> <a href="/recent">Recent</a>
</li> </li>
@@ -55,7 +77,7 @@
<a href="/users">Users</a> <a href="/users">Users</a>
</li> </li>
</ul> </ul>
<ul id="right-menu" class="nav pull-right nodebb-inline-block"> <ul id="right-menu" class="nav navbar-nav pull-right">
<li class="notifications dropdown text-center"> <li class="notifications dropdown text-center">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a> <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a>
<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown"> <ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
@@ -64,7 +86,7 @@
</li> </li>
<li> <li>
<form id="search-form" class="form-search form-inline" action="" method="GET"> <form id="search-form" class="form-search form-inline" action="" method="GET">
<input type="text" name="query" class="input-medium search-query"> <input type="text" name="query" class="form-control search-query" />
<button type="submit" class="btn hide">Search</button> <button type="submit" class="btn hide">Search</button>
</form> </form>
</li> </li>
@@ -73,7 +95,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<input id="csrf_token" type="hidden" template-variable="csrf" value="{csrf}" /> <input id="csrf_token" type="hidden" template-variable="csrf" value="{csrf}" />

2
public/templates/home.tpl
View File

@@ -1,4 +1,4 @@
<div class="hero-unit {motd_class}"> <div class="jumbotron {motd_class}">
{motd} {motd}
</div> </div>

4
public/templates/install/basic.tpl
View File

@@ -30,10 +30,10 @@
<hr /> <hr />
<div class="pull-right"> <div class="pull-right">
<button data-path="mail" class="btn btn-primary btn-large">Next &ndash; <i class="icon-envelope"></i> Mail</button> <button data-path="mail" class="btn btn-primary btn-lg">Next &ndash; <i class="icon-envelope"></i> Mail</button>
</div> </div>
<div> <div>
<button data-path="redis" class="btn btn-primary btn-large">Previous &ndash; <i class="icon-hdd"></i> Redis</button> <button data-path="redis" class="btn btn-primary btn-lg">Previous &ndash; <i class="icon-hdd"></i> Redis</button>
</div> </div>
<script> <script>

2
public/templates/install/mail.tpl
View File

@@ -23,7 +23,7 @@
<hr /> <hr />
<div class="pull-right"> <div class="pull-right">
<button data-path="social" class="btn btn-primary btn-large">Next &ndash; <i class="icon-facebook"></i> Social</button> <button data-path="social" class="btn btn-primary btn-lg">Next &ndash; <i class="icon-facebook"></i> Social</button>
</div> </div>
<script> <script>

4
public/templates/install/privileges.tpl
View File

@@ -27,10 +27,10 @@
<hr /> <hr />
<div class="pull-right"> <div class="pull-right">
<button id="start-nodebb" class="btn btn-success btn-large"><i class="icon-thumbs-up"></i> Start using NodeBB!</button> <button id="start-nodebb" class="btn btn-success btn-lg"><i class="icon-thumbs-up"></i> Start using NodeBB!</button>
</div> </div>
<div> <div>
<button data-path="social" class="btn btn-primary btn-large">Previous &ndash; <i class="icon-facebook"></i> Social</button> <button data-path="social" class="btn btn-primary btn-lg">Previous &ndash; <i class="icon-facebook"></i> Social</button>
</div> </div>
<script> <script>

2
public/templates/install/redis.tpl
View File

@@ -32,7 +32,7 @@
<hr /> <hr />
<div class="pull-right"> <div class="pull-right">
<button data-path="basic" class="btn btn-primary btn-large" disabled>Next &ndash; <i class="icon-cog"></i> Basic</button> <button data-path="basic" class="btn btn-primary btn-lg" disabled>Next &ndash; <i class="icon-cog"></i> Basic</button>
</div> </div>
<script> <script>

4
public/templates/install/social.tpl
View File

@@ -34,10 +34,10 @@
<hr /> <hr />
<div class="pull-right"> <div class="pull-right">
<button data-path="privileges" class="btn btn-primary btn-large">Next &ndash; <i class="icon-legal"></i> Privileges</button> <button data-path="privileges" class="btn btn-primary btn-lg">Next &ndash; <i class="icon-legal"></i> Privileges</button>
</div> </div>
<div> <div>
<button data-path="mail" class="btn btn-primary btn-large">Previous &ndash; <i class="icon-envelope"></i> Mail</button> <button data-path="mail" class="btn btn-primary btn-lg">Previous &ndash; <i class="icon-envelope"></i> Mail</button>
</div> </div>
<script> <script>

4
public/templates/outgoing.tpl
View File

@@ -5,7 +5,7 @@
</p> </p>
<br /> <br />
<p> <p>
<a href="{url}" rel="nofollow" class="btn btn-large">Continue to {url}</a> <a href="{url}" rel="nofollow" class="btn btn-default btn-lg">Continue to {url}</a>
<a href="{home}" class="btn btn-large btn-inverse">Return to NodeBB</a> <a href="{home}" class="btn btn-lg btn-inverse">Return to NodeBB</a>
</p> </p>
</div> </div>

4
public/templates/topic.tpl
View File

@@ -118,9 +118,9 @@
<!-- END posts --> <!-- END posts -->
</ul> </ul>
<hr /> <hr />
<button id="post_reply" class="btn btn-primary btn-large post_reply" type="button">Reply</button> <button id="post_reply" class="btn btn-primary btn-lg post_reply" type="button">Reply</button>
<div class="btn-group pull-right" id="thread-tools" style="visibility: hidden;"> <div class="btn-group pull-right" id="thread-tools" style="visibility: hidden;">
<button class="btn btn-large dropdown-toggle" data-toggle="dropdown" type="button">Thread Tools <span class="caret"></span></button> <button class="btn btn-default btn-lg dropdown-toggle" data-toggle="dropdown" type="button">Thread Tools <span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#" id="pin_thread"><i class="icon-pushpin"></i> Pin Thread</a></li> <li><a href="#" id="pin_thread"><i class="icon-pushpin"></i> Pin Thread</a></li>
<li><a href="#" id="lock_thread"><i class="icon-lock"></i> Lock Thread</a></li> <li><a href="#" id="lock_thread"><i class="icon-lock"></i> Lock Thread</a></li>

1109
public/vendor/bootstrap/css/bootstrap-responsive.css vendored
View File

File diff suppressed because it is too large Load Diff

9
public/vendor/bootstrap/css/bootstrap-responsive.min.css vendored
View File

File diff suppressed because one or more lines are too long

10282
public/vendor/bootstrap/css/bootstrap.css vendored
View File

File diff suppressed because it is too large Load Diff

8
public/vendor/bootstrap/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
public/vendor/bootstrap/img/glyphicons-halflings-white.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.6 KiB

BIN
public/vendor/bootstrap/img/glyphicons-halflings.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

1973
public/vendor/bootstrap/js/bootstrap.js vendored
View File

File diff suppressed because it is too large Load Diff

10
public/vendor/bootstrap/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
public/vendor/fontawesome/css/font-awesome.css vendored
View File

@@ -225,22 +225,22 @@ a [class*=" icon-"] {
.btn.btn-small [class*=" icon-"].pull-right.icon-2x { .btn.btn-small [class*=" icon-"].pull-right.icon-2x {
margin-top: .25em; margin-top: .25em;
} }
.btn.btn-large [class^="icon-"], .btn.btn-lg [class^="icon-"],
.btn.btn-large [class*=" icon-"] { .btn.btn-lg [class*=" icon-"] {
margin-top: 0; margin-top: 0;
} }
.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-lg [class^="icon-"].pull-left.icon-2x,
.btn.btn-large [class*=" icon-"].pull-left.icon-2x, .btn.btn-lg [class*=" icon-"].pull-left.icon-2x,
.btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-lg [class^="icon-"].pull-right.icon-2x,
.btn.btn-large [class*=" icon-"].pull-right.icon-2x { .btn.btn-lg [class*=" icon-"].pull-right.icon-2x {
margin-top: .05em; margin-top: .05em;
} }
.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-lg [class^="icon-"].pull-left.icon-2x,
.btn.btn-large [class*=" icon-"].pull-left.icon-2x { .btn.btn-lg [class*=" icon-"].pull-left.icon-2x {
margin-right: .2em; margin-right: .2em;
} }
.btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-lg [class^="icon-"].pull-right.icon-2x,
.btn.btn-large [class*=" icon-"].pull-right.icon-2x { .btn.btn-lg [class*=" icon-"].pull-right.icon-2x {
margin-left: .2em; margin-left: .2em;
} }
/* Fixes alignment in nav lists */ /* Fixes alignment in nav lists */

6
public/vendor/fontawesome/css/font-awesome.min.css vendored
View File

@@ -26,9 +26,9 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline;}
.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;} .btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;}
.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;} .btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;}
.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;} .btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;}
.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;} .btn.btn-lg [class^="icon-"],.btn.btn-lg [class*=" icon-"]{margin-top:0;}.btn.btn-lg [class^="icon-"].pull-left.icon-2x,.btn.btn-lg [class*=" icon-"].pull-left.icon-2x,.btn.btn-lg [class^="icon-"].pull-right.icon-2x,.btn.btn-lg [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;}
.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;} .btn.btn-lg [class^="icon-"].pull-left.icon-2x,.btn.btn-lg [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;}
.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;} .btn.btn-lg [class^="icon-"].pull-right.icon-2x,.btn.btn-lg [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;}
.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;} .nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;}
.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;} .icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;}
.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;} .icon-stack .icon-stack-base{font-size:2em;*line-height:1em;}

2
src/routes/api.js
View File

@@ -49,7 +49,7 @@ var user = require('./../user.js'),
require('async').each(data.categories, iterator, function(err) { require('async').each(data.categories, iterator, function(err) {
data.motd_class = (config.show_motd === '1' || config.show_motd === undefined) ? '' : 'none'; data.motd_class = (config.show_motd === '1' || config.show_motd === undefined) ? '' : 'none';
data.motd = marked(config.motd || "# NodeBB <span class='hidden-phone'>v " + pkg.version + "</span>\nWelcome to NodeBB, the discussion platform of the future.\n\n<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-large\"><i class=\"icon-comment\"></i><span class='hidden-phone'>&nbsp;Get NodeBB</span></a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-large\"><i class=\"icon-github-alt\"></i><span class='hidden-phone'>&nbsp;Fork us on Github</span></a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-large\"><i class=\"icon-twitter\"></i><span class='hidden-phone'>&nbsp;@dcplabs</span></a>"); data.motd = marked(config.motd || "# NodeBB <span class='hidden-phone'>v " + pkg.version + "</span>\nWelcome to NodeBB, the discussion platform of the future.\n\n<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-default btn-lg\"><i class=\"icon-comment\"></i><span class='hidden-phone'>&nbsp;Get NodeBB</span></a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-default btn-lg\"><i class=\"icon-github-alt\"></i><span class='hidden-phone'>&nbsp;Fork us on Github</span></a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-default btn-lg\"><i class=\"icon-twitter\"></i><span class='hidden-phone'>&nbsp;@dcplabs</span></a>");
res.json(data); res.json(data);
}); });