Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove a truckload of wasteful CSS #266

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 23 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/assets/javascripts/components/add_domain.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ var NewDomainTransfer = React.createClass({
<input name="domain[transfer_auth_code]" type="text" className="form-control" />
</FormGroup>
</div>
<div className="modal-footer">
<div className="modal-footer py2 px3">
<button type="button" className={'btn btn-default'} onClick={this.props.onCancel}>
Cancel
</button>
Expand Down Expand Up @@ -122,7 +122,7 @@ var DomainPurchaseApplication = React.createClass({
<input name="domain[name]" type="text" className="form-control" placeholder="example.com" autofocus />
</FormGroup>
</div>
<div className="modal-footer">
<div className="modal-footer py2 px3">
<button type="button" className={'btn btn-default'} onClick={this.props.onCancel}>
Cancel
</button>
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/components/bounty_list_item.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ var BountyListItem = React.createClass({
<div className="table mb0">
<div className="table-cell">
<div className="px3 pt3 pb3">
<div className="mt0 mb1 mtn1 h4 fw-500 clickable">
<div className="mt0 mb1 mtn1 h4 bold clickable">
{this.renderTitle()}
</div>
<div className="clearfix h6 mt0 mb0 gray-3 mxn1">
Expand Down Expand Up @@ -206,9 +206,9 @@ var BountyListItem = React.createClass({
return (
<a className={classes} href={bounty.url}>
{bounty.title} {' '}
<span className="gray-2 fs4">
<span className="gray-2 h3">
#{bounty.number}
<span className="gray-2 visible-hover fw-200"> posted {moment(bounty.created_at).fromNow()}</span>
<span className="gray-2 visible-hover light"> posted {moment(bounty.created_at).fromNow()}</span>
</span>
</a>
)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/chat_entry.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
<div className="activity-body">
<div className="activity-actions">
<ul className="list-inline pull-right omega hidden-xs">
<ul className="list-inline pull-right mb0 hidden-xs">
<li>
<div className="dropdown">
<a href="#" className="dropdown-toggle" data-toggle="dropdown">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var DragAndDrop = React.createClass({
<img src={this.props.url}
alt={this.props.alt}
style={{opacity: this.state.opacity}}
className='img-rounded'
className='rounded'
width='100%' />

<span style={{
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/financials_view.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
// TODO: Break out dl-inline styles into reusable SCSS components
return (
<div>
<ul className="list-inline omega">
<ul className="list-inline mb0">
<li>
<span className="bg-green"></span>
<span className="green">Payout</span>
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/components/heart.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ var Heart = React.createClass({
</div>

return (
<a className="inline-block valign-top fs6 gray no-focus" href="javascript:void(0);" onClick={this.handleClick}>
<a className="inline-block valign-top h2 gray no-focus" href="javascript:void(0);" onClick={this.handleClick}>
{heartWithCount}
</a>
);
Expand Down Expand Up @@ -147,7 +147,7 @@ var Heart = React.createClass({

return (
<div onClick={this.handleClick} className="border rounded py1 px2">
<div className="inline-block valign-top fs6 gray no-focus">
<div className="inline-block valign-top h2 gray no-focus">
{heartWithCount}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/components/idea_progress_widget.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ const IdeaProgressWidget = React.createClass({

return (
<div className="product-state-indicator">
<div className="p2 pt0">
<div className="p2">
<div className="center"><strong>{this.state.stages[this.state.activeStage]['cta'] || this.state.stages[this.state.activeStage]['name']}</strong>
</div>
</div>
<div className="col-sm-12">
<div className="sm-col-12">
<ul className="indicator-container mb0">
{stages}
</ul>
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/components/info_modal.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},

logo: function() {
return <img src={this.props.product.poster} className='alpha mb2' style={{ width: '100px', paddingTop: '0px' }} />;
return <img src={this.props.product.poster} className='mt0 mb2' style={{ width: '100px', paddingTop: '0px' }} />;
},

render: function() {
Expand Down Expand Up @@ -88,7 +88,7 @@
var product = this.props.product;

return (
<div className="alpha" style={{ 'text-align': 'center' }}>
<div className="mt0" style={{ 'text-align': 'center' }}>
<h4 className>{product.name}</h4>
{this.logo()}
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var FormGroup = require('./form_group.js.jsx');
return (
<form onSubmit={this.handleSubmit}>
<div className="p3">
<h2 className="alpha">Ask a friend</h2>
<h2 className="mt0">Ask a friend</h2>
<p className="gray-2">Know somebody who could help with this? Anybody can help out, all you need to do is ask.</p>

<div className="alert alert-info alert-dismissable" role="alert" style={{ display: this.state.alertDisplay }}>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/invite_list.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
})
return (
<div className="panel panel-default">
<ul className="list-group list-group-breakout small omega">
<ul className="list-group list-group-breakout small mb0">
<ReactCSSTransitionGroup transitionName="invite">
{inviteNodes}
</ReactCSSTransitionGroup>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/members_view.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ var OnlineUsersStore = require('../stores/online_users_store');

if (isMemberOnline(member)) {
indicator = (
<div className="indicator indicator-success icon-right"></div>
<div className="indicator bg-green icon-right"></div>
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</div>

<FormGroup>
<div className="form-group gray-2 omega">
<div className="form-group gray-2 mb0">
<label>
{this.props.addonText + this.state.inputPreview}
</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module.exports = React.createClass({

<div className="activity-actions">

<ul className="list-inline pull-right omega">
<ul className="list-inline pull-right mb0">
<li>
<div className="dropdown">
<a href="#" className="dropdown-toggle" id={"dropdown-" + id} data-toggle="dropdown">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ module.exports = React.createClass({
<div className="table mb0">
<div className="table-cell">
<div className="px3 pt3 pb3" onClick={this.handleClick}>
<div className="mt0 mb1 mtn1 h4 fw-500 clickable">
<div className="mt0 mb1 mtn1 h4 bold clickable">
<a href={this.props.url}>
{this.props.title}
</a>
</div>
<div>
{this.renderSummary()}
</div>
<div className="mt1 gray-1 fs4">
<div className="mt1 gray-1 h3">
<Markdown content={this.props.body} normalized={true} />
{this.renderReadMore()}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/components/people_view.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@

return (
<div>
<p className="omega">
<ul className="list-inline omega pull-right">
<p className="mb0">
<ul className="list-inline mb0 pull-right">
{this.skills(member)}
</ul>
<strong>
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/components/posts/posts_index.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,19 @@ var PostsIndex = React.createClass({
return [
<li className="mb1 lh0_9" key="filter-all">
<a href={path + "?discussions=true"} className="pill-hover block py1 px3" onClick={this.fetchDiscussions}>
<span className="fs1 fw-500 caps">all posts</span>
<span className="h5 bold caps">all posts</span>
</a>
</li>,

<li className="mb1 lh0_9" key="filter-announcements">
<a href={path + "?announcements=true"} className="pill-hover block py1 px3" onClick={this.fetchAnnouncements}>
<span className="fs1 fw-500 caps">announcements</span>
<span className="h5 bold caps">announcements</span>
</a>
</li>,

<li className="mb1 lh0_9" key="filter-archived">
<a href={path + "?archived=true"} className="pill-hover block py1 px3" onClick={this.fetchArchivedPosts}>
<span className="fs1 fw-500 caps">archived posts</span>
<span className="h5 bold caps">archived posts</span>
</a>
</li>
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var MetricsCharts = React.createClass({
renderAddMetrics() {
return this.blurredImage(() =>
<div>
<h3 className="alpha">
<h3 className="mt0">
Metrics setup guide
</h3>
<p>Configuring Assembly metrics integration allows you to see and show off your products success with the world.</p>
Expand All @@ -69,7 +69,7 @@ var MetricsCharts = React.createClass({
renderEmptyState() {
return this.blurredImage(() =>
<div className="center">
<h3 className="alpha">
<h3 className="mt0">
No metrics collected yet
</h3>
<p>Once {this.state.product.name} is up and running its metrics will appear here</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const ProductActivity = React.createClass({
return (
<li className="mb1 lh0_9" key={tag + '-' + i}>
<a href={href} className="pill-hover block py1 px3">
<span className="fs1 fw-500 caps">{tag + ' posts'}</span>
<span className="h5 bold caps">{tag + ' posts'}</span>
</a>
</li>
);
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/tag.js.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var Tag = React.createClass({
render: function() {
var tag = this.props.tag;
return (
<a className="fs1 caps gray-2 mr2 pointer" href={this.props.tag.url}>
<a className="h5 caps gray-2 mr2 pointer" href={this.props.tag.url}>
#{this.props.tag.name}
</a>
);
Expand Down
13 changes: 0 additions & 13 deletions app/assets/javascripts/components/ui/small_tile.js.jsx

This file was deleted.

11 changes: 5 additions & 6 deletions app/assets/javascripts/lib/bootstrap-lightbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{
that.backdrop(function ()
{
var transition = $.support.transition && that.$element.hasClass('fade');
var transition = $.support.transition && that.$element.hasClass('muted');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.
Mixed double and single quotes.


if (!that.$element.parent().length)
{
Expand Down Expand Up @@ -100,7 +100,7 @@
.attr('aria-hidden', true)
.off('click.dismiss.lightbox');

$.support.transition && this.$element.hasClass('fade') ?
$.support.transition && this.$element.hasClass("muted") ?
this.$element
.one($.support.transition.end, $.proxy(this.hideModal(slide), this))
.emulateTransitionEnd(300) :
Expand Down Expand Up @@ -150,13 +150,12 @@
Lightbox.prototype.backdrop = function (callback)
{
var that = this
var animate = this.$element.hasClass('fade') ? 'fade' : ''
var animate = this.$element.hasClass("muted") ? "muted" : "";
if (this.isShown && this.options.backdrop)
{
var doAnimate = $.support.transition && animate;

this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body);
this.$backdrop = $("<div class='bg-black " + animate + "' />").appendTo(document.body);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.


this.$element.on('click.dismiss.lightbox', $.proxy(function (e)
{
Expand All @@ -183,7 +182,7 @@
{
this.$backdrop.removeClass('in');

$.support.transition && this.$element.hasClass('fade')?
$.support.transition && this.$element.hasClass('muted')?
this.$backdrop
.one($.support.transition.end, callback)
.emulateTransitionEnd(150) :
Expand Down
33 changes: 0 additions & 33 deletions app/assets/stylesheets/-deprecated/_border.scss

This file was deleted.

2 changes: 0 additions & 2 deletions app/assets/stylesheets/_bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
@import "bootstrap/navbar";
@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
@import "bootstrap/pager";
@import "bootstrap/labels";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Back/Next type buttons. Not used anywhere on the site.

@import "bootstrap/badges";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
@import "bootstrap/media";
Expand Down
Loading