This repository was archived by the owner on Jul 22, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Closed
是不是有个设计师女朋友 #26
Changes from all commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
7f3c35e
Initial commit
af5a738
Update README.md
fdc578a
layer1.8.5 - layer mobile 1.0
5727640
Update README.md
d97275c
Merge branch 'master' of https://git.oschina.net/sentsin/layer
6f877e2
layer-v1.8.5 - layer mobile-v1.0
eb3c076
layer-v1.8.5 - layer mobile-v1.0
80d25f9
layer-v1.8.5 - layer mobile-v1.0
2c75e96
1.8.5
48bf0d8
1.8.5
3debe88
移动版
bae55c5
例子
8a053b3
1.8.5
c4b1c5b
1.9.0
f13ab7f
1.9.0
bb2a84e
排除冲突
ff3bb6b
delete /
b56c3e4
upgrade
fcb6a94
文案更新
9671b5c
提交a
c453f7e
微调
08f55ea
new version
cfe6ab7
2.0
7a4d927
2.0
3c031d1
2.0
b59a6aa
修复layer.photos所有图片都加载失败时不停弹窗的bug
25a14d5
Merge pull request #13 from zhe-he/dev
d39c206
delete a.ext
62dd79a
升级
0425bfc
升级
dc56b74
升级
b36207e
.
callmez a25c6aa
Merge pull request #17 from callmez/2.x
4d60116
fix bug
c534fc8
layer mobile 1.7
e3b6d7a
Update layer.ext.js
xuebingwang dcfbcd4
Merge pull request #19 from xuebingwang/2.x
7a149d4
Update LICENSE
bdc560b
update
51c0b8c
update
ea5e818
update
e9d5d7d
update
77ecf93
update
8b72a52
单词拼写修正
xiabeifeng 2655f9a
2.4
0e5c2e7
Merge pull request #27 from xiabeifeng/patch-1
d405c75
2.4
65b5e60
2.4
82249ab
layer mobile 2.0
d97ead5
2.4
78f9647
layer mobile 2.0
9a82a0b
2.4
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,5 +19,4 @@ node_modules/ | |
| _site/ | ||
| .gitignore | ||
| skin/moon/ | ||
| src/skin/moon/ | ||
| git/ | ||
| src/skin/moon/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 48 additions & 50 deletions
GruntFile.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,56 @@ | ||
| module.exports = function(grunt) { | ||
|
|
||
| // Project configuration. | ||
| grunt.initConfig({ | ||
| pkg: grunt.file.readJSON('package.json'), | ||
|
|
||
| //压缩js - layer | ||
| uglify: { | ||
| options: { | ||
| expand: true | ||
| }, | ||
| 'layer.js': { | ||
| options: { | ||
| banner: '/*! layer-v<%= pkg.version %> <%= pkg.description %> License LGPL <%= pkg.homepage %> By <%= pkg.author %> */\n;' | ||
| }, | ||
| src: './src/layer.js', | ||
| dest: './layer.js' | ||
| }, | ||
| 'layer.ext.js': { | ||
| options: { | ||
| banner: '/*! layer<%= pkg.description %>拓展类 */\n;' | ||
| }, | ||
| src: './src/extend/layer.ext.js', | ||
| dest: './extend/layer.ext.js' | ||
| }, | ||
| 'layer.mobile.js': { | ||
| options: { | ||
| banner: '/*! layer mobile-v<%= pkg.mobile %> <%= pkg.description %>移动版 License LGPL <%= pkg.homepage %>mobile By <%= pkg.author %> */\n;' | ||
| }, | ||
| src: './src/mobile/layer.m.js', | ||
| dest: './mobile/layer.m.js' | ||
| } | ||
| // Project configuration. | ||
| grunt.initConfig({ | ||
| pkg: grunt.file.readJSON('package.json'), | ||
|
|
||
| //压缩js - layer | ||
| uglify: { | ||
| options: { | ||
| expand: true | ||
| }, | ||
| 'layer.js': { | ||
| options: { | ||
| banner: '/*! layer-v<%= pkg.version %> <%= pkg.description %> License LGPL <%= pkg.homepage %> By <%= pkg.author %> */\n;' | ||
| }, | ||
| src: './src/layer.js', | ||
| dest: './layer.js' | ||
| }, | ||
| 'layer.mobile.js': { | ||
| options: { | ||
| banner: '/*! layer mobile-v<%= pkg.mobile %> <%= pkg.description %>移动版 License LGPL <%= pkg.homepage %>mobile By <%= pkg.author %> */\n;' | ||
| }, | ||
| src: './src/mobile/layer.js', | ||
| dest: './mobile/layer.js' | ||
| } | ||
| }, | ||
|
|
||
| //压缩css | ||
| cssmin: { | ||
| options : { | ||
| compatibility : 'ie8', //设置兼容模式 | ||
| noAdvanced : true //取消高级特性 | ||
| } | ||
| ,layer: { | ||
| files: [{ | ||
| expand: true, | ||
| cwd: './src/skin', | ||
| src: ['*.css', '!*.min.css'], | ||
| dest: './skin' | ||
| }] | ||
| } | ||
| } | ||
| }); | ||
| //压缩css | ||
| cssmin: { | ||
| options : { | ||
| compatibility : 'ie8', //设置兼容模式 | ||
| noAdvanced : true //取消高级特性 | ||
| } | ||
| ,layer: { | ||
| files: [{ | ||
| expand: true, | ||
| cwd: './src/skin', | ||
| src: ['*.css', '!*.min.css'], | ||
| dest: './skin' | ||
| }, { | ||
| expand: true, | ||
| cwd: './src/mobile/need', | ||
| src: ['*.css', '!*.min.css'], | ||
| dest: './mobile/need' | ||
| }] | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| grunt.loadNpmTasks('grunt-contrib-uglify'); | ||
| grunt.loadNpmTasks('grunt-contrib-cssmin'); | ||
| grunt.registerTask('default', ['uglify', 'cssmin']); | ||
| grunt.loadNpmTasks('grunt-contrib-uglify'); | ||
| grunt.loadNpmTasks('grunt-contrib-cssmin'); | ||
|
|
||
| grunt.registerTask('default', ['uglify', 'cssmin']); | ||
|
|
||
|
|
||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
bower.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "name": "layer", | ||
| "main": "src/layer.js", | ||
| "version": "2.2.0", | ||
| "homepage": "https://github.com/sentsin/layer", | ||
| "authors": [ | ||
| "sentsin <xu@sentsin.com>" | ||
| ], | ||
| "description": "弹窗组件", | ||
| "moduleType": [ | ||
| "amd", | ||
| "globals" | ||
| ], | ||
| "keywords": [ | ||
| "layer", | ||
| "layui", | ||
| "dialog" | ||
| ], | ||
| "license": "LGPL" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.