Skip to content
This repository was archived by the owner on Dec 30, 2018. It is now read-only.

Commit 2efc49a

Browse files
committed
fix for ngList
1 parent 5ae6d93 commit 2efc49a

File tree

14 files changed

+2392
-1767
lines changed

14 files changed

+2392
-1767
lines changed

bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsGen",
3-
"version": "0.8.5",
3+
"version": "0.8.6",
44
"main": "index.html",
55
"dependencies": {
66
"angular": ">=1.3.0",
@@ -9,17 +9,17 @@
99
"angular-resource": ">=1.3.0",
1010
"angular-route": ">=1.3.0",
1111
"crypto-js": "https://github.com/evanvosberg/crypto-js.git",
12-
"pure": "~0.5.x",
12+
"pure": ">=0.5.x",
1313
"font-awesome": ">=3.2.1",
1414
"jquery": ">=2.0.3",
1515
"marked": ">=0.2.9",
1616
"toastr": ">=2.0.1",
1717
"google-code-prettify": ">=1.0.0",
1818
"angular-file-upload": ">=1.1.1",
1919
"utf8": "https://github.com/arahaya/utf8.js.git",
20-
"angular-i18n": "~1.2.23",
21-
"store2": "~2.1.6",
20+
"angular-i18n": ">=1.2.23",
21+
"store2": ">=2.1.6",
2222
"angular-ui-utils": "bower-validate",
23-
"jsonkit": "~0.3.0"
23+
"jsonkit": ">=0.3.0"
2424
}
2525
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"url": "http://weibo.com/zensh"
66
},
77
"name": "jsgen",
8-
"version": "0.8.5",
8+
"version": "0.8.6",
99
"cdnHost": "http://cdn.angularjs.cn",
1010
"description": "",
1111
"keywords": [
@@ -44,7 +44,7 @@
4444
"gulp-rename": ">=1.2.0",
4545
"gulp-replace": "^0.4.0",
4646
"gulp-rev": ">=0.4.2",
47-
"gulp-sequence": "^0.1.0",
47+
"gulp-sequence": ">=0.3.0",
4848
"gulp-uglify": ">=0.3.1",
4949
"gulp-usemin": ">=0.3.6",
5050
"gulp-util": ">=2.2.14",

static/dist/css/app.css

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,17 +1663,6 @@ striping:
16631663
border-bottom-width: 0;
16641664
}
16651665

1666-
/*
1667-
* Toastr
1668-
* Version 2.0.2
1669-
* Copyright 2012-2014 John Papa and Hans Fjällemark.
1670-
* All Rights Reserved.
1671-
* Use, reproduction, distribution, and modification of this code is subject to the terms and
1672-
* conditions of the MIT license, available at http://www.opensource.org/licenses/mit-license.php
1673-
*
1674-
* Author: John Papa and Hans Fjällemark
1675-
* Project: https://github.com/CodeSeven/toastr
1676-
*/
16771666
.toast-title {
16781667
font-weight: bold;
16791668
}
@@ -1722,6 +1711,16 @@ button.toast-close-button {
17221711
border: 0;
17231712
-webkit-appearance: none;
17241713
}
1714+
.toast-top-center {
1715+
top: 0;
1716+
right: 0;
1717+
width: 100%;
1718+
}
1719+
.toast-bottom-center {
1720+
bottom: 0;
1721+
right: 0;
1722+
width: 100%;
1723+
}
17251724
.toast-top-full-width {
17261725
top: 0;
17271726
right: 0;
@@ -1760,6 +1759,8 @@ button.toast-close-button {
17601759
box-sizing: border-box;
17611760
}
17621761
#toast-container > div {
1762+
position: relative;
1763+
overflow: hidden;
17631764
margin: 0 0 6px;
17641765
padding: 15px 15px 15px 50px;
17651766
width: 300px;
@@ -1797,6 +1798,11 @@ button.toast-close-button {
17971798
#toast-container > .toast-warning {
17981799
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
17991800
}
1801+
#toast-container.toast-top-center > div,
1802+
#toast-container.toast-bottom-center > div {
1803+
width: 300px;
1804+
margin: auto;
1805+
}
18001806
#toast-container.toast-top-full-width > div,
18011807
#toast-container.toast-bottom-full-width > div {
18021808
width: 96%;
@@ -1817,6 +1823,16 @@ button.toast-close-button {
18171823
.toast-warning {
18181824
background-color: #f89406;
18191825
}
1826+
.toast-progress {
1827+
position: absolute;
1828+
left: 0;
1829+
bottom: 0;
1830+
height: 4px;
1831+
background-color: #000000;
1832+
opacity: 0.4;
1833+
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
1834+
filter: alpha(opacity=40);
1835+
}
18201836
/*Responsive Design*/
18211837
@media all and (max-width: 240px) {
18221838
#toast-container > div {
@@ -4782,6 +4798,10 @@ input.upload-input {
47824798
margin: 10px 0;
47834799
}
47844800

4801+
.site-link img {
4802+
height: 44px;
4803+
}
4804+
47854805
@media (min-width: 980px) {
47864806
.pure-visible-phone {
47874807
display: none !important;

static/dist/img/logo_coding.png

15.3 KB
Loading

static/dist/img/logo_f2e.png

4.79 KB
Loading
2.82 KB
Loading

static/dist/js/app.js

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

0 commit comments

Comments
 (0)