CSS guidestyle

This commit is contained in:
augier 2015-11-20 14:26:57 +01:00 committed by Steffen van Bergerem
parent c9f87796cc
commit f1e8c57c26
4 changed files with 11 additions and 11 deletions

View file

@ -225,8 +225,8 @@ app.views.Publisher = Backbone.View.extend({
// creates the location
showLocation: function(){
if($("#location").length === 0){
$("#location_container").append("<div id=\"location\"></div>");
this.wrapperEl.addClass("with_location");
this.$(".location-container").append("<div id=\"location\"></div>");
this.wrapperEl.addClass("with-location");
this.view_locator = new app.views.Location();
}
},
@ -235,7 +235,7 @@ app.views.Publisher = Backbone.View.extend({
destroyLocation: function(){
if(this.view_locator){
this.view_locator.remove();
this.wrapperEl.removeClass("with_location");
this.wrapperEl.removeClass("with-location");
delete this.view_locator;
}
},

View file

@ -5,7 +5,7 @@
&.closed {
#button_container,
#location_container,
.location-container,
#hide_publisher,
#photodropzone_container,
.counter,
@ -118,13 +118,13 @@
}
}
&:not(.with_location) #location_container { display: none; }
&:not(.with-location) .location-container { display: none; }
&.with_location .loader {
&.with-location .loader {
height: 20px;
width: 20px;
}
&.with_location #location_container {
&.with-location .location-container {
height: 30px;
margin-bottom: 0;
border-top: 1px dashed $border-grey;
@ -230,7 +230,7 @@
display: none;
}
}
&.with_location #publisher-images {
&.with-location #publisher-images {
#hide_location { display: inline-block; }
#locator { display: none; }
}
@ -242,7 +242,7 @@
right: 10px;
bottom: -25px;
}
&.with_location .counter {
&.with-location .counter {
bottom: -62px;
}
.warning {

View file

@ -24,7 +24,7 @@
.container-fluid#photodropzone_container
%ul#photodropzone
#location_container.form-group{ style: "padding: 4px 6px;"}
.location-container.form-group{style: "padding: 4px 6px;"}
= hidden_field :location, :coords
#poll_creator_container
-# handlebars template

View file

@ -430,7 +430,7 @@ describe("app.views.Publisher", function() {
it("Show location", function(){
// inserts location to the DOM; it is the location's view element
setFixtures('<div id="location_container"></div>');
setFixtures('<div class="location-container"></div>');
// creates a fake Locator
OSM = {};