moved most span12 and span9 over to BS3; img-polaroid to img-thumbnail

v1.18.x
psychobunny 12 years ago
parent b54b4a6580
commit 9e4a3905a0

@ -23,7 +23,7 @@
} }
ul { ul {
margin-left: 0; margin-left: -25px;
} }
.thread-rating { .thread-rating {
@ -198,7 +198,7 @@
} }
.block-content { .block-content {
padding: 10px; padding: 10px;
.img-polaroid { .img-thumbnail {
width: 20%; width: 20%;
height: auto; height: auto;
max-width: 48px; max-width: 48px;
@ -209,7 +209,7 @@
padding: 0; padding: 0;
margin-bottom: 20px; margin-bottom: 20px;
.img-polaroid { .img-thumbnail {
margin-top: 2px; margin-top: 2px;
} }

@ -83,7 +83,7 @@
li.setAttribute('data-pid', posts[i].pid); li.setAttribute('data-pid', posts[i].pid);
li.innerHTML = '<a href="/users/' + posts[i].userslug + '"><img title="' + posts[i].username + '" style="width: 48px; height: 48px; /*temporary*/" class="img-polaroid" src="' + posts[i].picture + '" class="" /></a>' + li.innerHTML = '<a href="/users/' + posts[i].userslug + '"><img title="' + posts[i].username + '" style="width: 48px; height: 48px; /*temporary*/" class="img-thumbnail" src="' + posts[i].picture + '" class="" /></a>' +
'<a href="/topic/'+ posts[i].topicSlug + '#' + posts[i].pid + '">' + '<a href="/topic/'+ posts[i].topicSlug + '#' + posts[i].pid + '">' +
'<p>' + '<p>' +
'<strong>' + posts[i].username + '</strong>: ' + posts[i].content + '<strong>' + posts[i].username + '</strong>: ' + posts[i].content +

@ -10,7 +10,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span2 account-block" style="text-align: center; margin-bottom:20px;"> <div class="span2 account-block" style="text-align: center; margin-bottom:20px;">
<div class="account-picture-block"> <div class="account-picture-block">
<img src="{picture}" class="user-profile-picture img-polaroid"/> <img src="{picture}" class="user-profile-picture img-thumbnail"/>
</div> </div>
<div class="account-online-status"> <div class="account-online-status">
<span><i class="icon-circle-blank"></i> <span>offline</span></span> <span><i class="icon-circle-blank"></i> <span>offline</span></span>
@ -82,7 +82,7 @@
<div class="span6 user-recent-posts"> <div class="span6 user-recent-posts">
<!-- BEGIN posts --> <!-- BEGIN posts -->
<div class="topic-row img-polaroid clearfix" topic-url="topic/{posts.tid}/#{posts.pid}"> <div class="topic-row img-thumbnail clearfix" topic-url="topic/{posts.tid}/#{posts.pid}">
<span>{posts.content}</span> <span>{posts.content}</span>
<span class="pull-right">{posts.relativeTime} ago</span> <span class="pull-right">{posts.relativeTime} ago</span>
</div> </div>

@ -11,13 +11,13 @@
<div class="modal-body"> <div class="modal-body">
<div id="gravatar-box"> <div id="gravatar-box">
<img id="user-gravatar-picture" src="" class="img-polaroid user-profile-picture"> <img id="user-gravatar-picture" src="" class="img-thumbnail user-profile-picture">
<span class="user-picture-label">Gravatar</span> <span class="user-picture-label">Gravatar</span>
<i class='icon-ok icon-2x'></i> <i class='icon-ok icon-2x'></i>
</div> </div>
<br/> <br/>
<div id="uploaded-box"> <div id="uploaded-box">
<img id="user-uploaded-picture" src="" class="img-polaroid user-profile-picture"> <img id="user-uploaded-picture" src="" class="img-thumbnail user-profile-picture">
<span class="user-picture-label">Uploaded picture</span> <span class="user-picture-label">Uploaded picture</span>
<i class='icon-ok icon-2x'></i> <i class='icon-ok icon-2x'></i>
</div> </div>
@ -70,7 +70,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span2" style="text-align: center; margin-bottom:20px;"> <div class="span2" style="text-align: center; margin-bottom:20px;">
<div class="account-picture-block text-center"> <div class="account-picture-block text-center">
<img id="user-current-picture" class="user-profile-picture img-polaroid" src="{picture}" /><br/> <img id="user-current-picture" class="user-profile-picture img-thumbnail" src="{picture}" /><br/>
<a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a> <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
</div> </div>
</div> </div>

File diff suppressed because one or more lines are too long

@ -65,7 +65,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span3"> <div class="col-md-3">
<div class="well sidebar-nav"> <div class="well sidebar-nav">
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">NodeBB</li> <li class="nav-header">NodeBB</li>

@ -18,7 +18,7 @@
<!-- BEGIN users --> <!-- BEGIN users -->
<div class="users-box" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}" data-banned="{users.banned}"> <div class="users-box" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}" data-banned="{users.banned}">
<a href="/users/{users.userslug}"> <a href="/users/{users.userslug}">
<img src="{users.picture}" class="img-polaroid"/> <img src="{users.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<a href="/users/{users.userslug}">{users.username}</a> <a href="/users/{users.userslug}">{users.username}</a>

@ -31,14 +31,14 @@
<ul id="topics-container"> <ul id="topics-container">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<a href="../../topic/{topics.slug}"><li class="category-item {topics.deleted-class}"> <a href="../../topic/{topics.slug}"><li class="category-item {topics.deleted-class}">
<div class="row-fluid"> <div class="row">
<!-- <div class="span1 thread-rating hidden-xs hidden-sm"> <!-- <div class="span1 thread-rating hidden-xs hidden-sm">
<span> <span>
<i class="icon-star icon-3x"></i><br /> <i class="icon-star icon-3x"></i><br />
38 38
</span> </span>
</div> --> </div> -->
<div class="span12 topic-row"> <div class="col-md-12 topic-row">
<div class="latest-post visible-lg visible-md"> <div class="latest-post visible-lg visible-md">
<div class="pull-right"> <div class="pull-right">
<img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" /> <img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
@ -60,9 +60,9 @@
<!-- END topics --> <!-- END topics -->
</ul> </ul>
</div> </div>
<div class="span3 {show_sidebar} category-sidebar mobile-sidebar"> <div class="col-md-3 {show_sidebar} category-sidebar mobile-sidebar">
<div class="sidebar-block img-polaroid"> <div class="sidebar-block img-thumbnail">
<div class="block-header"> <div class="block-header">
Recent Replies Recent Replies
</div> </div>
@ -70,23 +70,23 @@
<ul id="category_recent_replies"></ul> <ul id="category_recent_replies"></ul>
</div> </div>
</div> </div>
<div class="sidebar-block img-polaroid"> <div class="sidebar-block img-thumbnail">
<div class="block-header"> <div class="block-header">
Active Participants Active Participants
</div> </div>
<div class="block-content"> <div class="block-content">
<!-- BEGIN active_users --> <!-- BEGIN active_users -->
<a href="/users/{active_users.userslug}"><img title="{active_users.username}" src="{active_users.picture}" class="img-polaroid" /></a> <a href="/users/{active_users.userslug}"><img title="{active_users.username}" src="{active_users.picture}" class="img-thumbnail" /></a>
<!-- END active_users --> <!-- END active_users -->
</div> </div>
</div> </div>
<div class="sidebar-block img-polaroid {moderator_block_class}"> <div class="sidebar-block img-thumbnail {moderator_block_class}">
<div class="block-header"> <div class="block-header">
Moderators Moderators
</div> </div>
<div class="block-content"> <div class="block-content">
<!-- BEGIN moderators --> <!-- BEGIN moderators -->
<a href="/users/{moderators.userslug}"><img title="{moderators.username}" src="{moderators.picture}" class="img-polaroid" /></a> <a href="/users/{moderators.userslug}"><img title="{moderators.username}" src="{moderators.picture}" class="img-thumbnail" /></a>
<!-- END moderators --> <!-- END moderators -->
</div> </div>
</div> </div>

@ -12,9 +12,9 @@
<div id="no-favourites-notice" class="alert alert-warning {show_nofavourites}">You don't have any favourites, favourite some posts to see them here!</div> <div id="no-favourites-notice" class="alert alert-warning {show_nofavourites}">You don't have any favourites, favourite some posts to see them here!</div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 user-favourite-posts"> <div class="col-md-12 user-favourite-posts">
<!-- BEGIN posts --> <!-- BEGIN posts -->
<div class="topic-row img-polaroid clearfix" topic-url="topic/{posts.tid}/#{posts.pid}"> <div class="topic-row img-thumbnail clearfix" topic-url="topic/{posts.tid}/#{posts.pid}">
<span><strong>{posts.username}</strong> : </span> <span><strong>{posts.username}</strong> : </span>
<span>{posts.content}</span> <span>{posts.content}</span>
<div> <div>

@ -12,7 +12,7 @@
<!-- BEGIN followers --> <!-- BEGIN followers -->
<div class="users-box"> <div class="users-box">
<a href="/users/{followers.userslug}"> <a href="/users/{followers.userslug}">
<img src="{followers.picture}" class="img-polaroid"/> <img src="{followers.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<a href="/users/{followers.userslug}">{followers.username}</a> <a href="/users/{followers.userslug}">{followers.username}</a>

@ -12,7 +12,7 @@
<!-- BEGIN following --> <!-- BEGIN following -->
<div class="users-box"> <div class="users-box">
<a href="/users/{following.userslug}"> <a href="/users/{following.userslug}">
<img src="{following.picture}" class="img-polaroid"/> <img src="{following.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<a href="/users/{following.userslug}">{following.username}</a> <a href="/users/{following.userslug}">{following.username}</a>

@ -8,7 +8,7 @@
<li> <li>
<a href="../../topic/{topics.slug}">{topics.title} ({topics.postcount})</a> <a href="../../topic/{topics.slug}">{topics.title} ({topics.postcount})</a>
<div class="teaser"> <div class="teaser">
<img class="img-polaroid" src="../../graph/users/{topics.teaser_username}/picture" /> <img class="img-thumbnail" src="../../graph/users/{topics.teaser_username}/picture" />
<p> <p>
{topics.teaser_text} &mdash; {topics.teaser_timestamp} ago {topics.teaser_text} &mdash; {topics.teaser_timestamp} ago
</p> </p>

@ -19,7 +19,7 @@
<a href="../../topic/{topics.slug}" id="tid-{topics.tid}"> <a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
<li class="category-item {topics.deleted-class}"> <li class="category-item {topics.deleted-class}">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 topic-row img-polaroid"> <div class="col-md-12 topic-row img-thumbnail">
<div class="latest-post visible-lg visible-md"> <div class="latest-post visible-lg visible-md">
<div class="pull-right"> <div class="pull-right">
<img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" /> <img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />

@ -8,13 +8,13 @@
</div> </div>
<div class="category row"> <div class="category row">
<div class="span12"> <div class="col-md-12">
<ul id="topics-container" data-search-query="{search_query}"> <ul id="topics-container" data-search-query="{search_query}">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<a href="../../topic/{topics.slug}" id="tid-{topics.tid}"> <a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
<li class="category-item"> <li class="category-item">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 img-polaroid"> <div class="col-md-12 img-thumbnail">
<div class="search-result-post"> <div class="search-result-post">
<img src="{topics.teaser_userpicture}" /> <img src="{topics.teaser_userpicture}" />
<strong>{topics.teaser_username}</strong>: <span class="search-result-text">{topics.title}</span> <strong>{topics.teaser_username}</strong>: <span class="search-result-text">{topics.title}</span>
@ -29,7 +29,7 @@
<a href="../../topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}"> <a href="../../topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}">
<li class="category-item"> <li class="category-item">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 img-polaroid"> <div class="col-md-12 img-thumbnail">
<div class="search-result-post"> <div class="search-result-post">
<img src="{posts.picture}" /> <img src="{posts.picture}" />
<strong>{posts.username}</strong>: <span class="search-result-text">{posts.content}</span> <strong>{posts.username}</strong>: <span class="search-result-text">{posts.content}</span>

@ -18,10 +18,10 @@
<!-- BEGIN main_posts --> <!-- BEGIN main_posts -->
<a id="post_anchor_{main_posts.pid}" name="{main_posts.pid}"></a> <a id="post_anchor_{main_posts.pid}" name="{main_posts.pid}"></a>
<li class="row post-row main-post" data-pid="{main_posts.pid}" data-uid="{main_posts.uid}" data-deleted="{main_posts.deleted}"> <li class="row post-row main-post" data-pid="{main_posts.pid}" data-uid="{main_posts.uid}" data-deleted="{main_posts.deleted}">
<div class="span12"> <div class="col-md-12">
<div class="post-block"> <div class="post-block">
<a class="main-avatar" href="/users/{main_posts.userslug}"> <a class="main-avatar" href="/users/{main_posts.userslug}">
<img src="{main_posts.picture}" align="left" class="img-polaroid"/><br /> <img src="{main_posts.picture}" align="left" class="img-thumbnail"/><br />
<div class="hover-overlay"> <div class="hover-overlay">
{main_posts.username}<br /> {main_posts.username}<br />
<i class="icon-star"></i><span class="user_rep_{main_posts.uid}">{main_posts.user_rep}</span> <i class="icon-star"></i><span class="user_rep_{main_posts.uid}">{main_posts.user_rep}</span>
@ -79,7 +79,7 @@
<div class="span1 profile-image-block hidden-xs hidden-sm"> <div class="span1 profile-image-block hidden-xs hidden-sm">
<!--<i class="icon-spinner icon-spin icon-2x pull-left"></i>--> <!--<i class="icon-spinner icon-spin icon-2x pull-left"></i>-->
<a href="/users/{posts.userslug}"> <a href="/users/{posts.userslug}">
<img src="{posts.picture}" align="left" class="img-polaroid"/> <img src="{posts.picture}" align="left" class="img-thumbnail"/>
</a> </a>
<div class="stats"> <div class="stats">
<i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span> <i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span>
@ -87,7 +87,7 @@
</div> </div>
<span class="label label-important {posts.show_banned}">banned</span> <span class="label label-important {posts.show_banned}">banned</span>
</div> </div>
<div class="span11 span12-tablet"> <div class="span11 col-md-12-tablet">
<div class="post-block speech-bubble"> <div class="post-block speech-bubble">
<div id="content_{posts.pid}" class="post-content">{posts.content}</div> <div id="content_{posts.pid}" class="post-content">{posts.content}</div>
<div id="images_{posts.pid}" class="post-images"> <div id="images_{posts.pid}" class="post-images">

@ -23,7 +23,7 @@
<a href="../../topic/{topics.slug}" id="tid-{topics.tid}"> <a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
<li class="category-item {topics.deleted-class}"> <li class="category-item {topics.deleted-class}">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 topic-row img-polaroid"> <div class="col-md-12 topic-row img-thumbnail">
<div class="latest-post visible-lg visible-md"> <div class="latest-post visible-lg visible-md">
<div class="pull-right"> <div class="pull-right">
<img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" /> <img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />

@ -18,7 +18,7 @@
<!-- BEGIN users --> <!-- BEGIN users -->
<div class="users-box"> <div class="users-box">
<a href="/users/{users.userslug}"> <a href="/users/{users.userslug}">
<img src="{users.picture}" class="img-polaroid"/> <img src="{users.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<a href="/users/{users.userslug}">{users.username}</a> <a href="/users/{users.userslug}">{users.username}</a>

@ -35,7 +35,7 @@ var RDB = require('./redis.js'),
'show_sidebar' : 'show', 'show_sidebar' : 'show',
'show_topic_button': 'inline-block', 'show_topic_button': 'inline-block',
'no_topics_message': 'hidden', 'no_topics_message': 'hidden',
'topic_row_size': 'span9', 'topic_row_size': 'col-md-9',
'category_id': category_id, 'category_id': category_id,
'active_users': [], 'active_users': [],
'topics' : [], 'topics' : [],

Loading…
Cancel
Save