Skip to content

Commit

Permalink
Include css from vendor
Browse files Browse the repository at this point in the history
  • Loading branch information
ValeriaLeshchenko committed Oct 14, 2014
1 parent c15af8f commit 82ec871
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 42 deletions.
22 changes: 1 addition & 21 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,5 @@ var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

var app = new EmberAddon();

// Use `app.import` to add additional libraries to the generated
// output files.
//
// If you need to use different assets in different
// environments, specify an object as the first parameter. That
// object's keys should be the environment name and the values
// should be the asset to use in that environment.
//
// If the library that you are including contains AMD or ES6
// modules that you would like to import into your application
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.
module.exports = app.toTree();

// module.exports = app.toTree();

var compileSass = require('broccoli-sass');
var mapCss = compileSass(['app/styles'], 'map.scss', 'assets/vendor.css');
//
//
// // Merge the bootstrapFonts with the ember app tree
var mergeTrees = require('broccoli-merge-trees');
module.exports = mergeTrees([app.toTree(),mapCss], { overwrite: true });
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Ember Map provides you with google-map and yandex-map components.
Version
----

0.1.3
0.1.4

Add Maps Libraries
--------------
Expand Down
5 changes: 0 additions & 5 deletions config/environment.js

This file was deleted.

7 changes: 6 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
module.exports = {
name: 'ember-cli-map'
name: 'ember-cli-map',

included: function(app) {
this.app = app;
app.import('vendor/map.css')
}
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli-map",
"version": "0.1.3",
"version": "0.1.4",
"directories": {
"doc": "doc",
"test": "tests"
Expand All @@ -20,7 +20,7 @@
"body-parser": "^1.2.0",
"broccoli-asset-rev": "0.3.0",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"ember-cli": "git://github.com/OpakAlex/ember-cli.git",
"ember-cli": "0.0.44",
"ember-cli-content-security-policy": "0.2.0",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.2.2",
Expand Down
24 changes: 12 additions & 12 deletions app/styles/map.scss → vendor/map.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
.map {
height: 400px;
margin-left: 10%;
width: 81%;
margin-top: 0.6em;
img {
height: 400px;
margin-left: 10%;
width: 81%;
margin-top: 0.6em;
}
.map img {
max-width: none;
}
}

.geo_input {
margin-bottom: 30px;
label {
margin-bottom: 30px;
}
.geo_input label {
display: inline-block;
width: 10%;
}
input {
}
.geo_input input {
display: inline-block;
width: 80% !important;
margin-left: 1px;
}

}

0 comments on commit 82ec871

Please sign in to comment.