Skip to content

Commit a268696

Browse files
dexteryydexteryy
committed
refactor css/
1 parent 8cd264b commit a268696

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+547
-485
lines changed

‎Gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
source 'https://rubygems.org'
22

3-
gem "compass", "~> 0.13.alpha.4"
3+
gem "sass", ">= 3.2.0"
4+
gem "compass", ">= 0.13.alpha.4"
45
gem "compass-normalize", ">= 1.3"
56
gem "ceaser-easing", "~> 0.6.1"
6-
gem "animate-sass", "~> 0.1.1"
7+
gem "animate", ">= 0.2.beta.0"
78
gem "compass-recipes", "~> 0.3.0"

‎Gemfile.lock

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
animate-sass (0.1.1)
5-
compass (>= 0.11.5)
4+
animate (0.2.beta.0)
5+
compass (>= 0.13.alpha.0)
6+
sass (>= 3.2.0)
67
ceaser-easing (0.6.1)
78
compass (>= 0.12.2)
89
chunky_png (1.2.8)
@@ -23,8 +24,9 @@ PLATFORMS
2324
ruby
2425

2526
DEPENDENCIES
26-
animate-sass (~> 0.1.1)
27+
animate (>= 0.2.beta.0)
2728
ceaser-easing (~> 0.6.1)
28-
compass (~> 0.13.alpha.4)
29+
compass (>= 0.13.alpha.4)
2930
compass-normalize (>= 1.3)
3031
compass-recipes (~> 0.3.0)
32+
sass (>= 3.2.0)

‎Gruntfile.js

+94-33
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,35 @@ module.exports = function(grunt) {
99
targetDir: 'target',
1010
distDir: '.dist',
1111
releaseDir: 'dist',
12+
originDir: 'origin',
1213
examplesDir: 'examples',
14+
examplesStaticDir: 'examples/static',
1315
jstplDir: "js/<%= pkg.name %>/tpl",
1416
jsComponentDir: "js/component",
15-
jsPublicDir: config.jsPublicDir + '/<%= pkg.name %>',
16-
cssPublicDir: config.cssPublicDir + '/<%= pkg.name %>'
17+
jsStaticDir: config.jsStaticDir || (config.staticDir + '/<%= pkg.name %>/js'),
18+
cssStaticDir: config.cssStaticDir || (config.staticDir + '/<%= pkg.name %>/css'),
19+
assetStaticDir: config.assetStaticDir || (config.staticDir + '/<%= pkg.name %>/pics'),
1720
},
1821

1922
clean: {
2023
jstpl: ["<%= meta.jstplDir %>/"],
2124
jsComponent: ["<%= meta.jsComponentDir %>/"],
22-
cssMoui: ["css/moui/"],
23-
examples_dist: ["<%= meta.examplesDir %>/dist/js", "<%= meta.examplesDir %>/dist/css"],
25+
cssComponent: ["css/*/**", "!css/<%= pkg.name %>/**"],
26+
origin: ["<%= meta.originDir %>/"],
27+
examples_static: ["<%= meta.examplesStaticDir %>"],
28+
pub_static: {
29+
options: {
30+
force: true,
31+
},
32+
src: [
33+
"<%= meta.jsStaticDir %>/*",
34+
"<%= meta.cssStaticDir %>/*",
35+
"<%= meta.assetStaticDir %>/*",
36+
"!<%= meta.jsStaticDir %>/.**",
37+
"!<%= meta.cssStaticDir %>/.**",
38+
"!<%= meta.assetStaticDir %>/.**"
39+
]
40+
},
2441
target_js: ["<%= meta.targetDir %>/js"],
2542
target_css: ["<%= meta.targetDir %>/css"],
2643
target_pics: ["<%= meta.targetDir %>/pics"],
@@ -69,7 +86,7 @@ module.exports = function(grunt) {
6986
},
7087
"moui": {
7188
use: [{
72-
cwd: "css/moui",
89+
cwd: "scss/moui",
7390
src: ["**"],
7491
dest: "css/moui/"
7592
}, {
@@ -127,8 +144,8 @@ module.exports = function(grunt) {
127144
noLineComments: false,
128145
require: [
129146
'compass-normalize',
130-
'animate-sass',
131147
'ceaser-easing',
148+
'animate',
132149
'compass-recipes'
133150
],
134151
environment: 'production'
@@ -198,69 +215,103 @@ module.exports = function(grunt) {
198215
},
199216

200217
copy: {
201-
target_to_examples: {
218+
asset_to_target: {
202219
files: [{
203220
expand: true,
204-
cwd: '<%= meta.targetDir %>/js/',
221+
cwd: 'pics/',
222+
src: ['**', '!**/*.{png,jpg}'],
223+
dest: '<%= meta.targetDir %>/pics/'
224+
}]
225+
},
226+
asset_to_dist: {
227+
files: [{
228+
expand: true,
229+
cwd: '<%= meta.targetDir %>/pics/',
205230
src: ['**'],
206-
dest: '<%= meta.examplesDir %>/dist/js/'
207-
}, {
231+
dest: '<%= meta.distDir %>/pics/'
232+
}]
233+
},
234+
target_to_examples: {
235+
files: [{
208236
expand: true,
209-
cwd: '<%= meta.targetDir %>/css/',
237+
cwd: '<%= meta.targetDir %>/',
210238
src: ['**'],
211-
dest: '<%= meta.examplesDir %>/dist/css/'
239+
dest: '<%= meta.examplesStaticDir %>/'
212240
}]
213241
},
214242
target_to_pub: {
215243
files: [{
216244
expand: true,
217245
cwd: '<%= meta.targetDir %>/js/',
218246
src: ['**'],
219-
dest: '<%= meta.jsPublicDir %>/'
247+
dest: '<%= meta.jsStaticDir %>/'
220248
}, {
221249
expand: true,
222250
cwd: '<%= meta.targetDir %>/css/',
223251
src: ['**'],
224-
dest: '<%= meta.cssPublicDir %>/'
252+
dest: '<%= meta.cssStaticDir %>/'
253+
}, {
254+
expand: true,
255+
cwd: '<%= meta.targetDir %>/pics/',
256+
src: ['**'],
257+
dest: '<%= meta.assetStaticDir %>/'
225258
}]
226259
},
227260
dist_to_pub: {
228261
files: [{
229262
expand: true,
230263
cwd: '<%= meta.distDir %>/js/',
231264
src: ['**', '!**/*.min.*'],
232-
dest: '<%= meta.jsPublicDir %>/'
265+
dest: '<%= meta.jsStaticDir %>/'
233266
}, {
234267
expand: true,
235268
cwd: '<%= meta.distDir %>/css/',
236269
src: ['**', '!**/*.min.*'],
237-
dest: '<%= meta.cssPublicDir %>/'
270+
dest: '<%= meta.cssStaticDir %>/'
271+
}, {
272+
expand: true,
273+
cwd: '<%= meta.distDir %>/pics/',
274+
src: ['**'],
275+
dest: '<%= meta.assetStaticDir %>/'
238276
}]
239277
},
240-
release_to_examples: {
278+
release_to_pub: {
241279
files: [{
242280
expand: true,
243281
cwd: '<%= meta.releaseDir %>/js/',
244-
src: ['**'],
245-
dest: '<%= meta.examplesDir %>/dist/js/'
282+
src: ['**', '!**/*.min.*'],
283+
dest: '<%= meta.jsStaticDir %>/'
246284
}, {
247285
expand: true,
248286
cwd: '<%= meta.releaseDir %>/css/',
287+
src: ['**', '!**/*.min.*'],
288+
dest: '<%= meta.cssStaticDir %>/'
289+
}, {
290+
expand: true,
291+
cwd: '<%= meta.releaseDir %>/pics/',
249292
src: ['**'],
250-
dest: '<%= meta.examplesDir %>/dist/css/'
293+
dest: '<%= meta.assetStaticDir %>/'
294+
}]
295+
},
296+
release_to_examples: {
297+
files: [{
298+
expand: true,
299+
cwd: '<%= meta.releaseDir %>/',
300+
src: ['**'],
301+
dest: '<%= meta.examplesStaticDir %>/'
251302
}]
252303
},
253304
min_to_pub: {
254305
files: [{
255306
expand: true,
256307
cwd: '<%= meta.distDir %>/js/',
257308
src: ['**/*.min.*'],
258-
dest: '<%= meta.jsPublicDir %>/'
309+
dest: '<%= meta.jsStaticDir %>/'
259310
}, {
260311
expand: true,
261312
cwd: '<%= meta.distDir %>/css/',
262313
src: ['**/*.min.*'],
263-
dest: '<%= meta.cssPublicDir %>/'
314+
dest: '<%= meta.cssStaticDir %>/'
264315
}]
265316
},
266317
restore: {
@@ -349,10 +400,10 @@ module.exports = function(grunt) {
349400
'test'
350401
]
351402
},
352-
img: {
353-
files: ['pics/**/*.{png,jpg}'],
403+
asset: {
404+
files: ['pics/**'],
354405
tasks: [
355-
'dev:img',
406+
'dev:asset',
356407
'test'
357408
]
358409
}
@@ -385,9 +436,10 @@ module.exports = function(grunt) {
385436
'compass',
386437
]);
387438

388-
grunt.registerTask('dev:img', [
439+
grunt.registerTask('dev:asset', [
389440
'clean:target_pics',
390441
'imagemin',
442+
'copy:asset_to_target',
391443
'dev:css'
392444
]);
393445

@@ -397,49 +449,58 @@ module.exports = function(grunt) {
397449
'dev:js'
398450
]);
399451

452+
grunt.registerTask('build_components', [
453+
]);
454+
400455
grunt.registerTask('dev', [
401456
'dev:tpl',
402-
'dev:img'
457+
'dev:asset'
403458
]);
404459

405460
grunt.registerTask('build', [
406461
'clean:dist',
407462
'concat',
463+
'copy:asset_to_dist',
408464
'uglify',
409465
'cssmin'
410466
]);
411467

412468
grunt.registerTask('test', [
413-
'clean:examples_dist',
414469
'copy:target_to_examples',
415470
'copy:target_to_pub'
416471
]);
417472

418473
grunt.registerTask('restore', [
419-
'clean:examples_dist',
474+
'clean:pub_static',
475+
'copy:release_to_pub',
476+
'clean:examples_static',
420477
'copy:release_to_examples',
421478
'clean:dist',
422479
'copy:restore'
423480
]);
424481

425482
grunt.registerTask('default', [
483+
'build_components',
426484
'jshint:dist',
427485
'dev',
428486
'restore'
429487
]);
430488

431489
grunt.registerTask('deploy', [
432-
'build',
490+
'clean:pub_static',
433491
'copy:dist_to_pub'
434492
]);
435493

436-
grunt.registerTask('upstream', [
494+
grunt.registerTask('update', [
437495
'clean:jsComponent',
438-
'clean:cssMoui',
439-
'dispatch'
496+
'clean:cssComponent',
497+
'clean:origin',
498+
'dispatch',
499+
'build_components'
440500
]);
441501

442502
grunt.registerTask('publish', [
503+
'build_components',
443504
'jshint:dist',
444505
'dev',
445506
'build',

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"soviet": "~1.0.0",
1313
"choreo": "~1.1.0",
1414
"momo": "~1.0.1",
15-
"moui": "~2.0.5"
15+
"moui": "~2.1.0"
1616
},
1717
"ignore": []
1818
}

‎config.js.tmpl

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
//TODO: change the following variable to your project directory
33

44
module.exports = {
5-
jsPublicDir: 'public/static/js',
6-
cssPublicDir: 'public/static/css'
5+
//staticDir: 'public/static/component',
6+
jsStaticDir: 'public/static/js/cardkit',
7+
cssStaticDir: 'public/static/css/cardkit',
8+
assetStaticDir: 'public/static/pics/cardkit'
79
};
10+

‎css/cardkit.scss

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
@import 'cardkit/lib';
3+
4+
@import 'cardkit/config';
5+
6+
@import 'cardkit/base';
7+
8+
@import 'cardkit/layout';
9+
10+
@import 'cardkit/card';
11+
12+
@import 'cardkit/unit';
13+
14+
@import "cardkit/control";
15+
16+
@import "cardkit/picker";
17+
18+
@import "cardkit/overlay";
19+
20+
@import "cardkit/popup";
21+

‎css/cardkit/_base.scss

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
@import "moui/base/default";
2-
@import "cardkit/lib";
31

4-
$top_btn_size: 80px/2;
2+
@import "moui/base";
3+
@import "moui/control/switch";
4+
@import "moui/control/folder";
5+
@import "moui/picker/segment";
6+
@import "moui/picker/tags";
7+
@import "moui/picker/actions";
8+
@import "moui/picker/slider";
9+
@import "moui/picker/select";
10+
@import 'moui/actionview/default';
11+
@import 'moui/modalview/default';
12+
@import 'moui/growl/default';
513

614
.ckbase-btn {
7-
@extend %button;
15+
@extend %moui-button;
816
}
917

1018
.ckbase-mainbtn {
11-
@extend %main-button;
19+
@extend %moui-main-button;
1220
}

0 commit comments

Comments
 (0)