Skip to content

Commit 0d220ba

Browse files
committed
update submodule
1 parent dea93bc commit 0d220ba

22 files changed

Lines changed: 46878 additions & 26 deletions

Gruntfile.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ module.exports = function(grunt) {
4646
options: {banner: '<%= banner %>'},
4747
src: ['src/assets/js/style-switcher.js'],
4848
dest: 'dist/assets/js/style-switcher.js'
49-
}
49+
},
50+
emberApp: {
51+
options: {banner: '<%= banner %>'},
52+
src: ['src/assets/js/app.js'],
53+
dest: 'dist/assets/js/app.js'
54+
}
5055
},
5156
uglify: {
5257
options: {
@@ -157,10 +162,23 @@ module.exports = function(grunt) {
157162
cwd: 'src/assets/less',
158163
src: ['theme.less','mixins.less'],
159164
dest: 'dist/assets/less'
165+
},
166+
{
167+
expand: true,
168+
cwd: 'src/ember',
169+
src: ['*.html'],
170+
dest: 'dist'
160171
}
161172
]
162173
}
163-
}
174+
},
175+
176+
watch: {
177+
scripts: {
178+
files: ['**/*.js','**/*.less','**/*.hbs','**/*.html'],
179+
tasks: ['default']
180+
},
181+
}
164182

165183
});
166184

src/assets/js/app.js

Lines changed: 336 additions & 0 deletions
Large diffs are not rendered by default.

src/assets/less/left.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
.user-media {
77
display: none;
8-
background: url("../img/pattern/green-fibers.png") repeat #444444;
8+
background-color: #444444;
99

1010
@media (min-width: @screen-tablet) {
1111
display: block;

src/assets/less/menu.less

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@
8484
}
8585
}
8686

87-
#menu > li.active > a {
88-
position:relative;
89-
}
87+
#menu > li.active > a {position:relative;}
9088
#menu > li.panel.active ul > li.active > a:after {
9189

9290
border-style: solid;

0 commit comments

Comments
 (0)