"
);
}
},
@@ -93,58 +93,58 @@ app.views.PublisherUploader = Backbone.View.extend({
var publisher = this.publisher;
// add form input element
- publisher.$('.content_creation form').append(
- ''
+ publisher.$(".content_creation form").append(
+ ""
);
// replace placeholder
- var placeholder = publisher.el_photozone.find('li.loading').first();
+ var placeholder = publisher.photozoneEl.find("li.loading").first();
placeholder
- .removeClass('loading')
+ .removeClass("loading")
.prepend(
- ''+
- ''
+ ""+
+ ""
)
- .find('img').attr({'src': url, 'data-id': id}).removeClass('ajax-loader');
+ .find("img").attr({"src": url, "data-id": id}).removeClass("ajax-loader");
placeholder
- .find('div.progress').remove();
+ .find("div.progress").remove();
// no more placeholders? enable buttons
- if( publisher.el_photozone.find('li.loading').length === 0 ) {
- this.$el.removeClass('loading');
+ if( publisher.photozoneEl.find("li.loading").length === 0 ) {
+ this.$el.removeClass("loading");
publisher.setButtonsEnabled(true);
}
},
_cancelPhotoUpload: function() {
var publisher = this.publisher;
- var placeholder = publisher.el_photozone.find('li.loading').first();
+ var placeholder = publisher.photozoneEl.find("li.loading").first();
placeholder
- .removeClass('loading')
- .find('img').remove();
+ .removeClass("loading")
+ .find("img").remove();
},
// remove an already uploaded photo
_removePhoto: function(evt) {
var self = this;
- var photo = $(evt.target).parents('.publisher_photo');
- var img = photo.find('img');
+ var photo = $(evt.target).parents(".publisher_photo");
+ var img = photo.find("img");
- photo.addClass('dim');
+ photo.addClass("dim");
$.ajax({
- url: '/photos/'+img.attr('data-id'),
- dataType: 'json',
- type: 'DELETE',
+ url: "/photos/"+img.attr("data-id"),
+ dataType: "json",
+ type: "DELETE",
success: function() {
$.when(photo.fadeOut(400)).then(function(){
photo.remove();
- if( self.publisher.$('.publisher_photo').length === 0 ) {
+ if( self.publisher.$(".publisher_photo").length === 0 ) {
// no more photos left...
- self.publisher.el_wrapper.removeClass('with_attachments');
+ self.publisher.wrapperEl.removeClass("with_attachments");
}
- self.trigger('change');
+ self.trigger("change");
});
}
});
diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js
index fece5dd08..d4ef03085 100644
--- a/app/assets/javascripts/app/views/publisher_view.js
+++ b/app/assets/javascripts/app/views/publisher_view.js
@@ -34,29 +34,29 @@ app.views.Publisher = Backbone.View.extend({
this.disabled = false;
// init shortcut references to the various elements
- this.el_input = this.$('#status_message_fake_text');
- this.el_hiddenInput = this.$('#status_message_text');
- this.el_wrapper = this.$('#publisher_textarea_wrapper');
- this.el_submit = this.$('input[type=submit], button#submit');
- this.el_preview = this.$('button.post_preview_button');
- this.el_photozone = this.$('#photodropzone');
+ this.inputEl = this.$("#status_message_fake_text");
+ this.hiddenInputEl = this.$("#status_message_text");
+ this.wrapperEl = this.$("#publisher_textarea_wrapper");
+ this.submitEl = this.$("input[type=submit], button#submit");
+ this.previewEl = this.$("button.post_preview_button");
+ this.photozoneEl = this.$("#photodropzone");
// init mentions plugin
- Mentions.initialize(this.el_input);
+ Mentions.initialize(this.inputEl);
// init autoresize plugin
- this.el_input.autoResize({ 'extraSpace' : 10, 'maxHeight' : Infinity });
+ this.inputEl.autoResize({ "extraSpace" : 10, "maxHeight" : Infinity });
// if there is data in the publisher we ask for a confirmation
// before the user is able to leave the page
- $(window).on('beforeunload', _.bind(this._beforeUnload, this));
+ $(window).on("beforeunload", _.bind(this._beforeUnload, this));
// sync textarea content
- if( this.el_hiddenInput.val() === "" ) {
- this.el_hiddenInput.val( this.el_input.val() );
+ if( this.hiddenInputEl.val() === "" ) {
+ this.hiddenInputEl.val( this.inputEl.val() );
}
- if( this.el_input.val() === "" ) {
- this.el_input.val( this.el_hiddenInput.val() );
+ if( this.inputEl.val() === "" ) {
+ this.inputEl.val( this.hiddenInputEl.val() );
}
// hide close and preview buttons and manage services link
@@ -64,37 +64,37 @@ app.views.Publisher = Backbone.View.extend({
// (e.g. bookmarklet, mentions popup)
if( this.standalone ) {
this.$("#hide_publisher").hide();
- this.el_preview.hide();
+ this.previewEl.hide();
this.$(".question_mark").hide();
}
// this has to be here, otherwise for some reason the callback for the
// textchange event won't be called in Backbone...
- this.el_input.bind('textchange', $.noop);
+ this.inputEl.bind("textchange", $.noop);
var _this = this;
- $('body').on('click', function(event){
+ $("body").on("click", function(event){
// if the click event is happened outside the publisher view, then try to close the box
- if( _this.el && $(event.target).closest('#publisher').attr('id') !== _this.el.id){
+ if( _this.el && $(event.target).closest("#publisher").attr("id") !== _this.el.id){
_this.tryClose();
}
});
// close publisher on post
- this.on('publisher:add', function() {
+ this.on("publisher:add", function() {
this.close();
this.showSpinner(true);
});
// open publisher on post error
- this.on('publisher:error', function() {
+ this.on("publisher:error", function() {
this.open();
this.showSpinner(false);
});
// resetting the poll view
- this.on('publisher:sync', function() {
- this.view_poll_creator.render();
+ this.on("publisher:sync", function() {
+ this.viewPollCreator.render();
});
this.initSubviews();
@@ -103,56 +103,56 @@ app.views.Publisher = Backbone.View.extend({
},
initSubviews: function() {
- var form = this.$('.content_creation form');
+ var form = this.$(".content_creation form");
this.view_services = new app.views.PublisherServices({
- el: this.$('#publisher_service_icons'),
- input: this.el_input,
+ el: this.$("#publisher_service_icons"),
+ input: this.inputEl,
form: form
});
- this.view_aspect_selector = new app.views.PublisherAspectSelector({
- el: this.$('.public_toggle .aspect_dropdown'),
+ this.viewAspectSelector = new app.views.PublisherAspectSelector({
+ el: this.$(".public_toggle .aspect_dropdown"),
form: form
});
- this.view_getting_started = new app.views.PublisherGettingStarted({
- el_first_msg: this.el_input,
- el_visibility: this.$('.public_toggle .aspect_dropdown > .dropdown-toggle'),
- el_stream: $('#gs-shim')
+ this.viewGettingStarted = new app.views.PublisherGettingStarted({
+ firstMessageEl: this.inputEl,
+ visibilityEl: this.$(".public_toggle .aspect_dropdown > .dropdown-toggle"),
+ streamEl: $("#gs-shim")
});
- this.view_uploader = new app.views.PublisherUploader({
- el: this.$('#file-upload'),
+ this.viewUploader = new app.views.PublisherUploader({
+ el: this.$("#file-upload"),
publisher: this
});
- this.view_uploader.on('change', this.checkSubmitAvailability, this);
+ this.viewUploader.on("change", this.checkSubmitAvailability, this);
- this.view_poll_creator = new app.views.PublisherPollCreator({
- el: this.$('#poll_creator_container')
+ this.viewPollCreator = new app.views.PublisherPollCreator({
+ el: this.$("#poll_creator_container")
});
- this.view_poll_creator.on('change', this.checkSubmitAvailability, this);
- this.view_poll_creator.render();
+ this.viewPollCreator.on("change", this.checkSubmitAvailability, this);
+ this.viewPollCreator.render();
},
// set the selected aspects in the dropdown by their ids
setSelectedAspects: function(ids) {
- this.view_aspect_selector.updateAspectsSelector(ids);
+ this.viewAspectSelector.updateAspectsSelector(ids);
},
// inject content into the publisher textarea
setText: function(txt) {
- this.el_input.val(txt);
- this.el_hiddenInput.val(txt);
+ this.inputEl.val(txt);
+ this.hiddenInputEl.val(txt);
this.prefillText = txt;
- this.el_input.trigger('input');
+ this.inputEl.trigger("input");
this.handleTextchange();
},
// show the "getting started" popups around the publisher
triggerGettingStarted: function() {
- this.view_getting_started.show();
+ this.viewGettingStarted.show();
},
createStatusMessage : function(evt) {
@@ -164,7 +164,7 @@ app.views.Publisher = Backbone.View.extend({
// Auto-adding a poll answer always leaves an empty box when the user starts
// typing in the last box. We'll delete the last one to avoid submitting an
// empty poll answer and failing validation.
- this.view_poll_creator.removeLastAnswer();
+ this.viewPollCreator.removeLastAnswer();
//add missing mentions at end of post:
this.handleTextchange();
@@ -175,7 +175,9 @@ app.views.Publisher = Backbone.View.extend({
// lulz this code should be killed.
var statusMessage = new app.models.Post();
- if( app.publisher ) app.publisher.trigger('publisher:add');
+ if( app.publisher ) {
+ app.publisher.trigger("publisher:add");
+ }
statusMessage.save({
"status_message" : {
@@ -192,9 +194,9 @@ app.views.Publisher = Backbone.View.extend({
url : "/status_messages",
success : function() {
if( app.publisher ) {
- app.publisher.$el.trigger('ajax:success');
- app.publisher.trigger('publisher:sync');
- self.view_poll_creator.trigger('publisher:sync');
+ app.publisher.$el.trigger("ajax:success");
+ app.publisher.trigger("publisher:sync");
+ self.viewPollCreator.trigger("publisher:sync");
}
if(app.stream && !self.standalone){
@@ -208,9 +210,11 @@ app.views.Publisher = Backbone.View.extend({
if( self.standalone ) self.setEnabled(false);
},
error: function(model, resp) {
- if( app.publisher ) app.publisher.trigger('publisher:error');
+ if( app.publisher ) {
+ app.publisher.trigger("publisher:error");
+ }
self.setInputEnabled(true);
- Diaspora.page.flashMessages.render({ 'success':false, 'notice':resp.responseText });
+ Diaspora.page.flashMessages.render({ "success":false, "notice":resp.responseText });
self.setButtonsEnabled(true);
self.setInputEnabled(true);
}
@@ -219,9 +223,9 @@ app.views.Publisher = Backbone.View.extend({
// creates the location
showLocation: function(){
- if($('#location').length === 0){
- $('#location_container').append('');
- this.el_wrapper.addClass('with_location');
+ if($("#location").length === 0){
+ $("#location_container").append("");
+ this.wrapperEl.addClass("with_location");
this.view_locator = new app.views.Location();
}
},
@@ -230,14 +234,14 @@ app.views.Publisher = Backbone.View.extend({
destroyLocation: function(){
if(this.view_locator){
this.view_locator.remove();
- this.el_wrapper.removeClass('with_location');
+ this.wrapperEl.removeClass("with_location");
delete this.view_locator;
}
},
togglePollCreator: function(){
- this.view_poll_creator.$el.toggle();
- this.el_input.focus();
+ this.viewPollCreator.$el.toggle();
+ this.inputEl.focus();
},
// avoid submitting form when pressing Enter key
@@ -255,8 +259,8 @@ app.views.Publisher = Backbone.View.extend({
var serializedForm = $(evt.target).closest("form").serializeObject();
var photos = [];
- $('li.publisher_photo img').each(function(){
- var file = $(this).attr('src').substring("/uploads/images/".length);
+ $("li.publisher_photo img").each(function(){
+ var file = $(this).attr("src").substring("/uploads/images/".length);
photos.push(
{
"sizes":{
@@ -295,18 +299,20 @@ app.views.Publisher = Backbone.View.extend({
var date = (new Date()).toISOString();
var poll;
- var poll_question = serializedForm["poll_question"];
- var poll_answers_arry = _.flatten([serializedForm["poll_answers[]"]]);
- var poll_answers = _.map(poll_answers_arry, function(answer){
- if(answer) return { 'answer' : answer };
+ var pollQuestion = serializedForm.poll_question;
+ var pollAnswersArray = _.flatten([serializedForm["poll_answers[]"]]);
+ var pollAnswers = _.map(pollAnswersArray, function(answer){
+ if (answer) {
+ return { "answer" : answer };
+ }
});
- poll_answers = _.without(poll_answers, undefined);
+ pollAnswers = _.without(pollAnswers, undefined);
- if(poll_question && poll_answers.length) {
+ if(pollQuestion && pollAnswers.length) {
poll = {
- 'question': poll_question,
- 'poll_answers' : poll_answers,
- 'participation_count': '0'
+ "question": pollQuestion,
+ "poll_answers" : pollAnswers,
+ "participation_count": "0"
};
}
@@ -324,30 +330,30 @@ app.views.Publisher = Backbone.View.extend({
"title" : serializedForm["status_message[text]"],
"address" : $("#location_address").val(),
"interactions" : {"likes":[],"reshares":[],"comments_count":0,"likes_count":0,"reshares_count":0},
- 'poll': poll,
+ "poll": poll
};
if(app.stream) {
this.removePostPreview();
app.stream.addNow(previewMessage);
this.recentPreview=previewMessage;
- this.modifyPostPreview($('.stream_element:first',$('.stream_container')));
+ this.modifyPostPreview($(".stream_element:first",$(".stream_container")));
}
},
modifyPostPreview : function(post) {
- post.addClass('post_preview');
- $('.collapsible',post).removeClass('collapsed').addClass('opened');
- $('a.delete.remove_post',post).hide();
- $('a.like, a.focus_comment_textarea',post).removeAttr("href");
- $('a.like',post).addClass("like_preview");
- $('a.like',post).removeClass("like");
- $('a.focus_comment_textarea',post).addClass("focus_comment_textarea_preview");
- $('a.focus_comment_textarea',post).removeClass("focus_comment_textarea");
- $('a',$('span.details.grey',post)).removeAttr("href");
+ post.addClass("post_preview");
+ $(".collapsible",post).removeClass("collapsed").addClass("opened");
+ $("a.delete.remove_post",post).hide();
+ $("a.like, a.focus_comment_textarea",post).removeAttr("href");
+ $("a.like",post).addClass("like_preview");
+ $("a.like",post).removeClass("like");
+ $("a.focus_comment_textarea",post).addClass("focus_comment_textarea_preview");
+ $("a.focus_comment_textarea",post).removeClass("focus_comment_textarea");
+ $("a",$("span.details.grey",post)).removeAttr("href");
},
removePostPreview : function() {
- if(app.stream && this.recentPreview){
+ if(app.stream && this.recentPreview) {
app.stream.items.remove(this.recentPreview);
delete this.recentPreview;
}
@@ -363,21 +369,21 @@ app.views.Publisher = Backbone.View.extend({
clear : function() {
// clear text(s)
- this.el_input.val('');
- this.el_hiddenInput.val('');
- this.el_input.trigger('keyup')
- .trigger('keydown');
+ this.inputEl.val("");
+ this.hiddenInputEl.val("");
+ this.inputEl.trigger("keyup")
+ .trigger("keydown");
// remove mentions
- this.el_input.mentionsInput('reset');
+ this.inputEl.mentionsInput("reset");
// remove photos
- this.el_photozone.find('li').remove();
+ this.photozoneEl.find("li").remove();
this.$("input[name='photos[]']").remove();
- this.el_wrapper.removeClass("with_attachments");
+ this.wrapperEl.removeClass("with_attachments");
// empty upload-photo
- this.$('#fileInfo').empty();
+ this.$("#fileInfo").empty();
// close publishing area (CSS)
this.close();
@@ -401,11 +407,11 @@ app.views.Publisher = Backbone.View.extend({
this.destroyLocation();
// clear poll form
- this.view_poll_creator.clearInputs();
+ this.viewPollCreator.clearInputs();
// force textchange plugin to update lastValue
- this.el_input.data('lastValue', '');
- this.el_hiddenInput.data('lastValue', '');
+ this.inputEl.data("lastValue", "");
+ this.hiddenInputEl.data("lastValue", "");
return this;
},
@@ -421,8 +427,8 @@ app.views.Publisher = Backbone.View.extend({
if( this.disabled ) return;
// visually 'open' the publisher
- this.$el.removeClass('closed');
- this.el_wrapper.addClass('active');
+ this.$el.removeClass("closed");
+ this.wrapperEl.addClass("active");
// fetch contacts for mentioning
Mentions.fetchContacts();
@@ -431,17 +437,19 @@ app.views.Publisher = Backbone.View.extend({
close : function() {
$(this.el).addClass("closed");
- this.el_wrapper.removeClass("active");
- this.el_input.css('height', '');
- this.view_poll_creator.$el.hide();
+ this.wrapperEl.removeClass("active");
+ this.inputEl.css("height", "");
+ this.viewPollCreator.$el.hide();
return this;
},
showSpinner: function(bool) {
- if (bool)
- this.$('#publisher_spinner').removeClass('hidden');
- else
- this.$('#publisher_spinner').addClass('hidden');
+ if (bool) {
+ this.$("#publisher_spinner").removeClass("hidden");
+ }
+ else {
+ this.$("#publisher_spinner").addClass("hidden");
+ }
},
checkSubmitAvailability: function() {
@@ -461,29 +469,29 @@ app.views.Publisher = Backbone.View.extend({
setButtonsEnabled: function(bool) {
if (bool) {
- this.el_submit.removeProp('disabled');
- this.el_preview.removeProp('disabled');
+ this.submitEl.removeProp("disabled");
+ this.previewEl.removeProp("disabled");
} else {
- this.el_submit.prop('disabled', true);
- this.el_preview.prop('disabled', true);
+ this.submitEl.prop("disabled", true);
+ this.previewEl.prop("disabled", true);
}
},
setInputEnabled: function(bool) {
if (bool) {
- this.el_input.removeProp('disabled');
- this.el_hiddenInput.removeProp('disabled');
+ this.inputEl.removeProp("disabled");
+ this.hiddenInputEl.removeProp("disabled");
} else {
- this.el_input.prop('disabled', true);
- this.el_hiddenInput.prop('disabled', true);
+ this.inputEl.prop("disabled", true);
+ this.hiddenInputEl.prop("disabled", true);
}
},
// determine submit availability
_submittable: function() {
- var onlyWhitespaces = ($.trim(this.el_input.val()) === ''),
- isPhotoAttached = (this.el_photozone.children().length > 0),
- isValidPoll = this.view_poll_creator.validatePoll();
+ var onlyWhitespaces = ($.trim(this.inputEl.val()) === ""),
+ isPhotoAttached = (this.photozoneEl.children().length > 0),
+ isValidPoll = this.viewPollCreator.validatePoll();
return (!onlyWhitespaces || isPhotoAttached) && isValidPoll && !this.disabled;
},
@@ -492,13 +500,13 @@ app.views.Publisher = Backbone.View.extend({
var self = this;
this.checkSubmitAvailability();
- this.el_input.mentionsInput("val", function(value){
- self.el_hiddenInput.val(value);
+ this.inputEl.mentionsInput("val", function(value){
+ self.hiddenInputEl.val(value);
});
},
_beforeUnload: function(e) {
- if(this._submittable() && this.el_input.val() !== this.prefillText){
+ if(this._submittable() && this.inputEl.val() !== this.prefillText){
var confirmationMessage = Diaspora.I18n.t("confirm_unload");
(e || window.event).returnValue = confirmationMessage; //Gecko + IE
return confirmationMessage; //Webkit, Safari, Chrome, etc.
@@ -516,9 +524,9 @@ $.fn.serializeObject = function()
if (!o[this.name].push) {
o[this.name] = [o[this.name]];
}
- o[this.name].push(this.value || '');
+ o[this.name].push(this.value || "");
} else {
- o[this.name] = this.value || '';
+ o[this.name] = this.value || "";
}
});
return o;
diff --git a/app/assets/javascripts/app/views/tag_following_action_view.js b/app/assets/javascripts/app/views/tag_following_action_view.js
index 37d95ff2a..e62754c0c 100644
--- a/app/assets/javascripts/app/views/tag_following_action_view.js
+++ b/app/assets/javascripts/app/views/tag_following_action_view.js
@@ -43,12 +43,12 @@ app.views.TagFollowingAction = app.views.Base.extend({
},
mouseIn : function(){
- this.$("input").removeClass("green").addClass("btn-danger");
+ this.$("input").removeClass("btn-success").addClass("btn-danger");
this.$("input").val( Diaspora.I18n.t('stream.tags.stop_following', {tag: this.model.attributes.name} ) );
},
mouseOut : function() {
- this.$("input").removeClass("btn-danger").addClass("green");
+ this.$("input").removeClass("btn-danger").addClass("btn-success");
this.$("input").val( Diaspora.I18n.t('stream.tags.following', {"tag" : this.model.attributes.name} ) );
},
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 58f9db688..deaf9217a 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -45,8 +45,5 @@
//= require view
//= require aspects-dropdown
//= require mentions
-//= require bootstrap-tooltip
-//= require bootstrap-popover
-//= require bootstrap-dropdown
-//= require bootstrap-modal
+//= require bootstrap
//= require osmlocator
diff --git a/app/assets/javascripts/view.js b/app/assets/javascripts/view.js
index 508da666d..32c14d325 100644
--- a/app/assets/javascripts/view.js
+++ b/app/assets/javascripts/view.js
@@ -37,6 +37,7 @@ var View = {
Diaspora.page.directionDetector.updateBinds();
});
+
$("a.new_aspect").click(function(){
$("input#aspect_name").focus();
});
diff --git a/app/assets/javascripts/widgets/infinite-scroll.js b/app/assets/javascripts/widgets/infinite-scroll.js
index d3fa5be01..4e0c745b9 100644
--- a/app/assets/javascripts/widgets/infinite-scroll.js
+++ b/app/assets/javascripts/widgets/infinite-scroll.js
@@ -13,7 +13,7 @@
debug: false,
donetext: Diaspora.I18n.t("infinite_scroll.no_more"),
loadingText: "",
- loadingImg: ImagePaths.get("ajax-loader.gif"),
+ loadingImg: ImagePaths.get("ajax-loader2.gif"),
navSelector: "#pagination",
nextSelector: ".paginate",
itemSelector: ".stream_element",
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 2084f5e3d..f8caef389 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -40,12 +40,20 @@ body > div.container {
height: 50px;
}
- .actions li {
- margin-top: .3em;
- }
+ .actions{ width: 150px; }
+
+ .pull-right .label{ display: inline-block; }
+ }
+}
+
+/** Invites panel **/
+.more_invites{
+ #add-invites-section{
+ line-height: 34px;
+ margin-bottom: 15px;
}
}
/** reported posts **/
-@import 'report'
+@import 'report';
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 3638522c2..abff7dda9 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,9 +1,10 @@
-@import 'bootstrap-fix';
+/* variables */
+@import 'bootstrap-variables'; // our overwrites
+@import 'bootstrap/variables'; // the original bootstrap ones
@import 'perfect-scrollbar';
@import "colors";
-@import 'sizes';
@import 'mixins';
/* core */
@@ -16,7 +17,6 @@
@import 'sprites';
@import 'hovercard';
@import 'new_styles/base';
-@import 'new_styles/buttons';
@import 'new_styles/interactions';
@import 'new_styles/spinner';
@import 'lightbox';
@@ -31,8 +31,8 @@
@import 'new_styles/registration';
@import 'new_styles/forms';
-/* navs */
-@import 'new_styles/navs';
+/* terms */
+@import 'terms';
/* profile and settings pages */
@import 'new_styles/settings';
diff --git a/app/assets/stylesheets/aspects.scss b/app/assets/stylesheets/aspects.scss
index 3c9b1ac22..1295f6cb5 100644
--- a/app/assets/stylesheets/aspects.scss
+++ b/app/assets/stylesheets/aspects.scss
@@ -6,17 +6,17 @@
height: 14px;
display: inline-block;
}
- .icon-ok, .icon-refresh {
+ .glyphicon-ok, .icon-refresh {
padding-right: 5px;
display: none;
}
&.selected {
- .icon-ok { display: inline-block;}
+ .glyphicon-ok { display: inline-block;}
.icon-refresh { display: none;}
}
&.loading {
.icon-refresh { display: inline-block;}
- .icon-ok { display: none;}
+ .glyphicon-ok { display: none;}
}
a {
.text {
diff --git a/app/assets/stylesheets/autocomplete.scss b/app/assets/stylesheets/autocomplete.scss
index c23205248..4f3394ae6 100644
--- a/app/assets/stylesheets/autocomplete.scss
+++ b/app/assets/stylesheets/autocomplete.scss
@@ -26,7 +26,7 @@
}
cursor: default;
display: block;
- height: 37px;
+ height: 45px;
position: relative;
// if width will be 100% horizontal scrollbar will apear
// when scroll mode will be used
@@ -42,7 +42,7 @@
}
.ac_loading {
- background: white image-url('ajax-loader.gif') right center no-repeat;
+ background: white image-url('ajax-loader2.gif') right center no-repeat;
}
.ac_odd {
diff --git a/app/assets/stylesheets/bootstrap-complete.scss b/app/assets/stylesheets/bootstrap-complete.scss
index 7e36e3854..8f57874aa 100644
--- a/app/assets/stylesheets/bootstrap-complete.scss
+++ b/app/assets/stylesheets/bootstrap-complete.scss
@@ -1,9 +1,4 @@
// Calling this file bootstrap would cause an infinite recursion during asset compilation.
-@import 'bootstrap';
-@import 'bootstrap-responsive';
-
-
-// according to the docs, this is part of bootstrap 2.3.x
-.text-left { text-align: left; }
-.text-center { text-align: center; }
-.text-right { text-align: right; }
+@import "bootstrap-sprockets";
+@import "bootstrap-variables";
+@import "bootstrap";
diff --git a/app/assets/stylesheets/bootstrap-fix.scss b/app/assets/stylesheets/bootstrap-fix.scss
deleted file mode 100644
index 47b6c0c4d..000000000
--- a/app/assets/stylesheets/bootstrap-fix.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-// A temporary fix for broken classes in bootstrap 2.
-// Can probably be removed when migration of bootstrap 3 is done.
-
-input::placeholder,
-textarea::placeholder {
- color: #999999;
-}
-input::input-placeholder,
-textarea::input-placeholder {
- color: #999999;
-}
-
-
-// A temporary fix for mention modal #5329
-
-#new_status_message_pane .modal {
- position: absolute;
- max-height: none;
-}
-
-#new_status_message_pane .modal-body{
- overflow-y: visible;
- max-height: none;
-}
diff --git a/app/assets/stylesheets/bootstrap-headerfix.scss b/app/assets/stylesheets/bootstrap-headerfix.scss
index 53f4919dc..792b44c6c 100644
--- a/app/assets/stylesheets/bootstrap-headerfix.scss
+++ b/app/assets/stylesheets/bootstrap-headerfix.scss
@@ -26,8 +26,8 @@ header {
}
#global_search {
form {
+ top: -3px;
input {
- height: 15px;
color: black;
}
}
diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss
new file mode 100644
index 000000000..599a7303a
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap-variables.scss
@@ -0,0 +1,867 @@
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.4):
+
+//
+// Variables
+// --------------------------------------------------
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+// $gray-base: #000
+// $gray-darker: lighten($gray-base, 13.5%) // #222
+// $gray-dark: lighten($gray-base, 20%) // #333
+// $gray: lighten($gray-base, 33.5%) // #555
+// $gray-light: lighten($gray-base, 46.7%) // #777
+// $gray-lighter: lighten($gray-base, 93.5%) // #eee
+
+$brand-primary: darken(#0097FF,5%); // darker creation-blue
+$brand-success: #8EDE3D;
+// $brand-info: #5bc0de
+// $brand-warning: #f0ad4e
+// $brand-danger: #d9534f
+
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for ``.
+// $body-bg: #fff
+//** Global text color on ``.
+// $text-color: $gray-dark
+
+//** Global textual link color.
+$link-color: rgb(42,156,235);
+//** Link hover color set via `darken()` function.
+// $link-hover-color: darken($link-color, 15%)
+//** Link hover decoration.
+// $link-hover-decoration: underline
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif
+// $font-family-serif: Georgia, "Times New Roman", Times, serif
+//** Default monospace fonts for ``, ``, and `
`.
+// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace
+// $font-family-base: $font-family-sans-serif
+
+$font-size-base: 13px;
+// $font-size-large: ceil(($font-size-base * 1.25)) // ~18px
+$font-size-small: 11px;
+
+// $font-size-h1: floor(($font-size-base * 2.6)) // ~36px
+// $font-size-h2: floor(($font-size-base * 2.15)) // ~30px
+// $font-size-h3: ceil(($font-size-base * 1.7)) // ~24px
+// $font-size-h4: ceil(($font-size-base * 1.25)) // ~18px
+// $font-size-h5: $font-size-base
+// $font-size-h6: ceil(($font-size-base * 0.85)) // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+// $line-height-base: 1.428571429 // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+// $line-height-computed: floor(($font-size-base * $line-height-base)) // ~20px
+
+//** By default, this inherits from the ``.
+// $headings-font-family: inherit
+// $headings-font-weight: 500
+// $headings-line-height: 1.1
+// $headings-color: inherit
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+
+// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
+// $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/")
+
+//** File name for all font files.
+// $icon-font-name: "glyphicons-halflings-regular"
+//** Element ID within SVG icon file.
+// $icon-font-svg-id: "glyphicons_halflingsregular"
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+// $padding-base-vertical: 6px
+// $padding-base-horizontal: 12px
+
+// $padding-large-vertical: 10px
+// $padding-large-horizontal: 16px
+
+// $padding-small-vertical: 5px
+// $padding-small-horizontal: 10px
+
+// $padding-xs-vertical: 1px
+// $padding-xs-horizontal: 5px
+
+// $line-height-large: 1.3333333 // extra decimals for Win 8.1 Chrome
+// $line-height-small: 1.5
+
+// $border-radius-base: 4px
+// $border-radius-large: 6px
+// $border-radius-small: 3px
+
+//** Global color for active items (e.g., navs or dropdowns).
+// $component-active-color: #fff
+//** Global background color for active items (e.g., navs or dropdowns).
+// $component-active-bg: $brand-primary
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+// $caret-width-base: 4px
+//** Carets increase slightly in size for larger components.
+// $caret-width-large: 5px
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `
`s and `
`s.
+// $table-cell-padding: 8px
+//** Padding for cells in `.table-condensed`.
+// $table-condensed-cell-padding: 5px
+
+//** Default background color used for all tables.
+// $table-bg: transparent
+//** Background color used for `.table-striped`.
+// $table-bg-accent: #f9f9f9
+//** Background color used for `.table-hover`.
+// $table-bg-hover: #f5f5f5
+// $table-bg-active: $table-bg-hover
+
+//** Border color for table and cell borders.
+// $table-border-color: #ddd
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+// $btn-font-weight: normal
+
+// $btn-default-color: #333
+// $btn-default-bg: #fff
+// $btn-default-border: #ccc
+
+// $btn-primary-color: #fff
+// $btn-primary-bg: $brand-primary
+// $btn-primary-border: darken($btn-primary-bg, 5%)
+
+$btn-success-color: #333;
+// $btn-success-bg: $brand-success
+// $btn-success-border: darken($btn-success-bg, 5%)
+
+// $btn-info-color: #fff
+// $btn-info-bg: $brand-info
+// $btn-info-border: darken($btn-info-bg, 5%)
+
+// $btn-warning-color: #fff
+// $btn-warning-bg: $brand-warning
+// $btn-warning-border: darken($btn-warning-bg, 5%)
+
+// $btn-danger-color: #fff
+// $btn-danger-bg: $brand-danger
+// $btn-danger-border: darken($btn-danger-bg, 5%)
+
+// $btn-link-disabled-color: $gray-light
+
+
+//== Forms
+//
+//##
+
+//** `` background color
+// $input-bg: #fff
+//** `` background color
+// $input-bg-disabled: $gray-lighter
+
+//** Text color for ``s
+// $input-color: $gray
+//** `` border color
+// $input-border: #ccc
+
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `
+')
'+
- '+')
');
+ $("![\"\"](\"\"+Handlebars.helpers.imageUrl(\"ajax-loader2.gif\")+\"\")
"+
+ "