Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

next ui #160

Merged
merged 77 commits into from
Feb 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
f975060
testing a better ui
45kb Feb 8, 2017
3c581b5
Merge branch 'master' of https://github.com/720kb/ndm into test-ui
45kb Feb 8, 2017
e52b391
Merge branch 'master' of https://github.com/720kb/ndm into test-ui
45kb Feb 9, 2017
e45fb03
test ui going on
45kb Feb 9, 2017
6790c47
going on test-ui
45kb Feb 9, 2017
8178352
going on test-ui
45kb Feb 9, 2017
9f9c9cd
going on test-ui
45kb Feb 9, 2017
03677a4
going on test-ui
45kb Feb 9, 2017
bf2b0be
Merge branch 'test-ui' of https://github.com/720kb/ndm into test-ui
45kb Feb 9, 2017
fd4c87f
going on
45kb Feb 9, 2017
480ba0b
going on
45kb Feb 9, 2017
74a1532
going on
45kb Feb 9, 2017
cd34ce4
going on
45kb Feb 9, 2017
82f69a4
going on
45kb Feb 9, 2017
38471d3
going on
45kb Feb 9, 2017
554a2e4
going on
45kb Feb 9, 2017
4ac8c64
going on
45kb Feb 9, 2017
d0f6ae4
going on
45kb Feb 9, 2017
610f527
going on
45kb Feb 9, 2017
7fa4da7
going on
45kb Feb 9, 2017
1a5785b
going on
45kb Feb 9, 2017
80f00cd
going on
45kb Feb 9, 2017
833d08d
going on
45kb Feb 9, 2017
e1c2869
going on
45kb Feb 9, 2017
7b8d9eb
going on
45kb Feb 9, 2017
2aba92c
going on
45kb Feb 9, 2017
38ad9e6
going on
45kb Feb 9, 2017
c91533a
going on
45kb Feb 9, 2017
9983dfd
going on
45kb Feb 9, 2017
1075495
going on
45kb Feb 9, 2017
75d6745
going on
45kb Feb 9, 2017
1244f9b
going on
45kb Feb 9, 2017
662c8a2
going on
45kb Feb 9, 2017
beb064a
going on
45kb Feb 9, 2017
43f527a
going on
45kb Feb 9, 2017
943a534
going on
45kb Feb 9, 2017
fed5029
going on
45kb Feb 9, 2017
afe1fe3
going on
45kb Feb 9, 2017
ba02b75
going on
45kb Feb 9, 2017
cb0f48f
going on
45kb Feb 9, 2017
9cfe06d
going on
45kb Feb 9, 2017
0486963
going on
45kb Feb 9, 2017
d635d99
going on
45kb Feb 9, 2017
459a26a
going on
45kb Feb 9, 2017
90f259a
going on
45kb Feb 9, 2017
4cc1e97
going on
45kb Feb 9, 2017
f24273a
going on
45kb Feb 9, 2017
8a697e6
going on
45kb Feb 9, 2017
6c7ee8a
going on
45kb Feb 9, 2017
01c5dbd
going on
45kb Feb 9, 2017
aad2015
going on
45kb Feb 9, 2017
95a4424
going on
45kb Feb 9, 2017
c55e4ef
going on
45kb Feb 9, 2017
a46fc04
going on
45kb Feb 9, 2017
bbb2dcb
going on
45kb Feb 9, 2017
93cece4
going on
45kb Feb 9, 2017
f6ca6e8
going on
45kb Feb 9, 2017
af4f9cf
going on
45kb Feb 9, 2017
8af1319
going on
45kb Feb 9, 2017
eb80d47
going on
45kb Feb 9, 2017
c082772
going on
45kb Feb 9, 2017
5fc5695
going on
45kb Feb 9, 2017
349d2ef
going on
45kb Feb 9, 2017
925b172
going on
45kb Feb 9, 2017
f9b9e4e
going on
45kb Feb 9, 2017
6d3b89a
going on
45kb Feb 9, 2017
0e28207
fix for globals
45kb Feb 10, 2017
2b77129
progress fix
45kb Feb 10, 2017
1ebbfd7
global link fix
45kb Feb 10, 2017
89b73d7
global link fix
45kb Feb 10, 2017
d7f6278
global link fix
45kb Feb 10, 2017
89277dc
little fix
45kb Feb 10, 2017
eb37540
win fix
45kb Feb 10, 2017
622888b
win fix
45kb Feb 10, 2017
454acb9
win fix
45kb Feb 10, 2017
a836c46
linux fix
45kb Feb 10, 2017
d977af7
linux fix
45kb Feb 10, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/content.pug
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.right-column.overflow-x-hidden(ng-controller='ContentController as content')
.right-column(ng-controller='ContentController as content')
include ./top.pug
.row.home.bg-ultralight(ng-hide="content.loading || content.packageInformations", ng-show="content.goBackHome")
div
.separator10
Expand Down Expand Up @@ -59,5 +60,8 @@
i(class="fa fa-check color-positive", ng-if="!aPackage.wanted && !aPackage.latest")
.col-xs-2
| {{ aPackage.kind }}
div.table-infos(ng-show="content.packageInformations && content.packageInformations.length > 0")
include ./package-informations.pug
div(ng-show="content.packageInformations && content.packageInformations.length > 0")
h6
| Packages informations
div.table-infos
include ./package-informations.pug
12 changes: 9 additions & 3 deletions lib/footer.pug
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
.footer.bg-footer
span(class="badge-version", title="Current npm version", ng-show="shell.npmCurrentVersionBadge", ng-mouseover="shell.updateNpmBadgeVersion()")
span(class="badge-version", title="Current npm version", ng-mouseover="shell.updateNpmBadgeVersion()")
b
| npm
= " "
small
| v{{shell.npmCurrentVersionBadge || ' - - -'}}
small(ng-if="shell.npmCurrentVersionBadge")
| v{{shell.npmCurrentVersionBadge}}
button.button-global(type="button", title="Enable ndm in global folder", ng-show="shell.globalDisabled", ng-click="shell.enableGlobal()")
i.fa.fa-globe.color-primary
| Enable globals
button.button-update(type="button", ng-show="!shell.globalDisabled && shell.npmCurrentVersionBadge", title="Update npm", ng-click="shell.activeClickedLink('update'); shell.updateNpm()")
i.fa.fa-history
| Update npm
span(class="npm-status", ng-mouseenter="shell.checkRegistryStatus()")
i.fa.fa-disk(title="npm registry is available", ng-show="!shell.loadingRegistryStatus && shell.registryStatus")
i.fa.fa-disk(title="npm registry checking ...", ng-show="shell.loadingRegistryStatus")
Expand Down
9 changes: 9 additions & 0 deletions lib/icons/fontello/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,12 @@ Font license info
Homepage: http://www.entypo.com


## Modern Pictograms

Copyright (c) 2012 by John Caserta. All rights reserved.

Author: John Caserta
License: SIL (http://scripts.sil.org/OFL)
Homepage: http://thedesignoffice.org/project/modern-pictograms/


24 changes: 12 additions & 12 deletions lib/icons/fontello/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,6 @@
"code": 59393,
"src": "fontawesome"
},
{
"uid": "f5999a012fc3752386635ec02a858447",
"css": "cloud-download",
"code": 61677,
"src": "fontawesome"
},
{
"uid": "197375a3cea8cb90b02d06e4ddf1433d",
"css": "globe",
"code": 59394,
"src": "fontawesome"
},
{
"uid": "4ba33d2607902cf690dd45df09774cb0",
"css": "plus-circle",
Expand Down Expand Up @@ -131,6 +119,18 @@
"css": "circle",
"code": 61713,
"src": "fontawesome"
},
{
"uid": "ivdkw88f6me1kxmgrk3qzv6jkgxhbuj7",
"css": "lock",
"code": 59402,
"src": "modernpics"
},
{
"uid": "197375a3cea8cb90b02d06e4ddf1433d",
"css": "globe",
"code": 59394,
"src": "fontawesome"
}
]
}
2 changes: 1 addition & 1 deletion lib/icons/fontello/css/fontello-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
.fa-check:before { content: '\e807'; } /* '' */
.fa-folder-o:before { content: '\e808'; } /* '' */
.fa-caret-up:before { content: '\e809'; } /* '' */
.fa-lock:before { content: '\e80a'; } /* '' */
.fa-disk:before { content: '\f0a0'; } /* '' */
.fa-sort:before { content: '\f0dc'; } /* '' */
.fa-sort-down:before { content: '\f0dd'; } /* '' */
.fa-sort-up:before { content: '\f0de'; } /* '' */
.fa-cloud-download:before { content: '\f0ed'; } /* '' */
.fa-circle:before { content: '\f111'; } /* '' */
.fa-rocket:before { content: '\f135'; } /* '' */
.fa-level-up:before { content: '\f148'; } /* '' */
Expand Down
14 changes: 7 additions & 7 deletions lib/icons/fontello/css/fontello-embedded.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/icons/fontello/css/fontello-ie7-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
.fa-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-folder-o { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-caret-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-disk { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-sort { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-sort-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-sort-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-cloud-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-circle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-rocket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-level-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
2 changes: 1 addition & 1 deletion lib/icons/fontello/css/fontello-ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
.fa-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-folder-o { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-caret-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-disk { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-sort { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-sort-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-sort-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-cloud-download { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-circle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-rocket { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.fa-level-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
16 changes: 8 additions & 8 deletions lib/icons/fontello/css/fontello.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?39688149');
src: url('../font/fontello.eot?39688149#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?39688149') format('woff2'),
url('../font/fontello.woff?39688149') format('woff'),
url('../font/fontello.ttf?39688149') format('truetype'),
url('../font/fontello.svg?39688149#fontello') format('svg');
src: url('../font/fontello.eot?13933329');
src: url('../font/fontello.eot?13933329#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?13933329') format('woff2'),
url('../font/fontello.woff?13933329') format('woff'),
url('../font/fontello.ttf?13933329') format('truetype'),
url('../font/fontello.svg?13933329#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?39688149#fontello') format('svg');
src: url('../font/fontello.svg?13933329#fontello') format('svg');
}
}
*/
Expand Down Expand Up @@ -65,11 +65,11 @@
.fa-check:before { content: '\e807'; } /* '' */
.fa-folder-o:before { content: '\e808'; } /* '' */
.fa-caret-up:before { content: '\e809'; } /* '' */
.fa-lock:before { content: '\e80a'; } /* '' */
.fa-disk:before { content: '\f0a0'; } /* '' */
.fa-sort:before { content: '\f0dc'; } /* '' */
.fa-sort-down:before { content: '\f0dd'; } /* '' */
.fa-sort-up:before { content: '\f0de'; } /* '' */
.fa-cloud-download:before { content: '\f0ed'; } /* '' */
.fa-circle:before { content: '\f111'; } /* '' */
.fa-rocket:before { content: '\f135'; } /* '' */
.fa-level-up:before { content: '\f148'; } /* '' */
Expand Down
Binary file modified lib/icons/fontello/font/fontello.eot
Binary file not shown.
4 changes: 2 additions & 2 deletions lib/icons/fontello/font/fontello.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/icons/fontello/font/fontello.ttf
Binary file not shown.
Binary file modified lib/icons/fontello/font/fontello.woff
Binary file not shown.
Binary file modified lib/icons/fontello/font/fontello.woff2
Binary file not shown.
Loading