diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js
index a3aa65c5e..de6913f21 100644
--- a/app/assets/javascripts/app/app.js
+++ b/app/assets/javascripts/app/app.js
@@ -111,7 +111,6 @@ var app = {
setupGlobalViews: function() {
app.hovercard = new app.views.Hovercard();
- app.aspectMembershipsBlueprint = new app.views.AspectMembershipBlueprint();
$('.aspect_membership_dropdown').each(function(){
new app.views.AspectMembership({el: this});
});
diff --git a/app/assets/javascripts/app/views/aspect_membership_blueprint_view.js b/app/assets/javascripts/app/views/aspect_membership_blueprint_view.js
deleted file mode 100644
index d7e95bdac..000000000
--- a/app/assets/javascripts/app/views/aspect_membership_blueprint_view.js
+++ /dev/null
@@ -1,172 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-/**
- * this view lets the user (de-)select aspect memberships in the context
- * of another users profile or the contact page.
- *
- * updates to the list of aspects are immediately propagated to the server, and
- * the results are dislpayed as flash messages.
- */
-app.views.AspectMembershipBlueprint = Backbone.View.extend({
-
- initialize: function() {
- // attach event handler, removing any previous instances
- var selector = '.dropdown.aspect_membership .dropdown_list > li';
- $('body')
- .off('click', selector)
- .on('click', selector, _.bind(this._clickHandler, this))
- .on('keypress', selector, _.bind(this._clickHandler, this));
-
- this.list_item = null;
- this.dropdown = null;
- },
-
- // decide what to do when clicked
- // -> addMembership
- // -> removeMembership
- _clickHandler: function(evt) {
- var promise = null;
- this.list_item = $(evt.target);
- this.dropdown = this.list_item.parent();
-
- this.list_item.addClass('loading');
-
- if( this.list_item.is('.selected') ) {
- var membership_id = this.list_item.data('membership_id');
- promise = this.removeMembership(membership_id);
- } else {
- var aspect_id = this.list_item.data('aspect_id');
- var person_id = this.dropdown.data('person_id');
- promise = this.addMembership(person_id, aspect_id);
- }
-
- promise && promise.always(function() {
- // trigger a global event
- app.events.trigger('aspect_membership:update');
- });
-
- return false; // stop the event
- },
-
- // return the (short) name of the person associated with the current dropdown
- _name: function() {
- return this.dropdown.data('person-short-name');
- },
-
- // create a membership for the given person in the given aspect
- addMembership: function(person_id, aspect_id) {
- var aspect_membership = new app.models.AspectMembership({
- 'person_id': person_id,
- 'aspect_id': aspect_id
- });
-
- aspect_membership.on('sync', this._successSaveCb, this);
- aspect_membership.on('error', function() {
- this._displayError('aspect_dropdown.error');
- }, this);
-
- return aspect_membership.save();
- },
-
- _successSaveCb: function(aspect_membership) {
- var aspect_id = aspect_membership.get('aspect_id');
- var membership_id = aspect_membership.get('id');
- var li = this.dropdown.find('li[data-aspect_id="'+aspect_id+'"]');
-
- // the user didn't have this person in any aspects before, congratulate them
- // on their newly found friendship ;)
- if( this.dropdown.find('li.selected').length === 0 ) {
- var msg = Diaspora.I18n.t('aspect_dropdown.started_sharing_with', { 'name': this._name() });
- Diaspora.page.flashMessages.render({ 'success':true, 'notice':msg });
- }
-
- li.attr('data-membership_id', membership_id) // just to be sure...
- .data('membership_id', membership_id)
- .addClass('selected');
-
- this.updateSummary();
- this._done();
- },
-
- // show an error flash msg
- _displayError: function(msg_id) {
- this._done();
- this.dropdown.removeClass('active'); // close the dropdown
-
- var msg = Diaspora.I18n.t(msg_id, { 'name': this._name() });
- Diaspora.page.flashMessages.render({ 'success':false, 'notice':msg });
- },
-
- // remove the membership with the given id
- removeMembership: function(membership_id) {
- var aspect_membership = new app.models.AspectMembership({
- 'id': membership_id
- });
-
- aspect_membership.on('sync', this._successDestroyCb, this);
- aspect_membership.on('error', function() {
- this._displayError('aspect_dropdown.error_remove');
- }, this);
-
- return aspect_membership.destroy();
- },
-
- _successDestroyCb: function(aspect_membership) {
- var membership_id = aspect_membership.get('id');
- var li = this.dropdown.find('li[data-membership_id="'+membership_id+'"]');
-
- li.removeAttr('data-membership_id')
- .removeData('membership_id')
- .removeClass('selected');
-
- // we just removed the last aspect, inform the user with a flash message
- // that he is no longer sharing with that person
- if( this.dropdown.find('li.selected').length === 0 ) {
- var msg = Diaspora.I18n.t('aspect_dropdown.stopped_sharing_with', { 'name': this._name() });
- Diaspora.page.flashMessages.render({ 'success':true, 'notice':msg });
- }
-
- this.updateSummary();
- this._done();
- },
-
- // cleanup tasks after aspect selection
- _done: function() {
- if( this.list_item ) {
- this.list_item.removeClass('loading');
- }
- },
-
- // refresh the button text to reflect the current aspect selection status
- updateSummary: function() {
- var btn = this.dropdown.parents('div.aspect_membership').find('.button.toggle');
- var aspects_cnt = this.dropdown.find('li.selected').length;
- var txt;
-
- if( aspects_cnt === 0 ) {
- btn.removeClass('in_aspects');
- txt = Diaspora.I18n.t('aspect_dropdown.toggle.zero');
- } else {
- btn.addClass('in_aspects');
- txt = this._pluralSummaryTxt(aspects_cnt);
- }
-
- btn.text(txt + ' ▼');
- },
-
- _pluralSummaryTxt: function(cnt) {
- var all_aspects_cnt = this.dropdown.find('li').length;
-
- if( cnt === 1 ) {
- return this.dropdown.find('li.selected').first().text();
- }
-
- if( cnt === all_aspects_cnt ) {
- return Diaspora.I18n.t('aspect_dropdown.all_aspects');
- }
-
- return Diaspora.I18n.t('aspect_dropdown.toggle', { 'count':cnt.toString() });
- }
-});
-// @license-end
-
diff --git a/app/assets/javascripts/app/views/contact_view.js b/app/assets/javascripts/app/views/contact_view.js
index 2ac8dc772..840edfe46 100644
--- a/app/assets/javascripts/app/views/contact_view.js
+++ b/app/assets/javascripts/app/views/contact_view.js
@@ -27,7 +27,6 @@ app.views.Contact = app.views.Base.extend({
// TODO render me client side!!!
var href = this.model.person.url() + '/aspect_membership_button?size=small';
- if( gon.bootstrap ) href += '&bootstrap=true';
$.get(href, function(resp) {
dropdownEl.html(resp);
diff --git a/app/assets/javascripts/app/views/content_view.js b/app/assets/javascripts/app/views/content_view.js
index 73c86c24b..75a4632cc 100644
--- a/app/assets/javascripts/app/views/content_view.js
+++ b/app/assets/javascripts/app/views/content_view.js
@@ -113,7 +113,7 @@ app.views.OEmbed = app.views.Base.extend({
clickedThumb = $(evt.target);
} else {
clickedThumb = $(evt.target).parent(".thumb");
- }
+ }
var insertHTML = $(app.helpers.oEmbed.html(this.model.get("o_embed_cache")));
var paramSeparator = ( /\?/.test(insertHTML.attr("src")) ) ? "&" : "?";
insertHTML.attr("src", insertHTML.attr("src") + paramSeparator + "autoplay=1&wmode=opaque");
diff --git a/app/assets/javascripts/app/views/hovercard_view.js b/app/assets/javascripts/app/views/hovercard_view.js
index 6e3ad43e8..92a89529a 100644
--- a/app/assets/javascripts/app/views/hovercard_view.js
+++ b/app/assets/javascripts/app/views/hovercard_view.js
@@ -123,9 +123,6 @@ app.views.Hovercard = app.views.Base.extend({
// TODO render me client side!!!
var href = this.href();
href += "/aspect_membership_button";
- if(gon.bootstrap === true){
- href += "?bootstrap=true";
- }
$.get(href, function(response) {
self.dropdown_container.html(response);
});
diff --git a/app/assets/javascripts/app/views/profile_header_view.js b/app/assets/javascripts/app/views/profile_header_view.js
index e44300b29..7a460e182 100644
--- a/app/assets/javascripts/app/views/profile_header_view.js
+++ b/app/assets/javascripts/app/views/profile_header_view.js
@@ -49,7 +49,6 @@ app.views.ProfileHeader = app.views.Base.extend({
// TODO render me client side!!!
var href = this.model.url() + '/aspect_membership_button?create=true&size=normal';
- if( gon.bootstrap ) href += '&bootstrap=true';
$.get(href, function(resp) {
dropdownEl.html(resp);
diff --git a/app/assets/javascripts/app/views/publisher/aspect_selector_blueprint_view.js b/app/assets/javascripts/app/views/publisher/aspect_selector_blueprint_view.js
deleted file mode 100644
index 03f15f93d..000000000
--- a/app/assets/javascripts/app/views/publisher/aspect_selector_blueprint_view.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-/* Copyright (c) 2010-2012, Diaspora Inc. This file is
- * licensed under the Affero General Public License version 3 or later. See
- * the COPYRIGHT file.
- */
-
-// Aspects view for the publisher.
-// Provides the ability to specify the visibility of posted content as public
-// or limited to selected aspects
-app.views.PublisherAspectSelectorBlueprint = Backbone.View.extend({
- /* global AspectsDropdown */
-
- events: {
- "click .dropdown_list > li": "toggleAspect"
- },
-
- initialize: function(opts) {
- this.form = opts.form;
- },
-
- // event handler for aspect selection
- toggleAspect: function(evt) {
- var el = $(evt.target);
-
- // visually toggle the aspect selection
- if( el.is('.radio') ) {
- AspectsDropdown.toggleRadio(el);
- } else {
- AspectsDropdown.toggleCheckbox(el);
- }
-
- // update the selection summary
- this._updateAspectsNumber(el);
- this._updateSelectedAspectIds();
- },
-
- // select a (list of) aspects in the dropdown selector by the given list of ids
- updateAspectsSelector: function(ids){
- var el = this.$("ul.dropdown_list");
- this.$('.dropdown_list > li').each(function(){
- var el = $(this);
- var aspectId = el.data('aspect_id');
- if (_.contains(ids, aspectId)) {
- el.addClass('selected');
- }
- else {
- el.removeClass('selected');
- }
- });
-
- this._updateAspectsNumber(el);
- this._updateSelectedAspectIds();
- },
-
- // take care of the form fields that will indicate the selected aspects
- _updateSelectedAspectIds: function() {
- var self = this;
-
- // remove previous selection
- this.form.find('input[name="aspect_ids[]"]').remove();
-
- // create fields for current selection
- this.$('.dropdown_list li.selected').each(function() {
- var el = $(this);
- var aspectId = el.data('aspect_id');
-
- self._addHiddenAspectInput(aspectId);
-
- // close the dropdown when a radio item was selected
- if( el.is('.radio') ) {
- el.closest('.dropdown').removeClass('active');
- }
- });
- },
-
- _updateAspectsNumber: function(el){
- AspectsDropdown.updateNumber(
- el.closest(".dropdown_list"),
- null,
- el.parent().find('li.selected').length,
- ''
- );
- },
-
- _addHiddenAspectInput: function(id) {
- var uid = _.uniqueId('aspect_ids_');
- this.form.append(
- ''
- );
- }
-});
-// @license-end
-
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 65f0771cd..1c982d810 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,1817 +1,86 @@
-@import "compass";
-@import "perfect-scrollbar";
+@import 'bootstrap-fix';
+
+@import 'perfect-scrollbar';
@import "colors";
-@import "ui";
-@import "_mixins";
-@import "_flash_messages";
-@import "new_styles/_spinner";
+@import 'mixins';
+@import 'new_styles/new_mixins';
+@import 'new_styles/variables';
-@import "sidebar";
-@import "leftnavbar";
-@import "sprites";
-@import "header";
-@import "footer";
-@import "opengraph";
-@import "poll";
-@import "help";
-@import "publisher_blueprint";
-@import "facebox";
-@import "aspects";
-@import "stream-faces";
-@import "popover";
-@import "stream_element_blueprint";
-@import "report";
-@import "new_styles/_forms";
-@import "tag";
-@import "photo";
-@import "chat";
+/* core */
+@import 'flash_messages';
+@import 'sprites';
-/* ====== media ====== */
-.media {
- margin: 10px;
-}
+@import 'new_styles/base';
+@import 'new_styles/buttons';
+@import 'new_styles/interactions';
+@import 'new_styles/spinner';
-.media, .bd {
- overflow: hidden;
- zoom: 1;
-}
+/* font overrides */
+@import 'new_styles/typography';
-.media .img {
- float: left;
- margin-right: 10px;
-}
+/* login */
+@import 'new_styles/login';
+@import 'new_styles/registration';
+@import 'new_styles/landing';
-.media .img img {
- display: block;
-}
+@import 'new_styles/forms';
-.media .imgEt {
- float: right;
- margin-left: 10px;
-}
+/* navs */
+@import 'new_styles/navs';
-/* ====== ----- ====== */
+/* profile and settings pages */
+@import 'new_styles/settings';
-body {
- padding: 2em;
- margin: 0 {
- top: 33px;
- };
- background-color: $background-white;
- font: {
- family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- size: 13px;
- };
-}
+/* new SPV */
+@import 'header';
+@import 'footer';
+@import 'bootstrap-headerfix';
+@import 'opengraph';
+@import 'single-post-view';
+@import 'new_styles/poll';
-header {
- line-height: 20px;
-}
+/* conversations */
+@import 'conversations';
+@import 'facebox';
-a {
- color: $blue;
- text: {
- decoration: none;
- };
- &:hover {
- color: $blue;
- text: {
- decoration: underline;
- };
- }
- &.disabled {
- color: $link-disabled-grey;
- cursor: default;
- }
- &.disabled.button:hover {
- color: $link-disabled-grey;
- cursor: default;
- background: #f7f7f7;
- }
-}
+/* publisher */
+@import 'publisher';
+@import 'aspects';
-p {
- word-wrap: break-word;
-}
+/* bookmarklet */
+@import 'bookmarklet';
-h1, h2, h3, h4 {
- margin: {
- bottom: 5px;
- };
- small {
- font-size: small;
- color: $text-grey;
- }
-}
+/* notifications */
+@import 'notifications';
-ul > li {
- list-style: none;
-}
+/* help */
+@import 'help';
-.content ul li {
- list-style: disc;
-}
+/* getting started */
+@import 'getting-started';
-.rtl {
- direction: rtl;
- text-align: right;
-}
+/* people */
+@import 'people';
+@import 'invitations';
+@import 'profile';
-.hidden {
- display: none;
-}
+/* stream */
+@import 'tag';
+@import 'stream-faces';
+@import 'stream';
+@import 'stream_element';
+@import 'comments';
-.avatar {
- box-shadow: rgba(0, 0, 0, 0.12) 0px 0px 5px inset;
- background: {
- color: $background-grey;
- };
- width: 50px;
- height: 50px;
- overflow: hidden;
-}
+/* right bar */
+@import 'sidebar';
-#content {
- background: {
- color: white;
- };
- border: 1px solid #cccccc;
- height: 100%;
-}
+/* contacts */
+@import 'contacts';
+@import 'leftnavbar';
-.login_error,
-.login_alert {
- color: rgb(208, 49, 43);
- text-shadow: 1px 1px 20px rgb(208, 49, 43);
-}
+/* code */
+@import 'new_styles/code';
-.login_notice {
- color: rgb(10, 150, 10);
- text-shadow: 1px 1px 20px rgb(126, 240, 77);
-}
-
-.fieldWithErrors {
- display: inline;
-}
-
-.error_messages {
- width: 400px;
- border: 2px solid #cf0000;
- padding: 0;
- padding-bottom: 12px;
- margin-bottom: 20px;
- background-color: #f0f0f0;
- font: {
- size: 12px;
- };
- h2 {
- text-align: left;
- padding: 5px 5px 5px 15px;
- margin: 0;
- font: {
- weight: bold;
- size: 12px;
- };
- background-color: #cc0000;
- }
- p {
- margin: 8px 10px;
- }
- ul {
- margin: 0;
- }
-}
-
-//////////////////////////////////
-
-//////////////////////////////////
-//hacks for tagging plugin...
-ul.as-selections {
- width: 100% !important;
-}
-
-//////////////////////////////////
-
-.unread {
- background-color: #e6e6e6;
- color: #333333 !important;
- time {
- color: #333333 !important;
- }
-}
-
-#author_info {
- position: relative;
- .avatar img {
- position: relative;
- top: 0px;
- display: inline-block;
- height: 30px;
- width: 30px;
- }
- .from {
- display: inline-block;
- }
- &.profile {
- .from {
- padding: 0;
- }
- }
- h2,
- h3,
- h4,
- h5 {
- display: inline-block;
- margin: {
- bottom: 10px;
- right: 10px;
- };
- }
- h2 {
- margin: {
- bottom: 0;
- };
- }
- &.show {
- a {
- margin: {
- right: 1em;
- };
- font: {
- weight: normal;
- };
- }
- h4,
- h5 {
- margin: 0;
- padding: 0;
- }
- }
- .right {
- top: 10px;
- }
- .description {
- margin: {
- bottom: 10px;
- };
- }
-}
-
-.info {
- font-size: smaller;
-}
-
-.controls {
- z-index: 6;
- float: right;
- .post_report, .comment_report {
- display: inline-block;
- .icons-report {
- height: 14px;
- width: 14px;
- }
- }
- .block_user {
- display: inline-block;
- .icons-ignoreuser {
- height: 14px;
- width: 14px;
- }
- }
- .create_participation {
- display: inline-block;
- .icons-create_participation {
- height: 14px;
- width: 14px;
- }
- }
- .destroy_participation {
- display: inline-block;
- .icons-destroy_participation {
- height: 14px;
- width: 14px;
- }
- }
- .delete {
- display: inline-block;
- .icons-deletelabel {
- height: 14px;
- width: 14px;
- }
- }
- a:hover {
- text-decoration: none;
- }
-}
-
-.grey,
-.grey * {
- color: $text-grey;
-}
-
-.pull-left {
- float: left;
-}
-
-.pull-right {
- float: right;
-}
-
-.details,
-.details * {
- font: {
- weight: normal;
- };
-}
-
-.time,
-.via {
- color: #aaaaaa;
- a {
- color: $text-grey;
- }
- text: {
- decoration: none;
- };
- border: none;
-}
-
-#user_name {
- margin: {
- bottom: 20px;
- };
- img {
- margin: {
- right: 10px;
- };
- display: inline-block;
- float: left;
- height: 40px;
- }
- h1 {
- margin: {
- bottom: 7px;
- };
- line-height: 18px;
- a {
- color: black;
- }
- }
- span {
- size: small;
- font: {
- weight: normal;
- };
- color: $text-grey;
- }
- #latest_message_time {
- font-style: italic;
- }
- ul {
- display: inline;
- margin: 0;
- padding: 0;
- > li {
- display: inline;
- margin: {
- right: 1em;
- };
- }
- }
-}
-
-.stream.show {
- &:hover {
- > li {
- background: none;
- border: none;
- }
- }
-}
-
-.submit_button {
- input {
- float: right;
- }
-}
-
-#photo_container {
- text: {
- align: center;
- };
-}
-
-#show_photo {
- z-index: 11;
- position: relative;
- display: inline-block;
- max-width: 100%;
- img {
- max-width: 100%;
- }
- #photo_spinner {
- z-index: 1;
- position: absolute;
- height: 100px;
- width: 100px;
- }
- #caption {
- min-height: 20px;
- padding: 0 10px;
- font: {
- size: 16px;
- };
- color: #333333;
- }
-}
-
-input:not([type='submit']):not([type='reset']):not([type='hidden']):not(.as-input),
-textarea {
- border-radius: 2px;
- background-color: white;
- color: black;
- margin-top: 1px;
- font: {
- family: "Arial", "Helvetica", sans-serif;
- size: 14px;
- };
- padding: 0.3em;
- display: block;
- border: 1px solid #cccccc;
- height: auto;
-}
-
-input[type='checkbox'] {
- width: auto !important;
-}
-
-form p {
- position: relative;
- padding: 0;
- margin: 0;
-}
-
-form#update_profile_form p.checkbox_select {
- label {
- top: 0;
- }
-}
-
-form p.checkbox_select {
- label {
- left: 25px;
- top: 3px;
- position: absolute;
- font-size: 1em;
- }
- img {
- position: relative;
- top: 6px;
- }
-}
-
-@mixin placeholder_styles {
- color: $text-grey;
- text-shadow: 0 1px 1px #eeeeee;
- font-weight: normal;
-}
-
-.placeholder {
- @include placeholder_styles;
-}
-
-/* those can't be combined, see: http://stackoverflow.com/questions/2610497 */
-*::input-placeholder {
- @include placeholder_styles;
-}
-
-.field_with_submit {
- input[type='text'] {
- width: 82%;
- display: inline;
- }
-}
-
-.dim {
- opacity: 0.3;
-}
-
-img.thumb_small {
- max-height: 50px;
- max-width: 50px;
-}
-
-img.thumb_medium {
- max-height: 100px;
- max-width: 100px;
-}
-
-img.thumb_large {
- max-height: 300px;
- max-width: 300px;
-}
-
-img.scaled_full {
- max-height: 700px;
- max-width: 700px;
-}
-
-#thumbnails {
- a {
- display: inline-block;
- height: 140px;
- min-height: 100px;
- margin: {
- bottom: 5px;
- right: 2px;
- };
- img {
- height: 140px;
- }
- }
-}
-
-ul#settings_nav {
- display: inline;
- padding: 0;
- font: {
- size: large;
- };
- position: absolute;
- left: 198px;
- top: 5px;
- > li {
- display: inline;
- margin: {
- right: 1em;
- };
- font: {
- weight: 700;
- };
- a {
- padding: 2px;
- font: {
- weight: normal;
- };
- }
- }
-}
-
-.settings_pane {
- display: none;
-}
-
-#account_data {
- a {
- line-height: 30px;
- }
-}
-
-.contact_pictures.horizontal {
- img {
- margin-right: -5px;
- }
-}
-
-#thumbnails {
- line-height: 14px;
-}
-
-.dull {
- color: #aaaaaa;
- text-align: center;
- font: {
- style: italic;
- };
- a {
- color: #69aedd;
- }
-}
-
-h1,h2,h3,h4 {
- .description {
- font: {
- size: 70%;
- weight: 100;
- };
- color: #aaaaaa;
- margin: {
- top: 0.5em;
- };
- }
-}
-
-h2,h3,h4 {
- .description {
- font: {
- size: 80%;
- weight: 200;
- };
- }
-}
-
-input[type="search"] {
- appearance: textfield;
-}
-
-#photo_edit_options {
- display: none;
-}
-
-#photodropzone {
- padding: 0px;
- margin: 0px;
-}
-
-#section_header {
- width: 100%;
- border: {
- bottom: 2px solid #777777;
- };
- position: relative;
- margin: {
- bottom: 2em;
- };
- padding: {
- bottom: 0.4em;
- };
- h2 {
- display: inline;
- }
- .right {
- margin: {
- top: 10px;
- };
- }
- h4 {
- display: inline;
- margin: {
- left: 1em;
- };
- }
-}
-
-.photo_options {
- color: $text-grey;
- text: {
- align: center;
- };
-}
-
-.inline {
- display: inline;
-}
-
-.floating {
- box-shadow: 0 1px 3px #333333;
- position: relative;
- padding: 12px;
- margin: {
- bottom: 2em;
- };
- background: {
- color: rgb(255, 255, 255);
- };
- border: {
- bottom: 1px solid #cccccc;
- top: 1px solid white;
- };
- .submit_block {
- position: absolute;
- bottom: 13px;
- right: 12px;
- }
- form {
- display: relative;
- }
-}
-
-#user_photo_uploader {
- .avatar {
- border-radius: 5px;
- height: 100px;
- width: 100px;
- }
-}
-
-h3 span.current_gs_step {
- color: #22c910;
-}
-
-ul#request_result {
- padding: 0;
- margin: 0;
- li {
- margin: {
- bottom: 25px;
- };
- input.add {
- color: green;
- }
- }
- .stream_element {
- .content {
- display: inline;
- position: relative;
- bottom: 2.5em;
- padding: 0;
- }
- }
-}
-
-#signup_field {
- margin: {
- top: -200px;
- };
- height: 46px;
- padding: 0;
- width: 400px;
- display: inline;
- div {
- display: inline;
- }
- #mce-responses {
- margin: {
- top: 12px;
- };
- font: {
- size: 12px;
- };
- display: block;
- color: $text-grey;
- text-shadow: 0 1px 0 white;
- #mce-error-response {
- color: red;
- }
- #mce-success-response {
- color: green;
- }
- }
- input[type='text'] {
- top: -1px;
- margin: 0 {
- right: -3px;
- };
- width: 300px;
- border-radius: 5px 0 0 5px;
- position: relative;
- display: inline;
- padding: 12px;
- font: {
- size: 18px;
- };
- }
- #big_action_button, input[type='submit'] {
- @include linear-gradient(rgb(65, 182, 250), rgb(0, 123, 194));
- height: 47px;
- margin: 0;
- background: {
- color: $blue;
- };
- border-radius: 0 5px 5px 0;
- border: 1px solid #cccccc;
- padding: 12px;
- font: {
- size: 18px;
- weight: bold;
- };
- color: #eeeeee;
- text-shadow: 0 1px 0 #333333;
- text: {
- align: center;
- };
- &:hover {
- @include linear-gradient(rgb(0, 136, 209), rgb(113, 204, 255));
- }
- }
-}
-
-#diaspora_description {
- background: {
- image: image-url("branding/ball.png");
- repeat: no-repeat;
- position: top center;
- };
- padding: {
- top: 250px;
- };
- margin: {
- top: -200px;
- };
- font: {
- size: 3.3em;
- weight: bold;
- };
- text-shadow: 0 1px 3px #999999;
- p {
- box-shadow: 0 1px 3px #cccccc;
- padding: 12px;
- background: {
- color: white;
- };
- }
-}
-
-#login_field {
- text: {
- align: left;
- };
- font: {
- style: italic;
- };
- margin: {
- top: 14px;
- left: 540px;
- };
- color: $text-grey;
-}
-
-ul#press_logos {
- margin: 0 {
- top: 100px;
- };
- padding: 0;
- > li {
- display: inline;
- margin: {
- right: 30px;
- };
- img {
- height: 40px;
- }
- &:last-child {
- margin: {
- right: 0;
- };
- }
- }
-}
-
-#landing_content {
- margin: {
- top: 100px;
- };
- text: {
- align: center;
- };
-}
-
-#why {
- margin: {
- bottom: 48px;
- };
- h2 {
- text-shadow: 0 1px white;
- border: {
- bottom: 3px solid #eeeeee;
- };
- }
-}
-
-#signup {
- margin: {
- bottom: 48px;
- };
-}
-
-#already_invited_pane {
- h4 {
- color: $text-dark-grey;
- }
- color: $text-dark-grey;
-}
-
-#search_title {
- font: {
- weight: 200;
- };
- .term {
- font: {
- weight: bold;
- };
- }
-}
-
-.aspects {
- position: relative;
- margin: {
- top: 1em;
- };
- .right {
- right: 12px;
- }
- .contact_list {
- height: auto;
- max-height: auto;
- width: 500px;
- }
-}
-
-.aspects .aspect_badge {
- font: {
- size: 1em;
- };
-}
-
-.share_with {
- min-width: 430px;
- .avatar {
- width: 50px;
- height: 50px;
- float: left;
- }
- h4,p {
- padding: {
- left: 64px;
- };
- }
- p {
- color: #eeeeee;
- }
-}
-
-#aspects_list {
- height: auto;
-}
-
-.show_comments {
- border: {
- top: 1px solid $border-grey;
- };
- margin: {
- top: 5px;
- };
-}
-
-.show_comments,
-.likes_container {
- a {
- color: $text-grey;
- }
-}
-
-.likes {
- .entypo.heart {
- font-size: 16px;
- line-height: 16px;
- vertical-align: top;
- margin-right: 5px;
- }
- .bd {
- display: inline-block;
- .expand_likes {
- vertical-align: text-bottom;
- }
- }
-}
-
-.mark_all_read {
- position: relative;
- top: 10px;
-}
-
-#inner_account_delete {
- width: 810px;
-}
-
-.icons-monotone_email_letter_round {
- height: 128px;
- width: 128px;
-}
-
-#email_invitation {
- input {
- width: 100%;
- }
- textarea {
- width: 100%;
- }
-}
-
-.share_with {
- .add_aspect {
- border-radius: 5px;
- margin: {
- top: 0.5em;
- };
- background: {
- color: #dddddd;
- };
- p {
- padding: {
- left: 1em;
- };
- input[type='text'] {
- width: 95%;
- }
- &.checkbox_select {
- label {
- padding: {
- left: 15px;
- };
- top: 0;
- }
- height: 2em;
- }
- }
- .right {
- z-index: 5;
- top: 34px;
- right: 1em;
- }
- }
- .done {
- padding: 1em {
- bottom: 2em;
- };
- .right {
- right: 1em;
- }
- }
-}
-
-.invite_friends {
- padding: 1em;
- background: {
- color: $background-grey;
- };
- border: 1px solid #cccccc;
-}
-
-#remember_me {
- input[type='checkbox'] {
- display: inline;
- height: auto !important;
- top: 2px !important;
- }
- label {
- font-size: inherit !important;
- position: static;
- }
-}
-
-.public_icon, .service_icon {
- cursor: pointer;
-}
-
-#contact_visibility_padlock:hover {
- opacity: 0.7;
-}
-
-.side_stream {
- .stream_element {
- padding: 10px 0;
- }
- .avatar {
- float: left;
- }
-}
-
-.diaspora_handle {
- font: {
- size: 12px;
- weight: normal;
- };
- color: #555555;
-}
-
-.add_tags {
- font: {
- weight: normal;
- size: 11px;
- };
-}
-
-.hover_edit {
- display: none;
- font: {
- weight: normal;
- size: 11px;
- };
- margin: {
- left: 5px;
- };
-}
-
-.description:hover {
- .hover_edit {
- display: inline;
- }
-}
-
-.date {
- background: {
- color: #e6e6e6;
- };
- border-radius: 8px;
- padding: 5px;
- color: $text-grey;
- text-align: center;
- .day {
- font-size: 50px;
- font-weight: 200;
- margin-bottom: -15px;
- margin-top: -10px;
- }
- .month {
- font-size: 14px;
- }
-}
-
-.subtle {
- color: $text-grey;
- font: {
- style: italic;
- };
-}
-
-.button.sign_up {
- @include linear-gradient(#d9ffa9, #b9e68a);
- text-shadow: none;
- color: #333333;
- &:hover {
- @include linear-gradient(darken(#d9ffa9, 10%), darken(#b9e68a, 10%));
- }
- &:active {
- @include linear-gradient(darken(#d9ffa9, 20%), darken(#b9e68a, 20%));
- }
-}
-
-#client-application-image {
- max-width: 100%;
-}
-
-#service_stream {
- margin: 0;
- padding: 0;
-}
-
-#authorize {
- text-align: center;
-}
-
-#application-description {
- display: inline-block;
- width: 300px;
- padding-bottom: 20px;
-}
-
-ul#requested-scopes {
- vertical-align: middle;
- li {
- display: inline-block;
- padding: 5px;
- img {
- height: 30px;
- width: 30px;
- }
- .scope-description {
- display: none;
- }
- }
-}
-
-.item_count {
- min-width: 16px;
- line-height: 16px;
- text-align: center;
- float: right;
- border-radius: 4px;
- margin-top: 1px;
- color: $text-grey;
- background: {
- color: $background-grey;
- };
- display: inline-block;
- font: {
- size: 11px;
- weight: 700;
- };
-}
-
-ul.left_nav {
- margin: 0 {
- bottom: 15px;
- };
- padding: 0;
- &.sub {
- padding-left: 6px;
- }
- a.community_aspect_selector {
- width: 152px;
- vertical-align: middle;
- display: inline-block;
- line-height: 25px;
- text: {
- decoration: none;
- };
- }
- a {
- font-weight: bold;
- color: $link-grey;
- text: {
- decoration: none;
- };
- }
- li {
- position: relative;
- width: 100%;
- }
- li.active {
- > a.home_selector:not(.sub_selected) {
- font: {
- weight: 700;
- };
- }
- > a:not(.sub_selected) {
- color: #333333;
- .item_count {
- color: $text-dark-grey;
- }
- }
- }
- a.aspect_selector,
- a.home_selector,
- a.tag_selector,
- a.element_selector {
- &:active {
- cursor: grabbing;
- }
- }
- a.home_selector,
- a.tag_selector,
- a.element_selector,
- .root_element {
- display: block;
- width: 100%;
- padding: 3px 7px;
- }
- a.home_selector,
- li.aspect_element,
- a.element_selector {
- &:hover {
- border-radius: 2px;
- background: {
- color: lighten($blue, 45%);
- };
- text: {
- decoration: none;
- };
- }
- }
- .unfollow_icon {
- margin-right: 10px;
- margin-top: 4px;
- @include transition(opacity);
- opacity: 0.3;
- position: absolute;
- display: none;
- padding: 0 5px;
- &:hover {
- opacity: 1;
- }
- }
- .edit {
- margin-right: 10px;
- margin-top: 4px;
- width: 12px;
- height: 12px;
- margin-top: 6px;
- @include transition(opacity);
- opacity: 0.3;
- float: right;
- display: none;
- &:hover {
- opacity: 1;
- }
- }
- ul.sub_nav {
- padding: {
- left: 25px;
- };
- margin: 0;
- li {
- width: 204px;
- }
- }
-}
-
-.section {
- .left_nav {
- a.aspect_selector,
- a.home_selector {
- width: 150px;
- }
- ul.sub_nav {
- width: 140px;
- &:hover {
- width: auto;
- }
- a.aspect_selector {
- width: 112px;
- vertical-align: middle;
- display: inline-block;
- line-height: 25px;
- text: {
- decoration: none;
- };
- }
- a.tag_selector {
- width: 117px;
- overflow: hidden;
- position: relative;
- display: inline-block;
- &:after {
- display: inline-block;
- content: "";
- width: 80px;
- height: 25px;
- position: absolute;
- top: 0px;
- left: 100px;
- }
- &:hover:after {
- background: none;
- }
- }
- li {
- height: 25px;
- .icons-check_yes_ok {
- height: 18px;
- width: 18px;
- display: inline-block;
- margin-left: 3px;
- vertical-align: middle;
- }
- .icons-deletelabel {
- height: 14px;
- width: 14px;
- margin-top: 4px;
- }
- }
- li.unfollow,
- li.sub_nav_item {
- width: 172px;
- }
- li.unfollow:hover,
- li.sub_nav_item:hover,
- li.hover {
- border-radius: 2px;
- background: {
- color: lighten($blue, 45%);
- };
- .edit,
- .unfollow_icon {
- z-index: 1;
- display: inline-block;
- .icons-monotone_close_exit_delete {
- height: 16px;
- width: 16px;
- }
- }
- }
- }
- }
- .user_card {
- margin-left: 8px;
- }
-}
-
-.unread-setter {
- display: none;
-}
-
-.stream_container {
- min-height: 500px;
- h3 {
- margin: {
- bottom: 0;
- };
- }
- border: {
- left: 1px solid $border-grey;
- };
- padding: {
- left: 10px;
- top: 20px;
- };
- margin: {
- left: -10px;
- top: -20px;
- };
-}
-
-#aspect_stream_header {
- padding: 0 12px;
-}
-
-.new_aspect,
-a.toggle_selector {
- outline: none;
- color: $text-grey;
- font: {
- style: italic;
- };
- &:hover {
- color: $link-grey;
- }
-}
-
-#community_spotlight {
- .avatar {
- height: 140px;
- width: 140px;
- }
-}
-
-.user_card {
- border-radius: 3px;
- box-shadow: 0 1px 5px #cccccc;
- padding: 10px {
- bottom: 30px;
- };
- margin: {
- bottom: 15px;
- right: 10px;
- };
- position: relative;
- min-height: 220px;
- vertical-align: top;
- border: 1px solid #cccccc;
- display: inline-block;
- width: 140px;
- .tags {
- color: $text-grey;
- }
- h4 {
- margin: {
- bottom: 0;
- };
- padding: {
- bottom: 2px;
- };
- }
- .dropdown {
- width: 100%;
- }
-}
-
-.add_user_to_aspect {
- bottom: 12px;
- right: 5px;
- position: absolute;
-}
-
-#right_service_icons {
- text-align: center;
- padding: 10px {
- bottom: 0;
- };
- .social_media_logos-facebook-24x24,
- .social_media_logos-twitter-24x24,
- .social_media_logos-tumblr-24x24,
- .social_media_logos-wordpress-24x24,
- .social_media_logos-email-24x24,
- .social_media_logos-feed-24x24,
- .social_media_logos-website-24x24 {
- height: 24px;
- width: 24px;
- }
- a {
- display: inline-block;
- }
-}
-
-.action_item {
- padding-right: 5px;
-}
-
-.accept_invitation_form,
-.sign_up_form {
- min-height: 350px;
- font-size: 16px;
- input[type='text'],
- input[type='password'],
- input[type='email'] {
- font-size: 16px !important;
- width: 378px !important;
- }
- .diaspora_id_text {
- font-size: 12px;
- text-align: right;
- color: $text-grey;
- margin: {
- top: -8px;
- };
- padding: 0;
- }
- .submit_field {
- text-align: right;
- }
-}
-
-.accept_invitation_text {
- font: {
- weight: lighter;
- };
-}
-
-.red {
- color: $red;
-}
-
-.green {
- color: green;
-}
-
-.resend {
- color: black;
- &:hover {
- text-decoration: none;
- color: black;
- &:hover {
- text-decoration: none;
- }
- }
-}
-
-#grey_header {
- box-shadow: 0 1px 1px #eeeeee;
- background: {
- color: #fafafa;
- };
- width: 100%;
- position: absolute;
- left: 0;
- top: 0;
- padding: {
- top: 80px;
- bottom: 20px;
- };
- text: {
- align: center;
- };
- border: {
- bottom: 1px solid $border-grey;
- };
-}
-
-.mobile_row {
- margin: {
- bottom: 50px;
- };
-}
-
-.field_with_errors {
- position: relative;
- input {
- box-shadow: 0 0 8px lighten(#dd0000, 30%);
- border: 1px solid #dd0000 !important;
- }
-}
-
-.field_with_errors .message {
- color: #dd0000;
- font-size: 12px;
- position: absolute;
- top: 4px;
- right: 10px;
- left: auto;
-}
-
-.new_user_form fieldset, .accept_invitation_form fieldset {
- border-radius: 3px;
- background: {
- color: white;
- color: rgba(255, 255, 255, 0.95);
- };
- .submit_field {
- margin: {
- top: 15px;
- };
- }
- span.host_uri {
- float: right;
- margin-top: -28px;
- color: $text-grey;
- padding-right: 9px;
- }
-}
-
-.center {
- text-align: center;
-}
-
-.nostrap,
-.nostrap:focus {
- box-shadow: none;
-}
-
-#hello-there {
- p {
- font-size: medium;
- }
- h1 {
- margin: 0px;
- }
- h2 {
- margin: {
- top: 80px;
- bottom: 12px;
- };
- }
- h3 {
- font: {
- size: large;
- weight: 200;
- };
- margin: 0px;
- }
- form, p {
- margin-left: 30px;
- }
- input {
- margin-bottom: 15px;
- }
- .hero-unit {
- margin: 20px 42px;
- padding: 40px 80px;
- }
- .awesome {
- text-align: center;
- margin-top: 60px;
- .creation {
- font-size: 16px;
- }
- }
-}
-
-#profile_photo_upload {
- #fileInfo {
- margin-top: 12px;
- text-align: left;
- }
-}
-
-#welcome-to-diaspora {
- box-shadow: inset 0 -2px 10px rgba(0, 0, 0, 0.35);
- position: absolute;
- width: 100%;
- left: 0;
- top: 0;
- padding: {
- top: 50px;
- bottom: 10px;
- };
- h1,h3 {
- color: white;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- background: orange;
- &:hover {
- #gs-skip-x {
- opacity: 0.4;
- @include transition(opacity, 0.25s);
- &:hover {
- opacity: 1;
- }
- }
- }
-}
-
-#gs-shim {
- position: absolute;
- top: 380px;
-}
-
-#gs-skip-x {
- opacity: 0;
- @include transition(opacity, 0.25s);
- img {
- position: relative;
- right: 4px;
- height: 20px;
- }
-}
-
-.avatar.micro {
- height: 20px;
- width: 20px;
-}
-
-#gs-name-form-spinner {
- position: absolute;
- top: 24px;
- right: -33px;
-}
-
-.left_nav {
- #new_tag_following {
- width: 137px;
- margin: {
- left: 24px;
- };
- input[type='text'] {
- width: 137px;
- font: {
- size: 13px;
- };
- }
- }
- #tag_following_submit {
- &.hidden {
- display: none;
- }
- }
-}
-
-.nsfw-shield {
- border-radius: 3px;
- background-color: $background-grey;
- width: 90%;
- padding: 5px 10px;
- border: 1px solid $border-grey;
- color: $text-grey;
-}
-
-#back-to-top {
- display: block;
- color: white;
- position: fixed;
- z-index: 49;
- right: 20px;
- bottom: 20px;
- opacity: 0;
- font-size: 3em;
- padding: 0 11px 0 12px;
- border-radius: 10px;
- background-color: #aaaaaa;
- &:hover {
- opacity: 0.85 !important;
- }
- &.visible {
- opacity: 0.5;
- }
-}
-
-.float-right {
- float: right;
- margin-top: 5px;
-}
-
-.nsfw_off {
- font-size: smaller;
- color: $text-grey;
- a {
- color: $text-dark-grey;
- }
-}
-
-#fileInfo {
- font-size: small;
- text-align: right;
- margin: 5px 2px;
-}
-
-.post_preview_button {
- padding: 3px 9px 4px;
-}
-
-.post_preview {
- padding: {
- top: 5px;
- };
- border: {
- bottom: 3px solid #3f8fba !important;
- };
- background: {
- color: #e8f7ff;
- };
-}
-
-#location {
- border: 1px solid $border-dark-grey;
- height: 20px;
- #location_address {
- border: none;
- color: #aaaaaa;
- height: 10px;
- width: 430px;
- float: left;
- }
- a#hide_location {
- position: absolute;
- right: 22px;
- filter: alpha(opacity = 30);
- -moz-opacity: 0.3;
- -khtml-opacity: 0.3;
- opacity: 0.3;
- z-index: 5;
- }
- a#hide_location:hover {
- opacity: 1;
- cursor: pointer;
- }
-}
+/* statistics */
+@import 'new_styles/statistics'
diff --git a/app/assets/stylesheets/blueprint.css b/app/assets/stylesheets/blueprint.css
deleted file mode 100644
index 3f09fb9c3..000000000
--- a/app/assets/stylesheets/blueprint.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
-//= require vendor/blueprint/screen
-*/
\ No newline at end of file
diff --git a/app/assets/stylesheets/new-templates.scss b/app/assets/stylesheets/new-templates.scss
deleted file mode 100644
index 1c982d810..000000000
--- a/app/assets/stylesheets/new-templates.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-@import 'bootstrap-fix';
-
-@import 'perfect-scrollbar';
-
-@import "colors";
-@import 'mixins';
-@import 'new_styles/new_mixins';
-@import 'new_styles/variables';
-
-/* core */
-@import 'flash_messages';
-@import 'sprites';
-
-@import 'new_styles/base';
-@import 'new_styles/buttons';
-@import 'new_styles/interactions';
-@import 'new_styles/spinner';
-
-/* font overrides */
-@import 'new_styles/typography';
-
-/* login */
-@import 'new_styles/login';
-@import 'new_styles/registration';
-@import 'new_styles/landing';
-
-@import 'new_styles/forms';
-
-/* navs */
-@import 'new_styles/navs';
-
-/* profile and settings pages */
-@import 'new_styles/settings';
-
-/* new SPV */
-@import 'header';
-@import 'footer';
-@import 'bootstrap-headerfix';
-@import 'opengraph';
-@import 'single-post-view';
-@import 'new_styles/poll';
-
-/* conversations */
-@import 'conversations';
-@import 'facebox';
-
-/* publisher */
-@import 'publisher';
-@import 'aspects';
-
-/* bookmarklet */
-@import 'bookmarklet';
-
-/* notifications */
-@import 'notifications';
-
-/* help */
-@import 'help';
-
-/* getting started */
-@import 'getting-started';
-
-/* people */
-@import 'people';
-@import 'invitations';
-@import 'profile';
-
-/* stream */
-@import 'tag';
-@import 'stream-faces';
-@import 'stream';
-@import 'stream_element';
-@import 'comments';
-
-/* right bar */
-@import 'sidebar';
-
-/* contacts */
-@import 'contacts';
-@import 'leftnavbar';
-
-/* code */
-@import 'new_styles/code';
-
-/* statistics */
-@import 'new_styles/statistics'
diff --git a/app/assets/stylesheets/new_styles/_buttons.scss b/app/assets/stylesheets/new_styles/_buttons.scss
index bfc8b5300..732f98af3 100644
--- a/app/assets/stylesheets/new_styles/_buttons.scss
+++ b/app/assets/stylesheets/new_styles/_buttons.scss
@@ -29,29 +29,3 @@
}
.btn.delete { color: desaturate($red,10%); }
-
-// TODO remove this when everything has been ported to Bootstrap
-.button.creation {
- $button-border-color: #aaa;
- border-radius: 3px;
- box-shadow: 0 1px 1px #cfcfcf;
- @include transition(border);
- @include button-gradient($creation-blue);
- font: {
- size: 12px;
- }
- color: #fff;
- padding: 4px 9px;
- min-width: 90px;
- min-height: 10px;
- border: 1px solid darken($button-border-color,20%);
-
- cursor: pointer;
- white-space: nowrap;
-
- &:hover {
- @include button-gradient-hover($creation-blue);
- border: 1px solid darken($button-border-color,35%);
- text-decoration: none;
- }
- }
diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss
index 3e7d45b11..34964b3a7 100644
--- a/app/assets/stylesheets/new_styles/_registration.scss
+++ b/app/assets/stylesheets/new_styles/_registration.scss
@@ -84,4 +84,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/vendor/blueprint/AUTHORS.textile b/app/assets/stylesheets/vendor/blueprint/AUTHORS.textile
deleted file mode 100644
index d873e010a..000000000
--- a/app/assets/stylesheets/vendor/blueprint/AUTHORS.textile
+++ /dev/null
@@ -1,42 +0,0 @@
-h1. Blueprint CSS Framework Authors and Contributors
-
-Blueprint is based on the work of many talented people. It is
-through their good intentions we are allowed to use many of the
-techniques found in the framework.
-
-h2. Current Team
-
-Blueprint was realized and maintained through version 0.7.1 by
-"Olav Bjorkoy":http://bjorkoy.com who has sinced passed the torch
-to the current team. They are:
-
-Admins:
-* "Christian Montoya":http://christianmontoya.net
-* "Josh Clayton":http://jdclayton.com
-
-Contributors:
-* "Glenn Rempe":http://blog.rempe.us/
-* "Chris Eppstein":http://twitter.com/chriseppstein
-* "Sean K. Stewart":http://seankstewart.com/
-
-h2. Original CSS authors
-
-The first iteration of Blueprint was built upon many conventions
-and ideas that were developed by true CSS experts.
-
-The grid and typography is based on work by:
-* "Jeff Croft":http://jeffcroft.com
-* "Nathan Borror":http://www.playgroundblues.com
-* "Christian Metts":http://mintchaos.com
-* "Wilson Miner":http://www.wilsonminer.com
-
-The CSS reset is based on work by:
-* "Eric Meyer":http://www.meyerweb.com/eric
-
-The Fancy Type plugin is based on work by:
-* "Mark Boulton":http://www.markboulton.co.uk
-* "Typogrify":http://typogrify.googlecode.com
-
-(However, remember that these people are not involved with the
-framework, so please don't waste their or your time asking them
-for support.)
diff --git a/app/assets/stylesheets/vendor/blueprint/LICENSE.txt b/app/assets/stylesheets/vendor/blueprint/LICENSE.txt
deleted file mode 100644
index 13076fb5f..000000000
--- a/app/assets/stylesheets/vendor/blueprint/LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2007 - 2010 blueprintcss.org
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/app/assets/stylesheets/vendor/blueprint/ie.css b/app/assets/stylesheets/vendor/blueprint/ie.css
deleted file mode 100644
index 3dddda945..000000000
--- a/app/assets/stylesheets/vendor/blueprint/ie.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 0.9
- http://blueprintcss.org
-
- * Copyright (c) 2007-Present. See LICENSE for more info.
- * See README for instructions on how to use Blueprint.
- * For credits and origins, see AUTHORS.
- * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* ie.css */
-body {text-align:center;}
-.container {text-align:left;}
-* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
-* html legend {margin:0px -8px 16px 0;padding:0;}
-sup {vertical-align:text-top;}
-sub {vertical-align:text-bottom;}
-html>body p code {*white-space:normal;}
-hr {margin:-8px auto 11px;}
-img {-ms-interpolation-mode:bicubic;}
-.clearfix, .container {display:inline-block;}
-* html .clearfix, * html .container {height:1%;}
-fieldset {padding-top:0;}
-textarea {overflow:auto;}
-input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
-input.text:focus, input.title:focus {border-color:#666;}
-input.text, input.title, textarea, select {margin:0.5em 0;}
-input.checkbox, input.radio {position:relative;top:.25em;}
-form.inline div, form.inline p {vertical-align:middle;}
-form.inline label {position:relative;top:-0.25em;}
-form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
-button, input.button {position:relative;top:0.25em;}
\ No newline at end of file
diff --git a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/cross.png b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/cross.png
deleted file mode 100644
index 1514d51a3..000000000
Binary files a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/cross.png and /dev/null differ
diff --git a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/key.png b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/key.png
deleted file mode 100644
index a9d5e4f8c..000000000
Binary files a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/key.png and /dev/null differ
diff --git a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/tick.png b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/tick.png
deleted file mode 100644
index a9925a06a..000000000
Binary files a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/tick.png and /dev/null differ
diff --git a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/readme.txt b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/readme.txt
deleted file mode 100644
index aa9fe26ba..000000000
--- a/app/assets/stylesheets/vendor/blueprint/plugins/buttons/readme.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Buttons
-
-* Gives you great looking CSS buttons, for both and