Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-17 16:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

f**ing bootstrap, span5 = .gutter

Browse Source
This commit is contained in:
Jeff Atwood 2014-06-05 02:57:56 -07:00
parent f245da5142
commit 3dd61a2056
8 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/email_index.js.handlebars
View File

@ -16,7 +16,7 @@
{{#if sendingEmail}} {{#if sendingEmail}}
<div class='span15 controls'>{{i18n admin.email.sending_test}}</div> <div class='span15 controls'>{{i18n admin.email.sending_test}}</div>
{{else}} {{else}}
<div class='span5 controls'> <div class='controls'>
{{textField value=testEmailAddress placeholderKey="admin.email.test_email_address"}} {{textField value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
</div> </div>
<div class='span10 controls'> <div class='span10 controls'>

2
app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
View File

@ -5,7 +5,7 @@
<label for='last-seen'>{{i18n admin.email.last_seen_user}}</label> <label for='last-seen'>{{i18n admin.email.last_seen_user}}</label>
{{input type="date" value=lastSeen id="last-seen"}} {{input type="date" value=lastSeen id="last-seen"}}
</div> </div>
<div class='span5'> <div>
<button class='btn' {{action refresh}}>{{i18n admin.email.refresh}}</button> <button class='btn' {{action refresh}}>{{i18n admin.email.refresh}}</button>
</div> </div>
<div class="span7 toggle"> <div class="span7 toggle">

2
app/assets/javascripts/admin/templates/users_list.js.handlebars
View File

@ -12,7 +12,7 @@
<li>{{#link-to 'adminUsersList.blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li> <li>{{#link-to 'adminUsersList.blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li>
</ul> </ul>
</div> </div>
<div class='span5 username controls'> <div class='username controls'>
{{textField value=username placeholderKey="username"}} {{textField value=username placeholderKey="username"}}
</div> </div>
</div> </div>

2
app/assets/javascripts/discourse/components/post-gutter.js.es6
View File

@ -1,7 +1,7 @@
var MAX_SHOWN = 5; var MAX_SHOWN = 5;
export default Em.Component.extend({ export default Em.Component.extend({
classNameBindings: [':span5', ':gutter'], classNameBindings: [':gutter'],
// Roll up links to avoid duplicates // Roll up links to avoid duplicates
collapsed: function() { collapsed: function() {

2
app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
View File

@ -8,7 +8,7 @@
</div> </div>
<div class='topic-body'> <div class='topic-body'>
<div class="topic-meta-data"> <div class="topic-meta-data">
<h5 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{{breakUp username name}}}</a></h5> <h5 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{{unbound username}}}</a></h5>
{{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}} {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
<div class='post-info post-date'>{{unboundAgeWithTooltip created_at}}</div> <div class='post-info post-date'>{{unboundAgeWithTooltip created_at}}</div>
</div> </div>

4
app/assets/stylesheets/desktop/discourse.scss
View File

@ -581,10 +581,6 @@ body {
width: 300px; width: 300px;
float: left; float: left;
} }
.span5 {
width: 248px;
float: left;
}
.span4 { .span4 {
width: 196px; width: 196px;
margin-right: 12px; margin-right: 12px;

24
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -738,10 +738,12 @@ blockquote { /* solo quotes */
.gutter { .gutter {
float: left; float: left;
width: 19%;
margin-top: 15px; margin-top: 15px;
ul {margin: 0;} padding-left: 8px;
padding-left: 8px;
ul {margin: 0;}
li {margin-bottom: 10px;}
i {font-size: 12px;} i {font-size: 12px;}
.post-links { .post-links {
@ -762,7 +764,7 @@ blockquote { /* solo quotes */
display: block; display: block;
text-align: right; text-align: right;
} }
li {margin-bottom: 10px;}
} }
} }
@ -796,20 +798,6 @@ blockquote { /* solo quotes */
position: relative; position: relative;
} }
//columns
.span5 {
width: 19%;
padding-left: 1%;
}
@media screen and (max-width: 960px) {
.span5 {
width: 16%;
} // tighten right gutter
}
.row:before, .row:after { .row:before, .row:after {
display: table; display: table;
content: ""; content: "";
@ -1066,7 +1054,7 @@ span.highlighted {
.read-state { .read-state {
color: scale-color($tertiary, $lightness: 50%); color: scale-color($tertiary, $lightness: 50%);
position: absolute; position: absolute;
right: 0px; right: -8px;
top: 13px; top: 13px;
font-size: 8px; font-size: 8px;
} }

3
app/assets/stylesheets/vendor/bootstrap.scss vendored
View File

@ -55,9 +55,6 @@ img {
.span6 { .span6 {
width: 300px; width: 300px;
} }
.span5 {
width: 248px;
}
.span4 { .span4 {
width: 196px; width: 196px;
} }