From f97506003840d277879fa4674b7444552cd0a4e4 Mon Sep 17 00:00:00 2001 From: 45kb Date: Wed, 8 Feb 2017 16:14:44 +0100 Subject: [PATCH 01/74] testing a better ui --- lib/content.pug | 5 +- lib/img/npm-logo-cube.svg | 18 +++++++ lib/index.pug | 1 - lib/left.pug | 12 ++--- lib/package-informations.pug | 91 ++++++++++++++++++------------------ lib/scss/footer.scss | 8 ++-- lib/scss/header.scss | 61 ++++++------------------ lib/scss/layout.scss | 91 ++++++++++++++++++++---------------- lib/scss/settings.scss | 1 + lib/scss/table.scss | 55 ++++++++-------------- lib/top.pug | 23 ++++----- 11 files changed, 166 insertions(+), 200 deletions(-) create mode 100644 lib/img/npm-logo-cube.svg diff --git a/lib/content.pug b/lib/content.pug index eb9b9932..11215305 100644 --- a/lib/content.pug +++ b/lib/content.pug @@ -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 @@ -59,5 +60,7 @@ i(class="fa fa-check color-positive", ng-if="!aPackage.wanted && !aPackage.latest") .col-xs-2 | {{ aPackage.kind }} + h6 + | Packages informations div.table-infos(ng-show="content.packageInformations && content.packageInformations.length > 0") include ./package-informations.pug diff --git a/lib/img/npm-logo-cube.svg b/lib/img/npm-logo-cube.svg new file mode 100644 index 00000000..cfb77550 --- /dev/null +++ b/lib/img/npm-logo-cube.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/lib/index.pug b/lib/index.pug index 7062fca9..404da5bc 100644 --- a/lib/index.pug +++ b/lib/index.pug @@ -18,7 +18,6 @@ html div | Loading .page - include ./top.pug include ./left.pug include ./content.pug diff --git a/lib/left.pug b/lib/left.pug index 14c36106..d6b436b6 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -3,22 +3,16 @@ div(ng-controller='LeftBarController as leftBar') include ./history-prompt.pug .left-column.overflow-x-hidden .row - h6.col-xs-12 - | Packages a.row.action-link-disabled(ng-class="{'active': leftBar.global, 'action-link-disabled': shell.globalDisabled, 'action-link-enabled': !shell.globalDisabled}", ng-click='leftBar.selectGlobal()') - i.fa.fa-globe + img.global-img(src="img/npm-logo-cube.svg") | Globals - br - h6.col-xs-12(ng-if='shell.projects.length > 0') - | Projects div(ng-repeat='item in shell.projects track by $index') a.row.project(title="{{ item.shrinkwrap ? 'Shrinkwrap enabled' : item.path }}", ng-right-click="leftBar.rightClickMenu(item, $event)", ng-class="{'active': leftBar.selectedProject === item && !leftBar.global, 'shrinkwrapped': item.shrinkwrap}", ng-if="leftBar.removedProject !== item", ng-click='leftBar.selectProject(item, $event)') img(class="shrinkwrap-img", src="img/lock.svg", ng-if="item.shrinkwrap") - i.fa.fa-folder-o - div - b {{item.dirName}} button(ng-click='leftBar.deleteProject(item, $event)') i.fa.fa-times-circle-o + i.fa.fa-folder-o + | {{item.dirName}} div(ng-init="leftBar.cancelProgressActionId = false;") .left-progress.left-progress-minor.color-white.fake-link(ng-repeat="runningScript in leftBar.npmRunningScriptsProject[item.path] track by $index") small.running-name diff --git a/lib/package-informations.pug b/lib/package-informations.pug index 36663b60..434ce085 100644 --- a/lib/package-informations.pug +++ b/lib/package-informations.pug @@ -1,47 +1,46 @@ -div.row - div.col-md-12 - div.information - b - | Name: +div + div.information + b + | Name: + = " " + | {{content.packageViewInfos.name || '-'}} + div.information(title="{{content.packageViewInfos.description}}") + b + | Description: + = " " + | {{content.packageViewInfos.description || '-'}} + div.information(title="Package dependencies") + b + | Dependencies: + = " " + span(ng-repeat="(dep, value) in content.packageViewInfos.dependencies") + | {{ dep }}, = " " - | {{content.packageViewInfos.name || '-'}} - div.information(title="{{content.packageViewInfos.description}}") - b - | Description: - = " " - | {{content.packageViewInfos.description || '-'}} - div.information(title="Package dependencies") - b - | Dependencies: - = " " - span(ng-repeat="(dep, value) in content.packageViewInfos.dependencies") - | {{ dep }}, - = " " - span(ng-if="!content.packageViewInfos.dependencies || content.packageViewInfos.dependencies.length <= 0") - | - - div.information(title="Package repository url") - b - | Repository: - = " " - | {{content.packageViewInfos.repository.url || '-'}} - div.information - b - | Issues: - = " " - a(title="Open in browser", ng-if="content.packageViewInfos.bugs.url", ng-click="shell.openBrowserLink(content.packageViewInfos.bugs.url)") - | {{content.packageViewInfos.bugs.url}} - span(ng-if="!content.packageViewInfos.bugs || !content.packageViewInfos.bugs.url") - | - - div.information - b - | Url: - = " " - a(title="Open in browser", ng-init="content.pkgUrlToNpmJsWebsite = 'https://npmjs.com/package/' + content.packageViewInfos.name", ng-if="content.packageViewInfos.name", ng-click="shell.openBrowserLink(content.pkgUrlToNpmJsWebsite)") - | {{ content.pkgUrlToNpmJsWebsite }} - span(ng-if="!content.packageViewInfos.name") - | - - div.information - b - | License: - = " " - | {{content.packageViewInfos.license.type || content.packageViewInfos.license || '-'}} + span(ng-if="!content.packageViewInfos.dependencies || content.packageViewInfos.dependencies.length <= 0") + | - + div.information(title="Package repository url") + b + | Repository: + = " " + | {{content.packageViewInfos.repository.url || '-'}} + div.information + b + | Issues: + = " " + a(title="Open in browser", ng-if="content.packageViewInfos.bugs.url", ng-click="shell.openBrowserLink(content.packageViewInfos.bugs.url)") + | {{content.packageViewInfos.bugs.url}} + span(ng-if="!content.packageViewInfos.bugs || !content.packageViewInfos.bugs.url") + | - + div.information + b + | Url: + = " " + a(title="Open in browser", ng-init="content.pkgUrlToNpmJsWebsite = 'https://npmjs.com/package/' + content.packageViewInfos.name", ng-if="content.packageViewInfos.name", ng-click="shell.openBrowserLink(content.pkgUrlToNpmJsWebsite)") + | {{ content.pkgUrlToNpmJsWebsite }} + span(ng-if="!content.packageViewInfos.name") + | - + div.information + b + | License: + = " " + | {{content.packageViewInfos.license.type || content.packageViewInfos.license || '-'}} diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index e952c824..24fc9258 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -1,12 +1,10 @@ .footer { -webkit-app-region: drag; - background: $bg-light; - border-top: 1px solid $color-ddd; bottom: 0; font-weight: normal; - height: 24px; - line-height: 22.5px; - padding: 0 7px; + height: 18px; + line-height: 16.5px; + padding: 0 10px; position: fixed; width: 100%; z-index: 9; diff --git a/lib/scss/header.scss b/lib/scss/header.scss index afaec832..459be28e 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -1,8 +1,5 @@ .top-menu { - -webkit-app-region: drag; - padding: 0 5px; width: 100%; - background: $bg-header; min-height: 31px; .top-menu-left { @@ -17,16 +14,23 @@ margin-right: 6px; } - a { - padding: 6.5px 0 4px 0; + a, .button-global, .button-update, .button-add-project { + float: left; + font-size: 11.5px; + height: 20.5px; + padding: 0 5px; + line-height: 16.5px; + -webkit-appearance: button; - &.pull-right { - margin-left: 4.5px; + i { + color: $color-primary; + vertical-align: baseline; } + } - i { - font-size: 20px; - line-height: 0; + a { + &.pull-right { + margin-left: 4.5px; } &:active, &.active { @@ -35,41 +39,4 @@ } } } - - .button-update, .button-add-project { - background: none; - border: none; - padding: 6.5px 6px 4.5px 6px; - text-indent: -1px; - - i { - font-size: 14px; - color: $color-primary; - position: relative; - top: -1.5px; - } - - &:active { - @include bg-rgba-black(.05); - } - } - - .button-add-project { - margin-left: -6px; - } - - .button-global { - - font-size: 11.5px; - height: 20.5px; - padding: 0 2px; - margin-top: 4.5px; - line-height: 16.5px; - margin-left: 10px; - - i { - color: $color-primary; - vertical-align: baseline; - } - } } diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index afd5b9f4..780c9f4a 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -3,47 +3,62 @@ } .right-column { + border-radius: 1.5px; float: left; - padding: 0; - width: calc(100% - 200px); + margin: 10px 0; + padding: 5px 3px; + width: calc(100vw - 225px); + height: calc(100vh - 33px); + background: white; + + h6 { + font-size: 11px; + font-weight: 500; + } } .left-column { - box-shadow: -1px -1px $color-ccc inset; + border-radius: 1.5px; float: left; - height: calc(100vh - 51px); - overflow-y: auto; - padding: 0 15px; + height: calc(100vh - 33px); + overflow: auto; + margin: 10px 5px 10px 10px; + padding: 15px; width: 200px; - background: $bg-light; + background: white; a { display: inline-block; margin: 0; padding: 0 6px; - width: 100%; - line-height: 23px; - height: 25px; - - //for when project has npm-shrinkwrap.json inside - img.shrinkwrap-img { - position: relative; - width: 9px; - z-index: 99; - margin-right: -10px; - left: 9px; - background: red; + white-space: nowrap; + + &:first-child { + margin-bottom: 5px; + } + + img { + &.global-img { + width: 20px; + margin-right: 3px; + margin-top: -3px; + } + //for when project has npm-shrinkwrap.json inside + &.shrinkwrap-img { + position: relative; + width: 9px; + z-index: 99; + margin-right: -10px; + left: 9px; + background: red; + } } i { - font-size: 16.5px; + font-size: 14.5px; margin-right: 2px; - position: relative; - bottom: -1px; - - &:not(.fa-globe) { - color: $color-primary; - } + margin-left: 10px; + color: $color-primary; } &.shrinkwrapped { @@ -56,17 +71,10 @@ background: $bg-muted-invisible; } - div { - display: inline-flex; - max-width: 140px; - - b { - font-weight: normal; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - width: 100%; - } + b { + font-weight: normal; + white-space: nowrap; + width: 100%; } &.active { @@ -80,19 +88,20 @@ } button { - + position: absolute; display: none; - float: right; + float: left; max-width: 21px; transition: color .11s linear; z-index: 999; + left: -10px; background: none; border: none; - line-height: 23px; + line-height: 18px; i { color: $color-222; - margin-left: -7px; + margin-left: 7px; vertical-align: top; } } diff --git a/lib/scss/settings.scss b/lib/scss/settings.scss index b465f20f..4650b81f 100644 --- a/lib/scss/settings.scss +++ b/lib/scss/settings.scss @@ -11,6 +11,7 @@ body, html { -webkit-user-select: none; color: $color-222; + background: $bg-light; font-size: 13px; height: 100vh; margin: 0 auto; diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 46689856..d122dc22 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -1,7 +1,7 @@ .table-header { font-size: 12px; - line-height: 22px; - padding: 0 10px; + line-height: 20px; + margin: 0 auto; transition: opacity .3s linear; .clickable { @@ -11,10 +11,10 @@ } div { - background: $bg-lighter; + background: $bg-light; box-shadow: -1px -1px $color-ddd inset; text-align: left; - padding: 0 10px; + padding: 0 4px; } i { @@ -33,7 +33,7 @@ .table-row { line-height: 22.5px; - padding: 0 6px; + padding: 0 3px; &:nth-child(odd) { background: $bg-lighter; @@ -56,7 +56,7 @@ } &.disabled { - background: $bg-light; + background: none; cursor: not-allowed; * { @@ -76,10 +76,13 @@ .table-body { //(table - header - table-infos) to calculate height - height: calc(100vh - 120px - 105px); + height: calc(100vh - 140px - 105px); overflow-x: hidden; - overflow-y: auto; padding-bottom: 20px; + background: white; + border-radius: 1.5px; + + box-shadow: 0 1px .5px $color-ddd inset; } .table-loader { @@ -97,11 +100,13 @@ } .table-infos { - height: 150px; - font-size: 12.5px; - padding: 0 2%; - background: #f0f0f0; - box-shadow: 0 -1px $bg-muted-more; + max-height: 150px; + overflow-y: auto; + font-size: 12px; + border: 1.5px solid $color-ddd; + border-radius: 1.5px; + padding: 0 1%; + color: $color-777; .row { padding-top: 3px; @@ -109,32 +114,12 @@ .information { margin-top: 3px; - height: 17px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -webkit-user-select: text; - width: 100%; - float: none; - clear: both; - - .info-x2 { - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - &:nth-child(even) { - margin-left: 3%; - } - &:nth-child(odd) { - max-width: 47%; - } - } b { - color: $color-muted; font-weight: 500; + font-size: 11.5px; + color: $color-222; } a { color: $color-primary; diff --git a/lib/top.pug b/lib/top.pug index b2d794b9..23a7a9bd 100644 --- a/lib/top.pug +++ b/lib/top.pug @@ -1,29 +1,22 @@ .container.top-menu(ng-controller='TopMenuController as topMenu') span(npm-loading) - include ./install-new-package-version.pug - include ./install-new-package.pug .row - .col-xs-4.top-menu-left - span.action-link-disabled(ng-class="{'action-link-disabled': shell.globalDisabled, 'action-link-enabled': !shell.globalDisabled}") - img(src="img/npm-logo-square.svg", class="pull-left") - 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 - button.button-update(type="button", title="Update npm", ng-show="!shell.globalDisabled", ng-click="topMenu.activeClickedLink('update'); shell.updateNpm()") - i.fa.fa-history - | Update - .col-xs-8.top-menu-right - button(title="Add project to be managed",type="button", class="pull-left button-add-project", ng-click="shell.openChooser()") - i.fa.fa-plus-circle - | Project + .col-xs-12 a.pull-right(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") i.fa.fa-cloud-download + | Add package span(ng-show='shell.showMenuButtons') a.pull-right(title="Update", ng-click="topMenu.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '2'}") i.fa.fa-level-up + | Update a.pull-right(title="Install Latest", ng-click="topMenu.activeClickedLink('3'); topMenu.installLatest(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '3'}") i.fa.fa-rocket + | Install latest a.pull-right(title="Install Release", ng-show="shell.currentSelectedPackages.length === 1", ng-click="topMenu.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': topMenu.activeLink === '4'}") i.fa.fa-at + | Install release a.pull-right(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") i.fa.fa-remove + | Uninstall + include ./install-new-package-version.pug + include ./install-new-package.pug From e45fb03d58cf50b7d49889d226ba797f29d746ac Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 11:18:47 +0100 Subject: [PATCH 02/74] test ui going on --- lib/package-informations.pug | 2 +- lib/scss/layout.scss | 11 ++++++++--- lib/scss/table.scss | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/lib/package-informations.pug b/lib/package-informations.pug index 434ce085..61bda18e 100644 --- a/lib/package-informations.pug +++ b/lib/package-informations.pug @@ -1,4 +1,4 @@ -div +div.tale-infos-content div.information b | Name: diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 780c9f4a..5e1dbb33 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -3,22 +3,24 @@ } .right-column { - border-radius: 1.5px; + border-radius: 2px; float: left; margin: 10px 0; padding: 5px 3px; width: calc(100vw - 225px); height: calc(100vh - 33px); background: white; + border: 1px solid $color-ccc; h6 { font-size: 11px; + line-height: 10px; font-weight: 500; } } .left-column { - border-radius: 1.5px; + border-radius: 2px; float: left; height: calc(100vh - 33px); overflow: auto; @@ -26,12 +28,15 @@ padding: 15px; width: 200px; background: white; + box-shadow: -1px -1px 5px $bg-muted-invisible inset; + border: 1px solid $color-ccc; a { display: inline-block; margin: 0; padding: 0 6px; white-space: nowrap; + width: 100%; &:first-child { margin-bottom: 5px; @@ -94,7 +99,7 @@ max-width: 21px; transition: color .11s linear; z-index: 999; - left: -10px; + left: 0; background: none; border: none; line-height: 18px; diff --git a/lib/scss/table.scss b/lib/scss/table.scss index d122dc22..48aec027 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -36,7 +36,7 @@ padding: 0 3px; &:nth-child(odd) { - background: $bg-lighter; + background: $bg-muted-invisible; } &:focus, &:active, &.active { @@ -100,16 +100,16 @@ } .table-infos { - max-height: 150px; - overflow-y: auto; - font-size: 12px; - border: 1.5px solid $color-ddd; - border-radius: 1.5px; - padding: 0 1%; - color: $color-777; - - .row { - padding-top: 3px; + background: $bg-muted-more; + + &.tale-infos-content { + max-height: 120px; + overflow-y: auto; + font-size: 12px; + border: 1.5px solid $color-ddd; + border-radius: 1.5px; + padding: 0 1%; + color: $color-777; } .information { From 6790c47eccd4cee7aa8657a025df453dad87babd Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 11:40:37 +0100 Subject: [PATCH 03/74] going on test-ui --- lib/package-informations.pug | 2 +- lib/scss/layout.scss | 25 +++++++++++++------------ lib/scss/table.scss | 20 ++++++++------------ 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/lib/package-informations.pug b/lib/package-informations.pug index 61bda18e..f3eca137 100644 --- a/lib/package-informations.pug +++ b/lib/package-informations.pug @@ -1,4 +1,4 @@ -div.tale-infos-content +div.table-infos-content div.information b | Name: diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 5e1dbb33..aed5e0fd 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -6,16 +6,17 @@ border-radius: 2px; float: left; margin: 10px 0; - padding: 5px 3px; width: calc(100vw - 225px); height: calc(100vh - 33px); background: white; + overflow-y: hidden; border: 1px solid $color-ccc; h6 { font-size: 11px; line-height: 10px; font-weight: 500; + margin: 5px; } } @@ -54,18 +55,11 @@ width: 9px; z-index: 99; margin-right: -10px; - left: 9px; + left: 16px; background: red; } } - i { - font-size: 14.5px; - margin-right: 2px; - margin-left: 10px; - color: $color-primary; - } - &.shrinkwrapped { i { color: $color-npm; @@ -88,6 +82,13 @@ &.project { + i { + font-size: 14.5px; + margin-right: 2px; + margin-left: 10px; + color: $color-primary; + } + &.active, &:focus { background: $bg-muted-invisible; } @@ -99,15 +100,15 @@ max-width: 21px; transition: color .11s linear; z-index: 999; - left: 0; + left: 6px; background: none; border: none; line-height: 18px; i { color: $color-222; - margin-left: 7px; - vertical-align: top; + margin: 0 auto; + font-size: 13px; } } diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 48aec027..194bbead 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -1,7 +1,7 @@ .table-header { font-size: 12px; line-height: 20px; - margin: 0 auto; + margin: 0 3px; transition: opacity .3s linear; .clickable { @@ -36,7 +36,7 @@ padding: 0 3px; &:nth-child(odd) { - background: $bg-muted-invisible; + background: $bg-lighter; } &:focus, &:active, &.active { @@ -76,12 +76,12 @@ .table-body { //(table - header - table-infos) to calculate height - height: calc(100vh - 140px - 105px); + height: calc(100vh - 143px - 105px); overflow-x: hidden; padding-bottom: 20px; background: white; border-radius: 1.5px; - + margin: 0 3px; box-shadow: 0 1px .5px $color-ddd inset; } @@ -100,17 +100,13 @@ } .table-infos { - background: $bg-muted-more; - - &.tale-infos-content { - max-height: 120px; + background: $bg-light; + max-height: 139px; + padding: 5px; overflow-y: auto; font-size: 12px; - border: 1.5px solid $color-ddd; - border-radius: 1.5px; - padding: 0 1%; color: $color-777; - } + border-top: 1px solid $color-ccc; .information { margin-top: 3px; From 81783525a91ea2196ea9c7ea884f5aa5267e9028 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 11:45:48 +0100 Subject: [PATCH 04/74] going on test-ui --- lib/scss/layout.scss | 12 ++++++------ lib/scss/table.scss | 6 ++++-- lib/scss/variables.scss | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index aed5e0fd..d797bd6e 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -60,12 +60,6 @@ } } - &.shrinkwrapped { - i { - color: $color-npm; - } - } - &:hover { background: $bg-muted-invisible; } @@ -89,6 +83,12 @@ color: $color-primary; } + &.shrinkwrapped { + i { + color: $color-npm; + } + } + &.active, &:focus { background: $bg-muted-invisible; } diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 194bbead..a02daf86 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -80,9 +80,11 @@ overflow-x: hidden; padding-bottom: 20px; background: white; - border-radius: 1.5px; margin: 0 3px; - box-shadow: 0 1px .5px $color-ddd inset; + border-radius: 0 2px 2px 0; + margin: 0 3px; + border: 1px solid #ccc; + border-top: 0; } .table-loader { diff --git a/lib/scss/variables.scss b/lib/scss/variables.scss index 6979179b..8113d809 100644 --- a/lib/scss/variables.scss +++ b/lib/scss/variables.scss @@ -27,7 +27,7 @@ $color-ccc: #ccc; backgrounds */ $bg-header: #dedede; -$bg-light: #f0f0f0; +$bg-light: #f7f7f7; $bg-lighter: #fcfcfc; $bg-muted: rgba(0, 0, 0, .35); $bg-muted-more: rgba(0, 0, 0, .15); From 9f9c9cdfe08144f5ee3f93f1d5783d121550f2e2 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 11:56:03 +0100 Subject: [PATCH 05/74] going on test-ui --- lib/scss/header.scss | 10 +++---- lib/scss/layout.scss | 64 ++++++++++++++++++++--------------------- lib/scss/table.scss | 2 +- lib/scss/variables.scss | 2 +- lib/top.pug | 12 ++++---- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 459be28e..18e0096c 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -14,17 +14,17 @@ margin-right: 6px; } - a, .button-global, .button-update, .button-add-project { + button, .button-global, .button-update, .button-add-project { float: left; font-size: 11.5px; - height: 20.5px; + height: 19px; padding: 0 5px; - line-height: 16.5px; - -webkit-appearance: button; + line-height: 15px; + margin: 5px; i { + margin: 0 3px; color: $color-primary; - vertical-align: baseline; } } diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index d797bd6e..bdfa0fe8 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -60,10 +60,42 @@ } } + i { + font-size: 14.5px; + margin-right: 2px; + margin-left: 10px; + color: $color-primary; + } + + &.shrinkwrapped { + i { + color: $color-npm; + } + } + &:hover { background: $bg-muted-invisible; } + button { + position: absolute; + display: none; + float: left; + max-width: 21px; + transition: color .11s linear; + z-index: 999; + left: 6px; + background: none; + border: none; + line-height: 18px; + + i { + color: $color-222; + margin: 0 auto; + font-size: 12px; + } + } + b { font-weight: normal; white-space: nowrap; @@ -76,42 +108,10 @@ &.project { - i { - font-size: 14.5px; - margin-right: 2px; - margin-left: 10px; - color: $color-primary; - } - - &.shrinkwrapped { - i { - color: $color-npm; - } - } - &.active, &:focus { background: $bg-muted-invisible; } - button { - position: absolute; - display: none; - float: left; - max-width: 21px; - transition: color .11s linear; - z-index: 999; - left: 6px; - background: none; - border: none; - line-height: 18px; - - i { - color: $color-222; - margin: 0 auto; - font-size: 13px; - } - } - &:hover { & button { diff --git a/lib/scss/table.scss b/lib/scss/table.scss index a02daf86..29702ee0 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -102,7 +102,7 @@ } .table-infos { - background: $bg-light; + background: #f8f8f8; max-height: 139px; padding: 5px; overflow-y: auto; diff --git a/lib/scss/variables.scss b/lib/scss/variables.scss index 8113d809..6979179b 100644 --- a/lib/scss/variables.scss +++ b/lib/scss/variables.scss @@ -27,7 +27,7 @@ $color-ccc: #ccc; backgrounds */ $bg-header: #dedede; -$bg-light: #f7f7f7; +$bg-light: #f0f0f0; $bg-lighter: #fcfcfc; $bg-muted: rgba(0, 0, 0, .35); $bg-muted-more: rgba(0, 0, 0, .15); diff --git a/lib/top.pug b/lib/top.pug index 23a7a9bd..fc492346 100644 --- a/lib/top.pug +++ b/lib/top.pug @@ -1,21 +1,21 @@ -.container.top-menu(ng-controller='TopMenuController as topMenu') +.top-menu(ng-controller='TopMenuController as topMenu') span(npm-loading) .row .col-xs-12 - a.pull-right(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") + button(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") i.fa.fa-cloud-download | Add package span(ng-show='shell.showMenuButtons') - a.pull-right(title="Update", ng-click="topMenu.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '2'}") + button(title="Update", ng-click="topMenu.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '2'}") i.fa.fa-level-up | Update - a.pull-right(title="Install Latest", ng-click="topMenu.activeClickedLink('3'); topMenu.installLatest(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '3'}") + button(title="Install Latest", ng-click="topMenu.activeClickedLink('3'); topMenu.installLatest(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '3'}") i.fa.fa-rocket | Install latest - a.pull-right(title="Install Release", ng-show="shell.currentSelectedPackages.length === 1", ng-click="topMenu.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': topMenu.activeLink === '4'}") + button(title="Install Release", ng-show="shell.currentSelectedPackages.length === 1", ng-click="topMenu.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': topMenu.activeLink === '4'}") i.fa.fa-at | Install release - a.pull-right(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") + button(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") i.fa.fa-remove | Uninstall include ./install-new-package-version.pug From 03677a43715282c1827fcf31995a111289bc28ba Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 12:00:25 +0100 Subject: [PATCH 06/74] going on test-ui --- lib/scss/layout.scss | 2 +- lib/scss/table.scss | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index bdfa0fe8..3287ae54 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -6,7 +6,7 @@ border-radius: 2px; float: left; margin: 10px 0; - width: calc(100vw - 225px); + width: calc(100vw - 229px); height: calc(100vh - 33px); background: white; overflow-y: hidden; diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 29702ee0..fbeadb86 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -76,14 +76,13 @@ .table-body { //(table - header - table-infos) to calculate height - height: calc(100vh - 143px - 105px); + height: calc(100vh - 140px - 105px); overflow-x: hidden; padding-bottom: 20px; background: white; margin: 0 3px; border-radius: 0 2px 2px 0; margin: 0 3px; - border: 1px solid #ccc; border-top: 0; } From fd4c87f31d869290420a2845fc275b70d68a887d Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 14:35:58 +0100 Subject: [PATCH 07/74] going on --- lib/footer.pug | 2 ++ lib/scss/footer.scss | 2 +- lib/scss/header.scss | 49 +++++++++++++++++++++++++++++++++++--------- lib/scss/home.scss | 4 ++++ lib/scss/layout.scss | 1 + lib/scss/table.scss | 8 +++++--- lib/top.pug | 14 ++++++------- 7 files changed, 59 insertions(+), 21 deletions(-) diff --git a/lib/footer.pug b/lib/footer.pug index 1ee025a1..7acec39a 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -5,6 +5,8 @@ = " " small | v{{shell.npmCurrentVersionBadge || ' - - -'}} + button + | update 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") diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 24fc9258..e00e85fc 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -3,7 +3,7 @@ bottom: 0; font-weight: normal; height: 18px; - line-height: 16.5px; + line-height: 13px; padding: 0 10px; position: fixed; width: 100%; diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 18e0096c..0d1555ea 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -1,6 +1,7 @@ .top-menu { width: 100%; min-height: 31px; + background: $bg-light; .top-menu-left { width: 200px; @@ -14,24 +15,52 @@ margin-right: 6px; } - button, .button-global, .button-update, .button-add-project { - float: left; + button { + float: right; font-size: 11.5px; - height: 19px; + max-height: 19px; padding: 0 5px; - line-height: 15px; - margin: 5px; + margin: 5px 3px; + + &:last-child { + + margin-right: 0; + } i { - margin: 0 3px; - color: $color-primary; + margin-right: 3px; + color: $color-222; + vertical-align: baseline; + } + + &.button-add-package { + float: left; + border: 0; + margin: 0; + height: auto; + padding: 5px; + background: $bg-muted-invisible; + i { + color: $color-primary; + } + } + + &.button-uninstall { + + i { + color: $color-error; + } + } + + &.button-update { + + i { + color: $color-green; + } } } a { - &.pull-right { - margin-left: 4.5px; - } &:active, &.active { i { diff --git a/lib/scss/home.scss b/lib/scss/home.scss index d03b2ec8..064f8b6a 100644 --- a/lib/scss/home.scss +++ b/lib/scss/home.scss @@ -2,6 +2,10 @@ min-height: 100vh; padding-top: 30vh; text-align: center; + position: relative; + margin-top: -30vh; + z-index: 999; + background: white; button { height: 21px; diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 3287ae54..9d9c9e01 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -11,6 +11,7 @@ background: white; overflow-y: hidden; border: 1px solid $color-ccc; + border-bottom: 0; h6 { font-size: 11px; diff --git a/lib/scss/table.scss b/lib/scss/table.scss index fbeadb86..eeb2b48d 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -1,7 +1,7 @@ .table-header { font-size: 12px; line-height: 20px; - margin: 0 3px; + border-top: 1px solid $color-ddd; transition: opacity .3s linear; .clickable { @@ -80,15 +80,17 @@ overflow-x: hidden; padding-bottom: 20px; background: white; - margin: 0 3px; border-radius: 0 2px 2px 0; - margin: 0 3px; border-top: 0; } .table-loader { min-height: 100vh; padding-top: 30vh; + position: relative; + margin-top: -30vh; + z-index: 999; + background: white; text-align: center; } diff --git a/lib/top.pug b/lib/top.pug index fc492346..64749b0c 100644 --- a/lib/top.pug +++ b/lib/top.pug @@ -2,20 +2,20 @@ span(npm-loading) .row .col-xs-12 - button(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") + button.button-add-package(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") i.fa.fa-cloud-download | Add package span(ng-show='shell.showMenuButtons') - button(title="Update", ng-click="topMenu.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '2'}") + button.button-update(title="Update", ng-click="topMenu.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '2'}") i.fa.fa-level-up | Update - button(title="Install Latest", ng-click="topMenu.activeClickedLink('3'); topMenu.installLatest(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '3'}") + button.button-latest(title="Install Latest", ng-click="topMenu.activeClickedLink('3'); topMenu.installLatest(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '3'}") i.fa.fa-rocket - | Install latest - button(title="Install Release", ng-show="shell.currentSelectedPackages.length === 1", ng-click="topMenu.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': topMenu.activeLink === '4'}") + | Latest + button.button-version(title="Install Version", ng-show="shell.currentSelectedPackages.length === 1", ng-click="topMenu.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': topMenu.activeLink === '4'}") i.fa.fa-at - | Install release - button(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") + | Version + button.button-uninstall(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") i.fa.fa-remove | Uninstall include ./install-new-package-version.pug From 480ba0b94ce15025a35be45026e76f020860bf1b Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 14:42:48 +0100 Subject: [PATCH 08/74] going on --- lib/scss/header.scss | 12 ++++++++---- lib/scss/home.scss | 2 +- lib/scss/table.scss | 3 ++- lib/top.pug | 10 +++++----- package.json | 8 ++++---- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 0d1555ea..1da9b433 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -15,7 +15,11 @@ margin-right: 6px; } - button { + .button-add-package, + .button-update, + .button-uninstall, + .button-version, + .button-latest { float: right; font-size: 11.5px; max-height: 19px; @@ -36,9 +40,9 @@ &.button-add-package { float: left; border: 0; - margin: 0; - height: auto; - padding: 5px; + margin: 0 auto; + max-height: auto; + height: 30px; background: $bg-muted-invisible; i { color: $color-primary; diff --git a/lib/scss/home.scss b/lib/scss/home.scss index 064f8b6a..0da44326 100644 --- a/lib/scss/home.scss +++ b/lib/scss/home.scss @@ -1,6 +1,6 @@ .home { min-height: 100vh; - padding-top: 30vh; + padding-top: 40vh; text-align: center; position: relative; margin-top: -30vh; diff --git a/lib/scss/table.scss b/lib/scss/table.scss index eeb2b48d..b4c6bf41 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -2,6 +2,7 @@ font-size: 12px; line-height: 20px; border-top: 1px solid $color-ddd; + margin: 0 auto; transition: opacity .3s linear; .clickable { @@ -86,7 +87,7 @@ .table-loader { min-height: 100vh; - padding-top: 30vh; + padding-top: 40vh; position: relative; margin-top: -30vh; z-index: 999; diff --git a/lib/top.pug b/lib/top.pug index 64749b0c..a1c29f15 100644 --- a/lib/top.pug +++ b/lib/top.pug @@ -1,4 +1,6 @@ .top-menu(ng-controller='TopMenuController as topMenu') + include ./install-new-package-version.pug + include ./install-new-package.pug span(npm-loading) .row .col-xs-12 @@ -6,6 +8,9 @@ i.fa.fa-cloud-download | Add package span(ng-show='shell.showMenuButtons') + button.button-uninstall(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") + i.fa.fa-remove + | Uninstall button.button-update(title="Update", ng-click="topMenu.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '2'}") i.fa.fa-level-up | Update @@ -15,8 +20,3 @@ button.button-version(title="Install Version", ng-show="shell.currentSelectedPackages.length === 1", ng-click="topMenu.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': topMenu.activeLink === '4'}") i.fa.fa-at | Version - button.button-uninstall(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") - i.fa.fa-remove - | Uninstall - include ./install-new-package-version.pug - include ./install-new-package.pug diff --git a/package.json b/package.json index 873b205a..bc59c2d2 100644 --- a/package.json +++ b/package.json @@ -92,10 +92,10 @@ }, "appTemplate": { "title": "ndm", - "width": 620, - "height": 410, - "minWidth": 620, - "minHeight": 410, + "width": 680, + "height": 460, + "minWidth": 680, + "minHeight": 460, "show": false, "center": true, "movable": true, From 74a1532df2f8445cb70a035c258addcc27538669 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 14:51:30 +0100 Subject: [PATCH 09/74] going on --- lib/scss/footer.scss | 4 ++-- lib/scss/header.scss | 5 +---- lib/scss/home.scss | 2 +- lib/scss/table.scss | 6 +++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index e00e85fc..010248e1 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -2,8 +2,8 @@ -webkit-app-region: drag; bottom: 0; font-weight: normal; - height: 18px; - line-height: 13px; + height: 19px; + line-height: 0; padding: 0 10px; position: fixed; width: 100%; diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 1da9b433..ac927c66 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -21,8 +21,7 @@ .button-version, .button-latest { float: right; - font-size: 11.5px; - max-height: 19px; + font-size: 12px; padding: 0 5px; margin: 5px 3px; @@ -41,8 +40,6 @@ float: left; border: 0; margin: 0 auto; - max-height: auto; - height: 30px; background: $bg-muted-invisible; i { color: $color-primary; diff --git a/lib/scss/home.scss b/lib/scss/home.scss index 0da44326..4d431d4b 100644 --- a/lib/scss/home.scss +++ b/lib/scss/home.scss @@ -1,6 +1,6 @@ .home { min-height: 100vh; - padding-top: 40vh; + padding-top: 54vh; text-align: center; position: relative; margin-top: -30vh; diff --git a/lib/scss/table.scss b/lib/scss/table.scss index b4c6bf41..d0e2c4bf 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -77,7 +77,7 @@ .table-body { //(table - header - table-infos) to calculate height - height: calc(100vh - 140px - 105px); + height: calc(100vh - 130px - 105px); overflow-x: hidden; padding-bottom: 20px; background: white; @@ -87,7 +87,7 @@ .table-loader { min-height: 100vh; - padding-top: 40vh; + padding-top: 54vh; position: relative; margin-top: -30vh; z-index: 999; @@ -104,7 +104,7 @@ } .table-infos { - background: #f8f8f8; + background: $bg-light; max-height: 139px; padding: 5px; overflow-y: auto; From cd34ce4aee494ae58b25d60a1d06ff4acd5b2210 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 14:56:53 +0100 Subject: [PATCH 10/74] going on --- lib/scss/header.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/scss/header.scss b/lib/scss/header.scss index ac927c66..079da3e7 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -22,16 +22,15 @@ .button-latest { float: right; font-size: 12px; - padding: 0 5px; + padding: 1px 5px 1.5px 0; margin: 5px 3px; - &:last-child { + &:first-child { margin-right: 0; } i { - margin-right: 3px; color: $color-222; vertical-align: baseline; } From 82f69a42cac18e35a6248c6a3ebce3f44c4dfd45 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 14:58:42 +0100 Subject: [PATCH 11/74] going on --- lib/scss/header.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 079da3e7..a798aaf1 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -22,12 +22,12 @@ .button-latest { float: right; font-size: 12px; - padding: 1px 5px 1.5px 0; + padding: .5px 5px 1px 0; margin: 5px 3px; - &:first-child { + &:last-child { - margin-right: 0; + margin-left: 0; } i { @@ -39,6 +39,7 @@ float: left; border: 0; margin: 0 auto; + padding: 5px; background: $bg-muted-invisible; i { color: $color-primary; From 38471d31f9e3a93db25500dca663589b9cafc3bf Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:04:30 +0100 Subject: [PATCH 12/74] going on --- lib/scss/header.scss | 9 ++++++++- lib/scss/table.scss | 1 - lib/top.pug | 2 +- package.json | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/scss/header.scss b/lib/scss/header.scss index a798aaf1..f39cd29b 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -2,6 +2,7 @@ width: 100%; min-height: 31px; background: $bg-light; + border-bottom: 1px solid $color-ddd; .top-menu-left { width: 200px; @@ -39,11 +40,17 @@ float: left; border: 0; margin: 0 auto; - padding: 5px; + padding: 5px 6px 5px 5px; background: $bg-muted-invisible; + i { + margin-right: 2px; color: $color-primary; } + + &:active, &:focus { + background: $bg-muted-invisible; + } } &.button-uninstall { diff --git a/lib/scss/table.scss b/lib/scss/table.scss index d0e2c4bf..841ed8ed 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -1,7 +1,6 @@ .table-header { font-size: 12px; line-height: 20px; - border-top: 1px solid $color-ddd; margin: 0 auto; transition: opacity .3s linear; diff --git a/lib/top.pug b/lib/top.pug index a1c29f15..f266b379 100644 --- a/lib/top.pug +++ b/lib/top.pug @@ -5,7 +5,7 @@ .row .col-xs-12 button.button-add-package(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") - i.fa.fa-cloud-download + i.fa.fa-circle-plus | Add package span(ng-show='shell.showMenuButtons') button.button-uninstall(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") diff --git a/package.json b/package.json index bc59c2d2..60710cfb 100644 --- a/package.json +++ b/package.json @@ -92,9 +92,9 @@ }, "appTemplate": { "title": "ndm", - "width": 680, + "width": 650, "height": 460, - "minWidth": 680, + "minWidth": 650, "minHeight": 460, "show": false, "center": true, From 554a2e457d3b6689340d8ae33e223574a1d7e205 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:05:19 +0100 Subject: [PATCH 13/74] going on --- lib/top.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/top.pug b/lib/top.pug index f266b379..2197116c 100644 --- a/lib/top.pug +++ b/lib/top.pug @@ -5,7 +5,7 @@ .row .col-xs-12 button.button-add-package(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") - i.fa.fa-circle-plus + i.fa.fa-plus-circle | Add package span(ng-show='shell.showMenuButtons') button.button-uninstall(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") From 4ac8c642f9eda8200ee5647114721642a3cb5edd Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:08:07 +0100 Subject: [PATCH 14/74] going on --- lib/scss/header.scss | 14 ++++---------- package.json | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/scss/header.scss b/lib/scss/header.scss index f39cd29b..0d290c9a 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -1,6 +1,5 @@ .top-menu { width: 100%; - min-height: 31px; background: $bg-light; border-bottom: 1px solid $color-ddd; @@ -24,12 +23,7 @@ float: right; font-size: 12px; padding: .5px 5px 1px 0; - margin: 5px 3px; - - &:last-child { - - margin-left: 0; - } + margin: 5px 3px 0 0; i { color: $color-222; @@ -40,15 +34,15 @@ float: left; border: 0; margin: 0 auto; - padding: 5px 6px 5px 5px; - background: $bg-muted-invisible; + padding: 6px 6px 4px 5px; + background: none; i { margin-right: 2px; color: $color-primary; } - &:active, &:focus { + &:active { background: $bg-muted-invisible; } } diff --git a/package.json b/package.json index 60710cfb..1b415fd1 100644 --- a/package.json +++ b/package.json @@ -93,9 +93,9 @@ "appTemplate": { "title": "ndm", "width": 650, - "height": 460, + "height": 430, "minWidth": 650, - "minHeight": 460, + "minHeight": 430, "show": false, "center": true, "movable": true, From d0f6ae439a77ac4c18288685b5eceb1237f0be26 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:15:56 +0100 Subject: [PATCH 15/74] going on --- lib/left.pug | 2 +- lib/scss/header.scss | 4 ++-- lib/scss/layout.scss | 18 +++--------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/left.pug b/lib/left.pug index d6b436b6..94bebee1 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -8,10 +8,10 @@ div(ng-controller='LeftBarController as leftBar') | Globals div(ng-repeat='item in shell.projects track by $index') a.row.project(title="{{ item.shrinkwrap ? 'Shrinkwrap enabled' : item.path }}", ng-right-click="leftBar.rightClickMenu(item, $event)", ng-class="{'active': leftBar.selectedProject === item && !leftBar.global, 'shrinkwrapped': item.shrinkwrap}", ng-if="leftBar.removedProject !== item", ng-click='leftBar.selectProject(item, $event)') - img(class="shrinkwrap-img", src="img/lock.svg", ng-if="item.shrinkwrap") button(ng-click='leftBar.deleteProject(item, $event)') i.fa.fa-times-circle-o i.fa.fa-folder-o + i.fa.fa-times-circle-o(ng-if="item.shrinkwrap") | {{item.dirName}} div(ng-init="leftBar.cancelProgressActionId = false;") .left-progress.left-progress-minor.color-white.fake-link(ng-repeat="runningScript in leftBar.npmRunningScriptsProject[item.path] track by $index") diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 0d290c9a..7421be45 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -23,7 +23,7 @@ float: right; font-size: 12px; padding: .5px 5px 1px 0; - margin: 5px 3px 0 0; + margin: 4px 4px 0 0; i { color: $color-222; @@ -34,7 +34,7 @@ float: left; border: 0; margin: 0 auto; - padding: 6px 6px 4px 5px; + padding: 5px; background: none; i { diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 9d9c9e01..a024f269 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -35,14 +35,11 @@ a { display: inline-block; - margin: 0; + margin: 0 auto; padding: 0 6px; white-space: nowrap; width: 100%; - - &:first-child { - margin-bottom: 5px; - } + line-height: 22px; img { &.global-img { @@ -50,15 +47,6 @@ margin-right: 3px; margin-top: -3px; } - //for when project has npm-shrinkwrap.json inside - &.shrinkwrap-img { - position: relative; - width: 9px; - z-index: 99; - margin-right: -10px; - left: 16px; - background: red; - } } i { @@ -69,7 +57,7 @@ } &.shrinkwrapped { - i { + i:last-child { color: $color-npm; } } From 610f527f8e2452e2d3b491980a787766aeda9f00 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:19:35 +0100 Subject: [PATCH 16/74] going on --- lib/icons/fontello/LICENSE.txt | 9 + lib/icons/fontello/config.json | 24 +- lib/icons/fontello/css/fontello-codes.css | 2 +- lib/icons/fontello/css/fontello-embedded.css | 14 +- lib/icons/fontello/css/fontello-ie7-codes.css | 2 +- lib/icons/fontello/css/fontello-ie7.css | 2 +- lib/icons/fontello/css/fontello.css | 16 +- lib/icons/fontello/font/fontello.eot | Bin 11240 -> 11360 bytes lib/icons/fontello/font/fontello.svg | 4 +- lib/icons/fontello/font/fontello.ttf | Bin 11072 -> 11192 bytes lib/icons/fontello/font/fontello.woff | Bin 6624 -> 6724 bytes lib/icons/fontello/font/fontello.woff2 | Bin 5580 -> 5692 bytes lib/img/lock.svg | 2744 ----------------- lib/img/npm-logo-black.svg | 84 - lib/img/npm-logo-square.svg | 1 - lib/left.pug | 2 +- 16 files changed, 42 insertions(+), 2862 deletions(-) delete mode 100644 lib/img/lock.svg delete mode 100644 lib/img/npm-logo-black.svg delete mode 100644 lib/img/npm-logo-square.svg diff --git a/lib/icons/fontello/LICENSE.txt b/lib/icons/fontello/LICENSE.txt index 61ddfd4c..3836ce0c 100755 --- a/lib/icons/fontello/LICENSE.txt +++ b/lib/icons/fontello/LICENSE.txt @@ -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/ + + diff --git a/lib/icons/fontello/config.json b/lib/icons/fontello/config.json index b8bb0a87..a533ff12 100755 --- a/lib/icons/fontello/config.json +++ b/lib/icons/fontello/config.json @@ -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", @@ -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" } ] } \ No newline at end of file diff --git a/lib/icons/fontello/css/fontello-codes.css b/lib/icons/fontello/css/fontello-codes.css index 46453051..037d304a 100755 --- a/lib/icons/fontello/css/fontello-codes.css +++ b/lib/icons/fontello/css/fontello-codes.css @@ -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'; } /* '' */ diff --git a/lib/icons/fontello/css/fontello-embedded.css b/lib/icons/fontello/css/fontello-embedded.css index 9f71e960..d52409b1 100755 --- a/lib/icons/fontello/css/fontello-embedded.css +++ b/lib/icons/fontello/css/fontello-embedded.css @@ -1,15 +1,15 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?12485917'); - src: url('../font/fontello.eot?12485917#iefix') format('embedded-opentype'), - url('../font/fontello.svg?12485917#fontello') format('svg'); + src: url('../font/fontello.eot?53466719'); + src: url('../font/fontello.eot?53466719#iefix') format('embedded-opentype'), + url('../font/fontello.svg?53466719#fontello') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'fontello'; - src: url('data:application/octet-stream;base64,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') format('woff'), - url('data:application/octet-stream;base64,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Jg8BIg8BFSYnIi4BDgEPASY2JgYPAQY2BhUOARUuATceARcWBwYHBhcUBhYBrXTGcnLG6MhuBnq8ARMCCAMBAgQDERUTCgEMAggGAwEHBgQECgUGBAEIAQIBAwMEBAQEBgEGAggJBQQGAgQDAQgMAQUcBAMCAgEIAQ4BAgcJAwQEAQQCAwEHCgIEBQ0DAxQOEwQIBgECAQIFCQIBEwkGBAIFBgoDCAQHBQIDBgkEBgEFCQQFAwMCBQQBDgcLDwQQAwMBCAQIAQgDAQgEAwICAwQCBBIFAwwMAQMDAgwZGwMGBQUTBQMLBA0LAQQCBgQIBAkEUTIEBQIGBQMBGAoBAgcFBAMEBAQBAgEBAQIKBwcSBAcJBAMIBAIOAQECAg4CBAICDwgDBAMCAwUBBAoKAQQIBAUMBwIDCAMJBxYGBgUICBAEFAoBAgQCBgMOAwQBCgUIEQoCAgICAQUCBAEKAgMMAwIIAQIIAwEDAgcLBAECAggUAwgKAQIBBAIDBQIBAwIBAwEEGAMJAwEBAQMNAg4EAgMBBAMFAgYIBAICAQgEBAcIBQcMBAQCAgIGAQUEAwIDBQwEAhIBBAICBQ4JAgIKCAUJAgYGBwUJDAppc1ABDAENAQQDFQEDBQIDAgIBBQwIAwYGBgYBAQQIBAoBBwYCCgIEAQwBAQICBAsPAQIJCgEDC3TE6sR0dMTqxHT+3QEIAgYGAQQIAwULAQwBAwICDAEKBwIDBAIEAQIGDAUGAwMCBAEBAwMEAgQBAwMCAggEAgYEAQMEAQQEBgcDCAcKBwQFBgUMAwECBAIBAwwJDgMEBQcIBQMRAgMOCAUMAwEDCQkGBAMGAQ4ECgQBAgUCAgYKBAcHBwEJBQgHCAMCBwMCBAIGAgQFCgMDDgIFAgIFBAcCAQoIDwIDAwcDAg4DAgMEBgQGBAQBAS1PBAEIBAMEBg8KAgYEBQQFDgkUCwIBBhoCARcFBAYDBRQDAxAFAgEECAUIBAELGA0FDAICBAQMCA4EDgEKCxQHCAEFAw0CAQIBEgMKBAQJBQYCAwoDAgMFDAIQCBIDAwQEBgIECgcOAQUCBAEEAgIQBQ8FAgUDAgsCCAQEAgIEGA4JDgUJAQQGAQIDAgEEAwYHBgUCDwoBBAECAwECAwgFFwQCCAgDBQ4CCgoFAQIDBAsJBQICAgIGAgoGCgQEBAMBBAoEBgEH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AiVHI0cjYSCwBSWwBCVHI0cjYbAGJbAFJUmwAiVhuQgACABjYyMgWGIbIVljuAQAYiCwAFBYsEBgWWawAWNgIy4jICA8ijgjIVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKyAAEAKrEABUKzCgIBCCqxAAVCsw4AAQgqsQAGQroCwAABAAkqsQAHQroAQAABAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbMMAgEMKrgB/4WwBI2xAgBEAAA=') format('truetype'); + src: url('data:application/octet-stream;base64,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') format('woff'), + url('data:application/octet-stream;base64,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JyIuAQ4BDwEmNiYGDwEGNgYVDgEVLgE3HgEXFgcGBwYXFAYWAa10xnJyxujIbgZ6vAETAggDAQIEAxEVEwoBDAIIBgMBBwYEBAoFBgQBCAECAQMDBAQEBAYBBgIICQUEBgIEAwEIDAEFHAQDAgIBCAEOAQIHCQMEBAEEAgMBBwoCBAUNAwMUDhMECAYBAgECBQkCARMJBgQCBQYKAwgEBwUCAwYJBAYBBQkEBQMDAgUEAQ4HCw8EEAMDAQgECAEIAwEIBAMCAgMEAgQSBQMMDAEDAwIMGRsDBgUFEwUDCwQNCwEEAgYECAQJBFEyBAUCBgUDARgKAQIHBQQDBAQEAQIBAQECCgcHEgQHCQQDCAQCDgEBAgIOAgQCAg8IAwQDAgMFAQQKCgEECAQFDAcCAwgDCQcWBgYFCAgQBBQKAQIEAgYDDgMEAQoFCBEKAgICAgEFAgQBCgIDDAMCCAECCAMBAwIHCwQBAgIIFAMICgECAQQCAwUCAQMCAQMBBBgDCQMBAQEDDQIOBAIDAQQDBQIGCAQCAgEIBAQHCAUHDAQEAgICBgEFBAMCAwUMBAISAQQCAgUOCQICCggFCQIGBgcFCQwKaXNQAQwBDQEEAxUBAwUCAwICAQUMCAMGBgYGAQEECAQKAQcGAgoCBAEMAQECAgQLDwECCQoBAwt0xOrEdHTE6sR0/t0BCAIGBgEECAMFCwEMAQMCAgwBCgcCAwQCBAECBgwFBgMDAgQBAQMDBAIEAQMDAgIIBAIGBAEDBAEEBAYHAwgHCgcEBQYFDAMBAgQCAQMMCQ4DBAUHCAUDEQIDDggFDAMBAwkJBgQDBgEOBAoEAQIFAgIGCgQHBwcBCQUIBwgDAgcDAgQCBgIEBQoDAw4CBQICBQQHAgEKCA8CAwMHAwIOAwIDBAYEBgQEAQEtTwQBCAQDBAYPCgIGBAUEBQ4JFAsCAQYaAgEXBQQGAwUUAwMQBQIBBAgFCAQBCxgNBQwCAgQEDAgOBA4BCgsUBwgBBQMNAgECARIDCgQECQUGAgMKAwIDBQwCEAgSAwMEBAYCBAoHDgEFAgQBBAICEAUPBQIFAwILAggEBAICBBgOCQ4FCQEEBgECAwIBBAMGBwYFAg8KAQQBAgMBAgMIBRcEAggIAwUOAgoKBQECAwQLCQUCAgICBgIKBgoEBAQDAQQKBAYBBwIBBwYFBAID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QGBZZrABY7AEJmEgsAQlYGQjsAMlYGRQWCEbIyFZIyAgsAQmI0ZhOFktsDcssAAWICAgsAUmIC5HI0cjYSM8OC2wOCywABYgsAgjQiAgIEYjR7ABKyNhOC2wOSywABawAyWwAiVHI0cjYbAAVFguIDwjIRuwAiWwAiVHI0cjYSCwBSWwBCVHI0cjYbAGJbAFJUmwAiVhuQgACABjYyMgWGIbIVljuAQAYiCwAFBYsEBgWWawAWNgIy4jICA8ijgjIVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKyAAEAKrEABUKzCgIBCCqxAAVCsw4AAQgqsQAGQroCwAABAAkqsQAHQroAQAABAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbMMAgEMKrgB/4WwBI2xAgBEAAA=') format('truetype'); } /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ @@ -17,7 +17,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?12485917#fontello') format('svg'); + src: url('../font/fontello.svg?53466719#fontello') format('svg'); } } */ @@ -62,11 +62,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'; } /* '' */ diff --git a/lib/icons/fontello/css/fontello-ie7-codes.css b/lib/icons/fontello/css/fontello-ie7-codes.css index 9c7bfec7..d26f869f 100755 --- a/lib/icons/fontello/css/fontello-ie7-codes.css +++ b/lib/icons/fontello/css/fontello-ie7-codes.css @@ -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 = ' '); } diff --git a/lib/icons/fontello/css/fontello-ie7.css b/lib/icons/fontello/css/fontello-ie7.css index 6c9ab479..5d82864a 100755 --- a/lib/icons/fontello/css/fontello-ie7.css +++ b/lib/icons/fontello/css/fontello-ie7.css @@ -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 = ' '); } diff --git a/lib/icons/fontello/css/fontello.css b/lib/icons/fontello/css/fontello.css index 8dd76d80..87d032ca 100755 --- a/lib/icons/fontello/css/fontello.css +++ b/lib/icons/fontello/css/fontello.css @@ -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; } @@ -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'); } } */ @@ -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'; } /* '' */ diff --git a/lib/icons/fontello/font/fontello.eot b/lib/icons/fontello/font/fontello.eot index f53741ba7a6f8a9cc25a4740b83b0f07fa652f2f..e92cdcba0a16db8751689d024733dfe95a03b1c4 100755 GIT binary patch delta 890 zcmX|9OH30{6us}wOlSH7L|U2_`vVG6tc2+Yp|v0=)cA|hg2Y5>g*HlI!bkBFh^!PB zTFXLXh%AUPCL|_Jj0+aTg|d*1K^F#z8%;Gap@|wX>UdkClXr67IrrWB?#tXv=ld?M zrxxI8lJl{q>7M0e^Noo~0CEHX!qG%T8uhi+pneEIm!juKtcuq%3t*YWxV2A;C8mO06ntp8$P`s$$@04)0Y1M%L-8O_vP0$^OgxHpal?`NW@zoM>) zCq~9vE`;Te044((UHya6$icb2mr&;lyAqKxiG;PcQO}~b4nz{YFK4z{P%mPG%hKTR z$hG-z*8$A8uxW)f)GK{xapGmpy3{P`rgS6qi^N(N0DHji2{8FxEwTy|7J!8*^h@v! z46qs1`t15zc1zZi?Z_@>-)4WxGC&5K!d!x z3D6?H+XNIKujPM= z0v85O;P!jHc6-Z2v$xUP*x=hyYj@ZkTa6}znlm_wzErO(;R}ep%0)bGug~M&P3p}= zXVZC0J#L3x!FbAf3#mf*%5|kd!Xv75qHiZDMew4hs*v~)WXYk|S5{m}1_K>64zaT@ zT>t0Gv2L;5U2e=$gp7q`;%jP5XJU+$SUohtNy12vPu{{<`0 zY99Y%`L}$Q`J5^+83g7NiVYMl)9zww1Yl0cGHuEMhpj0!ZW3*$`E|i9oD?R7Ii*6` npA8sxKMewpH z)O8U>WEX`67P11t3W;4rSV+`eN(9Dkgxv%M+SfZJ4$u3X=XuUKyyu+nLzzK7;{b5a z^R295ZGC0leRJkM0O*kCgH2b0E{-wO_$VQ_3=<7KG}V1 zK-)p%E*eAOsLy-mXZK6gS=6-=@1#o3>Ucoi>2$mXu&*W;$p}Y_lY1msmj;5{0p0>VnAIT5xFHP;@NiJ@4itopF1wiB z&h94XIE6!c!kP8B3S%3Nn$#!mJ#l6i0dfG0vfmB?dB|IbfPCcbLqGxYZVsspww#~Z zI_lyYusrNc)|-L!Vw^p0F3~T4e(?XC}Y$El(HdU zl=WI|PNl?Z5qX1yG*>%FORiXiN@BGLB}Sq&b`U3DB8X;7b!)S;^+dC?sZlAzGNP20 zh*gC9AWPG-7#8JeN#@ghA%X;^M)n^C?~t=yWGOK?XSTJpdCGdulU_+qOR_Ab<=iqp zEhL7g$U>-Rs;WG(bg|FsX>(YL5|FA;`gzOB`dY(NFYi{sG45 B%)kHu diff --git a/lib/icons/fontello/font/fontello.svg b/lib/icons/fontello/font/fontello.svg index 4564c14c..92521036 100755 --- a/lib/icons/fontello/font/fontello.svg +++ b/lib/icons/fontello/font/fontello.svg @@ -26,6 +26,8 @@ + + @@ -34,8 +36,6 @@ - - diff --git a/lib/icons/fontello/font/fontello.ttf b/lib/icons/fontello/font/fontello.ttf index 3c6931d6a54edffb54f32ccef1be52d82ac90229..0dfd6ba1a590f28300b8e779e03162089517840c 100755 GIT binary patch delta 907 zcmY*XOH30{6us}wOlRnakI+I2PD_D;6boVcL1?K36l(kuET5Q2tv~}5CVUh>36X_S zTnN^ME{rUQaYJI##JFHVTo@LzQx*oO)lNSp0LDd(yCP`t9wvN(Wrp-{Bv{j?PLqt2$wlyzvowRa5oFnFFq9PEp7nWK%B@m+Z?Jmrds~;(?8v#O z)lS>OUY$7W5kzhQir*^J#a)*qrqG&&W9)+K?%SQlG0N`+VWEx{pN5~hUtG*wzl l+PZp3W8E(T2C@U{czOPFhQ&c2h%Ji+u^*y6ZZZ{W{{jsy;f??R delta 775 zcmXw1T}V@57=FL=oj=bsf0|PodiEo0IMe*uywIlUg@Z&)#{9V`*EY9g#~pMn14ZyM z2-J1a50PC2CP>H%gnp1X7ZC*#bra@AV0a^J7lB1~de`V2p6@x&^Ss~3`+eWp8r}{p z*%$5ukU;NNmnCzMKB_|G~EAUiR)OsG-i=JL`gY9D|>jRt2_^vh6N zki}^H#>B^Yz?_{0sMKPSV7U0z#wNh2PRueTF)Vx={(vs^ntH3V_*y+A=9{anPOV)TwEH_;w(=BYrYncIp3UtS&6i6%e}I7=;4#6ct>@x@ z){pf`-1-n|5tzJ-4_+1>(kJmRYQh|kCe53@6?9bBnT|a0=8@T^bimwd^$Lr^y09a9 z#c}aX5nFUms+YbM76B7E0xq*|en`^;vbpp`D4w_$J`+w{pNc1f;q+CxF>_azi~j-~ CV9O8y diff --git a/lib/icons/fontello/font/fontello.woff b/lib/icons/fontello/font/fontello.woff index cf254aec8238113c89e48eb69ec3d607b0ef57d8..66332ccd30fb0512247bd965e504beb5f1d3ee61 100755 GIT binary patch delta 4609 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 delta 4508 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 literal 5580 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 a*2fjY;p248+lrx@eo6hwgj?3e;Q# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - lock - July 2008 - - - Beate Kaspar - - - - - Beate Kaspar - - - - - RRZE - - - - - lock - security - encryption - vpn - secure - safe - SSL - - - - - Hendrik Eggers, Franziska Sponsel - - - uses <http://webcvs.freedesktop.org/tango/tango-icon-theme/scalable/actions/system-lock-screen.svg> - - - - - - - - - - - - - - - - - diff --git a/lib/img/npm-logo-black.svg b/lib/img/npm-logo-black.svg deleted file mode 100644 index 28554a80..00000000 --- a/lib/img/npm-logo-black.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - image/svg+xml - - npm-logo - - - - - npm-logo - Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - - - - diff --git a/lib/img/npm-logo-square.svg b/lib/img/npm-logo-square.svg deleted file mode 100644 index c612a22c..00000000 --- a/lib/img/npm-logo-square.svg +++ /dev/null @@ -1 +0,0 @@ -n \ No newline at end of file diff --git a/lib/left.pug b/lib/left.pug index 94bebee1..e1b72206 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -11,7 +11,7 @@ div(ng-controller='LeftBarController as leftBar') button(ng-click='leftBar.deleteProject(item, $event)') i.fa.fa-times-circle-o i.fa.fa-folder-o - i.fa.fa-times-circle-o(ng-if="item.shrinkwrap") + i.fa.fa-lock(ng-if="item.shrinkwrap") | {{item.dirName}} div(ng-init="leftBar.cancelProgressActionId = false;") .left-progress.left-progress-minor.color-white.fake-link(ng-repeat="runningScript in leftBar.npmRunningScriptsProject[item.path] track by $index") From 7fa4da781fa7babdef90de57053cc88aff428e9c Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:21:03 +0100 Subject: [PATCH 17/74] going on --- lib/scss/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index a024f269..13173482 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -57,7 +57,7 @@ } &.shrinkwrapped { - i:last-child { + i.fa-lock { color: $color-npm; } } From 1a5785b198fc6fb52a47e28713fff53c998706aa Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:23:07 +0100 Subject: [PATCH 18/74] going on --- lib/scss/layout.scss | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 13173482..806b7e64 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -57,8 +57,16 @@ } &.shrinkwrapped { - i.fa-lock { - color: $color-npm; + + i { + &.fa-lock { + color: $color-222; + margin:0 auto; + } + + &.fa-folder-o { + color: $color-npm; + } } } From 80f00cde3234f0e078e255cc06e51ac5019002ae Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:30:37 +0100 Subject: [PATCH 19/74] going on --- lib/scss/layout.scss | 6 ++++-- lib/scss/prompt.scss | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 806b7e64..ac3e1474 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -52,7 +52,7 @@ i { font-size: 14.5px; margin-right: 2px; - margin-left: 10px; + margin-left: 14px; color: $color-primary; } @@ -60,8 +60,10 @@ i { &.fa-lock { - color: $color-222; + color: $color-333; margin:0 auto; + margin-left:-4px; + font-size: 11.5px; } &.fa-folder-o { diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index cbef5e7d..8f84450d 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -1,5 +1,5 @@ .dialog { - background: $bg-header; + background: $bg-light; border-radius: $border-radius-prompt; box-shadow: 1px .5px 3px rgba(0, 0, 0, .29), -.5px .5px .5px rgba(0, 0, 0, .2); float: none; From 833d08dd916f6a5496180657d7aec49e43108d05 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:31:06 +0100 Subject: [PATCH 20/74] going on --- lib/scss/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index ac3e1474..322a796e 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -60,7 +60,7 @@ i { &.fa-lock { - color: $color-333; + color: $color-444; margin:0 auto; margin-left:-4px; font-size: 11.5px; From e1c2869fac2c5957432941b964d3c09e879e5949 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:38:51 +0100 Subject: [PATCH 21/74] going on --- lib/scss/prompt.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index 8f84450d..6a1ba8f5 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -119,13 +119,13 @@ } &.dialog-window { - height: calc(100vh - 23px - 33px); + height: 90vh; position: fixed; left: 200px; border: 0; box-shadow: none; - top: 31px; - width: calc(100vw - 199px); + top: 11px; + width: calc(100vw - 231px); padding: 0; border-radius: 0; background: white; @@ -202,7 +202,7 @@ margin: 0 auto; line-height: 25px; float: none; - height: 27px; + height: 30px; i { margin-left: 0; @@ -214,9 +214,9 @@ button { height: 19.5px; line-height: 13.5px; - font-size: 12.5px; + font-size: 12px; float: right; - margin-top: 2px; + margin-top: 4px; } img { From 7b8d9eb292e98538cfbe10f0b06f2a5edb3e0d7d Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:41:07 +0100 Subject: [PATCH 22/74] going on --- lib/scss/prompt.scss | 2 +- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index 6a1ba8f5..efa3ab3d 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -216,7 +216,7 @@ line-height: 13.5px; font-size: 12px; float: right; - margin-top: 4px; + margin-top: 3px; } img { diff --git a/package.json b/package.json index 1b415fd1..7eeba545 100644 --- a/package.json +++ b/package.json @@ -92,10 +92,10 @@ }, "appTemplate": { "title": "ndm", - "width": 650, - "height": 430, - "minWidth": 650, - "minHeight": 430, + "width": 630, + "height": 410, + "minWidth": 630, + "minHeight": 410, "show": false, "center": true, "movable": true, From 2aba92caa89fd0ea449557e4259dbe32f0b4aa59 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 15:44:27 +0100 Subject: [PATCH 23/74] going on --- lib/scss/header.scss | 3 +-- lib/scss/layout.scss | 1 + package.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 7421be45..8387146b 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -34,11 +34,10 @@ float: left; border: 0; margin: 0 auto; - padding: 5px; + padding: 5px 6px 5px 2px; background: none; i { - margin-right: 2px; color: $color-primary; } diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 322a796e..0143f7da 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -92,6 +92,7 @@ color: $color-222; margin: 0 auto; font-size: 12px; + margin-left: 3px; } } diff --git a/package.json b/package.json index 7eeba545..2ef2a2e5 100644 --- a/package.json +++ b/package.json @@ -92,10 +92,10 @@ }, "appTemplate": { "title": "ndm", - "width": 630, - "height": 410, - "minWidth": 630, - "minHeight": 410, + "width": 640, + "height": 420, + "minWidth": 640, + "minHeight": 420, "show": false, "center": true, "movable": true, From 38ad9e69ddb17800f6df378c53f08c02d7b17234 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:10:20 +0100 Subject: [PATCH 24/74] going on --- lib/scss/table.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 841ed8ed..e085ab8d 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -11,10 +11,13 @@ } div { - background: $bg-light; - box-shadow: -1px -1px $color-ddd inset; + background: $bg-lighter; text-align: left; padding: 0 4px; + + &:nth-child(odd) { + border-right: 1px solid $color-ddd; + } } i { From c91533a4d88334baad778e13f56b613099982629 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:14:03 +0100 Subject: [PATCH 25/74] going on --- lib/scss/table.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/scss/table.scss b/lib/scss/table.scss index e085ab8d..f03f4129 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -11,12 +11,12 @@ } div { - background: $bg-lighter; + background: $bg-light; text-align: left; padding: 0 4px; - &:nth-child(odd) { - border-right: 1px solid $color-ddd; + &:nth-child(even) { + border-left: 1px solid $color-ddd; } } @@ -36,7 +36,7 @@ .table-row { line-height: 22.5px; - padding: 0 3px; + padding: 0 5px; &:nth-child(odd) { background: $bg-lighter; @@ -108,7 +108,7 @@ .table-infos { background: $bg-light; max-height: 139px; - padding: 5px; + padding: 0 5px 5px 5px; overflow-y: auto; font-size: 12px; color: $color-777; From 9983dfd777e8d49e864a9fdb85e5a05abc951f21 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:16:42 +0100 Subject: [PATCH 26/74] going on --- lib/scss/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 0143f7da..aa0a7ad2 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -30,7 +30,7 @@ padding: 15px; width: 200px; background: white; - box-shadow: -1px -1px 5px $bg-muted-invisible inset; + box-shadow: -1px -1px 1.5px $bg-muted-invisible inset; border: 1px solid $color-ccc; a { From 107549520d56881a748af861d74bc0462cf265a2 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:17:52 +0100 Subject: [PATCH 27/74] going on --- lib/scss/table.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/scss/table.scss b/lib/scss/table.scss index f03f4129..5bd20fe5 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -14,9 +14,11 @@ background: $bg-light; text-align: left; padding: 0 4px; + border: 1px solid $color-ddd; + border-top: 0; - &:nth-child(even) { - border-left: 1px solid $color-ddd; + &:first-child { + border-left: 0; } } From 75d674596be0505c99e73dc4f5ff6bf77f87c340 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:21:02 +0100 Subject: [PATCH 28/74] going on --- lib/scss/layout.scss | 4 +++- lib/scss/variables.scss | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index aa0a7ad2..e3973ad3 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -11,6 +11,7 @@ background: white; overflow-y: hidden; border: 1px solid $color-ccc; + border-right-color: $color-bbb; border-bottom: 0; h6 { @@ -30,8 +31,9 @@ padding: 15px; width: 200px; background: white; - box-shadow: -1px -1px 1.5px $bg-muted-invisible inset; border: 1px solid $color-ccc; + border-right-color: $color-bbb; + border-bottom-color: $color-bbb; a { display: inline-block; diff --git a/lib/scss/variables.scss b/lib/scss/variables.scss index 6979179b..9b921b83 100644 --- a/lib/scss/variables.scss +++ b/lib/scss/variables.scss @@ -23,6 +23,7 @@ $color-444: #444; $color-222: #222; $color-ddd: #ddd; $color-ccc: #ccc; +$color-bbb: #bbb; /* backgrounds */ From 1244f9b710927aeeb1d8ac0497966315106329a5 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:37:30 +0100 Subject: [PATCH 29/74] going on --- lib/scss/footer.scss | 2 +- lib/scss/layout.scss | 16 +++++++--------- lib/scss/variables.scss | 1 - 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 010248e1..82eacba7 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -1,6 +1,6 @@ .footer { -webkit-app-region: drag; - bottom: 0; + bottom: 5px; font-weight: normal; height: 19px; line-height: 0; diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index e3973ad3..6f12cc79 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -6,13 +6,11 @@ border-radius: 2px; float: left; margin: 10px 0; - width: calc(100vw - 229px); - height: calc(100vh - 33px); + width: calc(100vw - 225px); + height: calc(100vh - 40px); background: white; overflow-y: hidden; border: 1px solid $color-ccc; - border-right-color: $color-bbb; - border-bottom: 0; h6 { font-size: 11px; @@ -25,15 +23,13 @@ .left-column { border-radius: 2px; float: left; - height: calc(100vh - 33px); + height: calc(100vh - 40px); overflow: auto; margin: 10px 5px 10px 10px; - padding: 15px; + padding: 0 15px 15px 15px; width: 200px; background: white; border: 1px solid $color-ccc; - border-right-color: $color-bbb; - border-bottom-color: $color-bbb; a { display: inline-block; @@ -42,7 +38,9 @@ white-space: nowrap; width: 100%; line-height: 22px; - + &:first-child { + line-height: 25px; + } img { &.global-img { width: 20px; diff --git a/lib/scss/variables.scss b/lib/scss/variables.scss index 9b921b83..6979179b 100644 --- a/lib/scss/variables.scss +++ b/lib/scss/variables.scss @@ -23,7 +23,6 @@ $color-444: #444; $color-222: #222; $color-ddd: #ddd; $color-ccc: #ccc; -$color-bbb: #bbb; /* backgrounds */ From 662c8a2e1d1f13ae235e4a42b5f46dddc08141aa Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:41:25 +0100 Subject: [PATCH 30/74] going on --- lib/scss/table.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 5bd20fe5..1bfe3a13 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -81,7 +81,7 @@ .table-body { //(table - header - table-infos) to calculate height - height: calc(100vh - 130px - 105px); + height: calc(100vh - 150px - 105px); overflow-x: hidden; padding-bottom: 20px; background: white; @@ -109,7 +109,7 @@ .table-infos { background: $bg-light; - max-height: 139px; + max-height: 159px; padding: 0 5px 5px 5px; overflow-y: auto; font-size: 12px; From beb064ac298474576744eebc35096df4ce481e82 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:45:36 +0100 Subject: [PATCH 31/74] going on --- lib/scss/footer.scss | 2 +- lib/scss/layout.scss | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 82eacba7..4f4e18ee 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -1,6 +1,6 @@ .footer { -webkit-app-region: drag; - bottom: 5px; + bottom: 3px; font-weight: normal; height: 19px; line-height: 0; diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 6f12cc79..075dafd4 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -37,8 +37,10 @@ padding: 0 6px; white-space: nowrap; width: 100%; - line-height: 22px; - &:first-child { + line-height: 21px; + + &:not(.project) { + line-height: 25px; } img { From 43f527a004946ca551554089da41ba64f1a26bdd Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 16:51:38 +0100 Subject: [PATCH 32/74] going on --- lib/footer.pug | 11 ++++++++--- lib/scss/footer.scss | 10 ++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/footer.pug b/lib/footer.pug index 7acec39a..3cfacbdd 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -1,12 +1,17 @@ .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 || ' - - -'}} - button - | update + 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 + button.button-update(type="button", title="Update npm", ng-show="!shell.globalDisabled", ng-click="shell.updateNpm()") + i.fa.fa-history + | Update + 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") diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 4f4e18ee..3c8432da 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -73,4 +73,14 @@ } } } + + button { + font-size: 11.5px; + height: 17.5px; + line-height: 14px; + + i { + vertical-align: middle; + } + } } From 943a5341210414b21c40fe59151c76bda41b1bf3 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 17:00:50 +0100 Subject: [PATCH 33/74] going on --- lib/scss/footer.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 3c8432da..7826e25a 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -75,9 +75,10 @@ } button { + margin-left: 4px; font-size: 11.5px; - height: 17.5px; line-height: 14px; + padding: 0 2px 0 0; i { vertical-align: middle; From fed50292938e4e12f2c16625e6b227e0541c571e Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 17:02:49 +0100 Subject: [PATCH 34/74] going on --- lib/footer.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/footer.pug b/lib/footer.pug index 3cfacbdd..baec5120 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -8,7 +8,7 @@ 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 - button.button-update(type="button", title="Update npm", ng-show="!shell.globalDisabled", ng-click="shell.updateNpm()") + button.button-update(type="button", ng-show="shell.npmCurrentVersionBadge", title="Update npm", ng-show="!shell.globalDisabled", ng-click="shell.updateNpm()") i.fa.fa-history | Update From afe1fe32a687ff833a1683eb765b73710c037907 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 17:05:56 +0100 Subject: [PATCH 35/74] going on --- lib/footer.pug | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/footer.pug b/lib/footer.pug index baec5120..854d09ad 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -5,13 +5,12 @@ = " " small | 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 - button.button-update(type="button", ng-show="shell.npmCurrentVersionBadge", title="Update npm", ng-show="!shell.globalDisabled", ng-click="shell.updateNpm()") - i.fa.fa-history - | Update - + 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 + button.button-update(type="button", ng-show="shell.npmCurrentVersionBadge", title="Update npm", ng-show="!shell.globalDisabled", ng-click="shell.updateNpm()") + i.fa.fa-history + | Update 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") From ba02b757752ac51867a9915db2d2e787f0013e1c Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 17:07:56 +0100 Subject: [PATCH 36/74] going on --- lib/footer.pug | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/footer.pug b/lib/footer.pug index 854d09ad..d209398d 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -4,13 +4,13 @@ | npm = " " small - | 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 - button.button-update(type="button", ng-show="shell.npmCurrentVersionBadge", title="Update npm", ng-show="!shell.globalDisabled", ng-click="shell.updateNpm()") - i.fa.fa-history - | Update + | 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 + button.button-update(type="button", ng-show="!shell.globalDisabled && shell.npmCurrentVersionBadge", title="Update npm", ng-click="shell.updateNpm()") + i.fa.fa-history + | Update 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") From cb0f48fe921d0e60b6f4b51cff3f42c7518dfb38 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 17:09:03 +0100 Subject: [PATCH 37/74] going on --- lib/scss/footer.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 7826e25a..c8e5ba3b 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -2,8 +2,7 @@ -webkit-app-region: drag; bottom: 3px; font-weight: normal; - height: 19px; - line-height: 0; + height: 21px; padding: 0 10px; position: fixed; width: 100%; From 9cfe06d2d134c055a9d79d1eba81fabd00d3aef7 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 17:10:31 +0100 Subject: [PATCH 38/74] going on --- lib/scss/home.scss | 2 +- lib/scss/table.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/scss/home.scss b/lib/scss/home.scss index 4d431d4b..da514092 100644 --- a/lib/scss/home.scss +++ b/lib/scss/home.scss @@ -4,7 +4,7 @@ text-align: center; position: relative; margin-top: -30vh; - z-index: 999; + z-index: 9; background: white; button { diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 1bfe3a13..c7224f1d 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -94,7 +94,7 @@ padding-top: 54vh; position: relative; margin-top: -30vh; - z-index: 999; + z-index: 9; background: white; text-align: center; } From 0486963f2fe64ab865cd73989dd32fa1fbd410ad Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 18:33:14 +0100 Subject: [PATCH 39/74] going on --- lib/footer.pug | 10 +++++----- lib/install-new-package-version.pug | 4 ++-- lib/install-new-package.pug | 4 ++-- lib/js/interface/shell.js | 28 ++++++++++++++++++++++++++++ lib/js/interface/top.js | 28 +--------------------------- lib/logs-prompt.pug | 4 ++-- lib/scss/layout.scss | 2 +- lib/scss/prompt.scss | 7 ++++--- lib/top.pug | 12 ++++++------ 9 files changed, 51 insertions(+), 48 deletions(-) diff --git a/lib/footer.pug b/lib/footer.pug index d209398d..457cf77d 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -3,14 +3,14 @@ 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 - button.button-update(type="button", ng-show="!shell.globalDisabled && shell.npmCurrentVersionBadge", title="Update npm", ng-click="shell.updateNpm()") + | 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 + | 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") diff --git a/lib/install-new-package-version.pug b/lib/install-new-package-version.pug index 5c8be20c..d89261e8 100644 --- a/lib/install-new-package-version.pug +++ b/lib/install-new-package-version.pug @@ -1,4 +1,4 @@ -div.dialog.prompt(ng-if="topMenu.activeLink === '4'", ng-init="topMenu.versionPackageVersion = undefined") +div.dialog.prompt(ng-if="shell.activeLink === '4'", ng-init="topMenu.versionPackageVersion = undefined") form(ng-submit='topMenu.installVersionPackage(shell.currentSelectedPackages[0], topMenu.versionPackageVersion)') input(placeholder='Package name', type='text', @@ -26,4 +26,4 @@ div.dialog.prompt(ng-if="topMenu.activeLink === '4'", ng-init="topMenu.versionPa img(src="img/loading.svg", width="13") = " " = " " - i(class="fa fa-times-circle-o", ng-click="topMenu.activeLink = undefined;") + i(class="fa fa-times-circle-o", ng-click="shell.activeLink = undefined;") diff --git a/lib/install-new-package.pug b/lib/install-new-package.pug index 1cee151f..d2a23728 100644 --- a/lib/install-new-package.pug +++ b/lib/install-new-package.pug @@ -1,4 +1,4 @@ -div.dialog.prompt(ng-if="topMenu.activeLink === '1'") +div.dialog.prompt(ng-if="shell.activeLink === '1'") form(ng-submit='topMenu.installPackage(topMenu.packageName, topMenu.newPackageKind)') div(class="tags-input", ng-model="topMenu.packageName", contenteditable="true", ng-attr-disabled="{{topMenu.installingPackage ? 'disabled' : ''}}" placeholder="package<@version> ..." ng-tag-input, ng-autofocus) @@ -17,4 +17,4 @@ div.dialog.prompt(ng-if="topMenu.activeLink === '1'") img(src="img/loading.svg", width="13") = " " = " " - i(class="fa fa-times-circle-o", ng-click="topMenu.activeLink = undefined") + i(class="fa fa-times-circle-o", ng-click="shell.activeLink = undefined") diff --git a/lib/js/interface/shell.js b/lib/js/interface/shell.js index 921df718..251ed81c 100644 --- a/lib/js/interface/shell.js +++ b/lib/js/interface/shell.js @@ -83,6 +83,16 @@ angular.module(moduleName, [ }); }); }) + , unregisterOnLeftBarEditProject = $rootScope.$on('left-bar:edit-project', () => { + $scope.$evalAsync(() => { + this.activeLink = undefined; + }); + }) + , unregisterOnLeftBarOpenHistory = $rootScope.$on('left-bar:open-project-history', () => { + $scope.$evalAsync(() => { + this.activeLink = undefined; + }); + }) , unregisterOnMenuAddProjectFolder = ipcRenderer.on('menu:add-project-folder', () => { //when user wants to add new project directly from OS menu this.openChooser(); @@ -154,6 +164,8 @@ angular.module(moduleName, [ this.globalSelected = false; } + + this.activeLink = undefined; }) , unregisterLeftBarShrinkwrapProjectListener = $rootScope.$on('left-bar:shrinkwrap-project', (eventInfo, data) => { const allProjects = this.projects; @@ -287,6 +299,20 @@ angular.module(moduleName, [ } }; + this.activeClickedLink = activeLink => { + if ((activeLink === '1' || activeLink === '4') && + this.activeLink === activeLink) { + //toggle prompts show/hide + this.activeLink = false; + } else { + + this.activeLink = activeLink; + $rootScope.$emit('top-bar:active-link', { + 'link': activeLink + }); + } + }; + this.openChooser = () => { dialog.showOpenDialog({ @@ -368,6 +394,8 @@ angular.module(moduleName, [ $rootScope.$on('$destroy', () => { unregisterNpmReady(); + unregisterOnLeftBarEditProject(); + unregisterOnLeftBarOpenHistory(); unregisterOnMenuAddProjectFolder(); unregisterNpmGlobalPrivilegeCheckResult(); unregisterOnContentPackageInfosListener(); diff --git a/lib/js/interface/top.js b/lib/js/interface/top.js index 5978535c..823ccbef 100644 --- a/lib/js/interface/top.js +++ b/lib/js/interface/top.js @@ -7,20 +7,9 @@ const moduleName = 'npm-ui.top-menu' angular.module(moduleName, []) .controller('TopMenuController', /*@ngInject*/ function TopMenuController($document, $rootScope, $scope, $log, npm, npmGlobal, loadingFactory, notificationFactory, errorsService) { - const unregisterOnLeftBarEditProject = $rootScope.$on('left-bar:edit-project', () => { - $scope.$evalAsync(() => { - this.activeLink = undefined; - }); - }) - , unregisterOnLeftBarOpenHistory = $rootScope.$on('left-bar:open-project-history', () => { - $scope.$evalAsync(() => { - this.activeLink = undefined; - }); - }) - , unregisterLeftBarSelectProjectListener = $rootScope.$on('left-bar:select-project', (eventInformation, data) => { + const unregisterLeftBarSelectProjectListener = $rootScope.$on('left-bar:select-project', (eventInformation, data) => { if (data && data.path) { - this.activeLink = undefined; this.projectPath = data.path; } }); @@ -304,24 +293,9 @@ angular.module(moduleName, []) }); }; - this.activeClickedLink = activeLink => { - if ((activeLink === '1' || activeLink === '4') && - this.activeLink === activeLink) { - //toggle prompts show/hide - this.activeLink = false; - } else { - - this.activeLink = activeLink; - $rootScope.$emit('top-bar:active-link', { - 'link': activeLink - }); - } - }; $rootScope.$on('$destroy', () => { unregisterLeftBarSelectProjectListener(); - unregisterOnLeftBarEditProject(); - unregisterOnLeftBarOpenHistory(); }); }); diff --git a/lib/logs-prompt.pug b/lib/logs-prompt.pug index 63bdf46d..b56ec972 100644 --- a/lib/logs-prompt.pug +++ b/lib/logs-prompt.pug @@ -1,8 +1,8 @@ -div.dialog.dialog-window(ng-if="topMenu.activeLink === 'update'") +div.dialog.dialog-window(ng-if="shell.activeLink === 'update'") div(class="prompt-window-options") img(ng-show="!log.logsFinished", src='img/loading.svg', width='13') i(class="fa fa-check color-primary", ng-show="log.logsFinished") - button(ng-click="topMenu.activeLink = false") + button(ng-click="shell.activeLink = false") | Close div(contenteditable="true", class="window", ng-autoscroll) div(class="col-md-12 logs") diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 075dafd4..f98b440d 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -9,7 +9,7 @@ width: calc(100vw - 225px); height: calc(100vh - 40px); background: white; - overflow-y: hidden; + overflow: hidden; border: 1px solid $color-ccc; h6 { diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index efa3ab3d..e95cf96b 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -119,16 +119,17 @@ } &.dialog-window { - height: 90vh; + height: 89vh; position: fixed; - left: 200px; + left: 204px; border: 0; box-shadow: none; top: 11px; - width: calc(100vw - 231px); + width: calc(100vw - 227px); padding: 0; border-radius: 0; background: white; + z-index: 9999; } .window { diff --git a/lib/top.pug b/lib/top.pug index 2197116c..9745ea4d 100644 --- a/lib/top.pug +++ b/lib/top.pug @@ -1,22 +1,22 @@ .top-menu(ng-controller='TopMenuController as topMenu') + span(npm-loading) include ./install-new-package-version.pug include ./install-new-package.pug - span(npm-loading) .row .col-xs-12 - button.button-add-package(title="Add Packages", ng-show="topMenu.projectPath", ng-click="topMenu.activeClickedLink('1');", ng-class="{'active': topMenu.activeLink === '1'}") + button.button-add-package(title="Add Packages", ng-show="topMenu.projectPath", ng-click="shell.activeClickedLink('1');", ng-class="{'active': shell.activeLink === '1'}") i.fa.fa-plus-circle | Add package span(ng-show='shell.showMenuButtons') - button.button-uninstall(title="Uninstall", ng-click="topMenu.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '5'}") + button.button-uninstall(title="Uninstall", ng-click="shell.activeClickedLink('5'); topMenu.uninstallPackage(shell.currentSelectedPackages)", ng-class="{'active': shell.activeLink === '5'}") i.fa.fa-remove | Uninstall - button.button-update(title="Update", ng-click="topMenu.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '2'}") + button.button-update(title="Update", ng-click="shell.activeClickedLink('2'); topMenu.updatePackage(shell.currentSelectedPackages)", ng-class="{'active': shell.activeLink === '2'}") i.fa.fa-level-up | Update - button.button-latest(title="Install Latest", ng-click="topMenu.activeClickedLink('3'); topMenu.installLatest(shell.currentSelectedPackages)", ng-class="{'active': topMenu.activeLink === '3'}") + button.button-latest(title="Install Latest", ng-click="shell.activeClickedLink('3'); topMenu.installLatest(shell.currentSelectedPackages)", ng-class="{'active': shell.activeLink === '3'}") i.fa.fa-rocket | Latest - button.button-version(title="Install Version", ng-show="shell.currentSelectedPackages.length === 1", ng-click="topMenu.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': topMenu.activeLink === '4'}") + button.button-version(title="Install Version", ng-show="shell.currentSelectedPackages.length === 1", ng-click="shell.activeClickedLink('4'); topMenu.showPackageInstallPrompt = undefined; topMenu.showSpecificVersionPrompt = true", ng-class="{'active': shell.activeLink === '4'}") i.fa.fa-at | Version From d635d99a67c59f5d095b3dc3d55e7f9f197fcc2b Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 18:36:25 +0100 Subject: [PATCH 40/74] going on --- lib/scss/layout.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index f98b440d..33201803 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -95,6 +95,8 @@ margin: 0 auto; font-size: 12px; margin-left: 3px; + position: relative; + top: -2px; } } From 459a26a8fec85e05dcd9de49b3337e6f3965f088 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 18:42:29 +0100 Subject: [PATCH 41/74] going on --- lib/scss/footer.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index c8e5ba3b..6428f45e 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -76,11 +76,12 @@ button { margin-left: 4px; font-size: 11.5px; - line-height: 14px; + line-height: 17px; padding: 0 2px 0 0; i { - vertical-align: middle; + position: relative; + top: -1px; } } } From 90f259a3c5808cd9efc21c0633d87d71ec24584d Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 18:50:28 +0100 Subject: [PATCH 42/74] going on --- lib/footer.pug | 1 + lib/scss/home.scss | 2 +- lib/scss/layout.scss | 2 +- lib/scss/table.scss | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/footer.pug b/lib/footer.pug index 457cf77d..010496eb 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -15,6 +15,7 @@ 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") i.fa.fa-disk(title="npm registry is unavailable", ng-show="!shell.loadingRegistryStatus && !shell.registryStatus") + | registry div.loader(ng-class="{'loading': shell.loadingRegistryStatus}") i.fa.fa-circle(ng-class="{'available': !shell.loadingRegistryStatus && shell.registryStatus}") i.fa.fa-circle(ng-class="{'unavailable': !shell.loadingRegistryStatus && !shell.registryStatus}") diff --git a/lib/scss/home.scss b/lib/scss/home.scss index da514092..9d3b32c1 100644 --- a/lib/scss/home.scss +++ b/lib/scss/home.scss @@ -1,6 +1,6 @@ .home { min-height: 100vh; - padding-top: 54vh; + padding-top: 58vh; text-align: center; position: relative; margin-top: -30vh; diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 33201803..d283c4d8 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -36,7 +36,7 @@ margin: 0 auto; padding: 0 6px; white-space: nowrap; - width: 100%; + min-width: 100%; line-height: 21px; &:not(.project) { diff --git a/lib/scss/table.scss b/lib/scss/table.scss index c7224f1d..63721186 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -91,7 +91,7 @@ .table-loader { min-height: 100vh; - padding-top: 54vh; + padding-top: 58vh; position: relative; margin-top: -30vh; z-index: 9; From 4cc1e97addcc25deb4b934f175ad9f70e2b9a24b Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 18:51:31 +0100 Subject: [PATCH 43/74] going on --- lib/footer.pug | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/footer.pug b/lib/footer.pug index 010496eb..457cf77d 100644 --- a/lib/footer.pug +++ b/lib/footer.pug @@ -15,7 +15,6 @@ 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") i.fa.fa-disk(title="npm registry is unavailable", ng-show="!shell.loadingRegistryStatus && !shell.registryStatus") - | registry div.loader(ng-class="{'loading': shell.loadingRegistryStatus}") i.fa.fa-circle(ng-class="{'available': !shell.loadingRegistryStatus && shell.registryStatus}") i.fa.fa-circle(ng-class="{'unavailable': !shell.loadingRegistryStatus && !shell.registryStatus}") From f24273a9748dfbbdb995b91782916273a3b18f0b Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 18:55:11 +0100 Subject: [PATCH 44/74] going on --- lib/content.pug | 9 +++++---- lib/scss/layout.scss | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/content.pug b/lib/content.pug index 11215305..8b7f3d8c 100644 --- a/lib/content.pug +++ b/lib/content.pug @@ -60,7 +60,8 @@ i(class="fa fa-check color-positive", ng-if="!aPackage.wanted && !aPackage.latest") .col-xs-2 | {{ aPackage.kind }} - h6 - | Packages informations - 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 diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index d283c4d8..195dc8c8 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -14,9 +14,11 @@ h6 { font-size: 11px; - line-height: 10px; + line-height: 19px; font-weight: 500; - margin: 5px; + padding: 0 5px; + border-top: 1px solid $color-ccc; + margin: 0; } } From 8a697e60d27abe367db6a8b21e6d5edc407a1d5c Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 19:02:02 +0100 Subject: [PATCH 45/74] going on --- lib/scss/footer.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 6428f45e..6aa4dc5d 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -3,7 +3,7 @@ bottom: 3px; font-weight: normal; height: 21px; - padding: 0 10px; + padding: 0 11px; position: fixed; width: 100%; z-index: 9; From 6c7ee8a46ff0c484e992436ec17abb4258c7b1c6 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 19:06:22 +0100 Subject: [PATCH 46/74] going on --- lib/scss/prompt.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index e95cf96b..68516358 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -26,9 +26,9 @@ min-width: 13%; width: auto; margin-left: 8px; - line-height: 16px; + line-height: 15px; margin-top: 2px; - max-height: 21px; + font-size: 12px; img { width: 13px; @@ -199,7 +199,7 @@ padding: 0 6px; width: 100%; display: inline-block; - background: rgba(0, 0, 0, .05); + background: $bg-light; margin: 0 auto; line-height: 25px; float: none; From 01c5dbd2c131f8aa183d09c802abf78c6bde05cb Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 19:23:09 +0100 Subject: [PATCH 47/74] going on --- lib/scss/footer.scss | 2 +- lib/scss/header.scss | 48 ++++++++++++++++++++++++-------------------- lib/scss/prompt.scss | 4 ++-- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 6aa4dc5d..1c1e7a65 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -76,7 +76,7 @@ button { margin-left: 4px; font-size: 11.5px; - line-height: 17px; + line-height: 13px; padding: 0 2px 0 0; i { diff --git a/lib/scss/header.scss b/lib/scss/header.scss index 8387146b..379a02e3 100644 --- a/lib/scss/header.scss +++ b/lib/scss/header.scss @@ -22,45 +22,49 @@ .button-latest { float: right; font-size: 12px; - padding: .5px 5px 1px 0; - margin: 4px 4px 0 0; + padding-left: 2px; + margin: 5px 4px 0 0; + line-height: 13px; i { color: $color-222; vertical-align: baseline; } - &.button-add-package { - float: left; - border: 0; - margin: 0 auto; - padding: 5px 6px 5px 2px; - background: none; + } - i { - color: $color-primary; - } + .button-add-package { + float: left; + border: 0; + line-height: 26px; + margin: 0 auto; + padding: 0 6px 0 2px; + background: none; - &:active { - background: $bg-muted-invisible; - } + i { + color: $color-primary; } - &.button-uninstall { + &:active { + background: $bg-muted-invisible; + } + } - i { - color: $color-error; - } + .button-uninstall { + + i { + color: $color-error; } + } - &.button-update { + .button-update { - i { - color: $color-green; - } + i { + color: $color-green; } } + a { &:active, &.active { diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index 68516358..1cb34d1c 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -26,7 +26,7 @@ min-width: 13%; width: auto; margin-left: 8px; - line-height: 15px; + line-height: 13px; margin-top: 2px; font-size: 12px; @@ -214,7 +214,7 @@ button { height: 19.5px; - line-height: 13.5px; + line-height: 13px; font-size: 12px; float: right; margin-top: 3px; From aad2015672cb821d54312c99510f5210026c0532 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 19:25:49 +0100 Subject: [PATCH 48/74] going on --- lib/scss/layout.scss | 1 - lib/scss/table.scss | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 195dc8c8..82d71cc3 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -17,7 +17,6 @@ line-height: 19px; font-weight: 500; padding: 0 5px; - border-top: 1px solid $color-ccc; margin: 0; } } diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 63721186..1934c32f 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -110,7 +110,7 @@ .table-infos { background: $bg-light; max-height: 159px; - padding: 0 5px 5px 5px; + padding: 0 5px 20px 5px; overflow-y: auto; font-size: 12px; color: $color-777; From 95a44243d12e24e427eeb840b171d740ba6fd1ed Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:11:49 +0100 Subject: [PATCH 49/74] going on --- lib/left.pug | 2 +- lib/scss/layout.scss | 4 ++-- lib/scss/table.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/left.pug b/lib/left.pug index e1b72206..0c4d79c0 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -7,7 +7,7 @@ div(ng-controller='LeftBarController as leftBar') img.global-img(src="img/npm-logo-cube.svg") | Globals div(ng-repeat='item in shell.projects track by $index') - a.row.project(title="{{ item.shrinkwrap ? 'Shrinkwrap enabled' : item.path }}", ng-right-click="leftBar.rightClickMenu(item, $event)", ng-class="{'active': leftBar.selectedProject === item && !leftBar.global, 'shrinkwrapped': item.shrinkwrap}", ng-if="leftBar.removedProject !== item", ng-click='leftBar.selectProject(item, $event)') + a.row.project(title="{{ item.shrinkwrap ? 'Has shrinkwrap' : '' }}", ng-right-click="leftBar.rightClickMenu(item, $event)", ng-class="{'active': leftBar.selectedProject === item && !leftBar.global, 'shrinkwrapped': item.shrinkwrap}", ng-if="leftBar.removedProject !== item", ng-click='leftBar.selectProject(item, $event)') button(ng-click='leftBar.deleteProject(item, $event)') i.fa.fa-times-circle-o i.fa.fa-folder-o diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 82d71cc3..b351fa12 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -7,7 +7,7 @@ float: left; margin: 10px 0; width: calc(100vw - 225px); - height: calc(100vh - 40px); + height: calc(100vh - 37px); background: white; overflow: hidden; border: 1px solid $color-ccc; @@ -24,7 +24,7 @@ .left-column { border-radius: 2px; float: left; - height: calc(100vh - 40px); + height: calc(100vh - 37px); overflow: auto; margin: 10px 5px 10px 10px; padding: 0 15px 15px 15px; diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 1934c32f..5432505b 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -110,7 +110,7 @@ .table-infos { background: $bg-light; max-height: 159px; - padding: 0 5px 20px 5px; + padding: 0 5px 8px 5px; overflow-y: auto; font-size: 12px; color: $color-777; From c55e4ef33f1e59bcc1c2829158e884a64bb638b7 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:17:06 +0100 Subject: [PATCH 50/74] going on --- lib/scss/footer.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 1c1e7a65..4c291d24 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -78,6 +78,7 @@ font-size: 11.5px; line-height: 13px; padding: 0 2px 0 0; + height: 19px; i { position: relative; From a46fc04aca1c9d7e22ee734353bd806c468d9acc Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:26:41 +0100 Subject: [PATCH 51/74] going on --- lib/scss/prompt.scss | 14 +++----------- lib/scss/table.scss | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index 1cb34d1c..44a1a0aa 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -18,7 +18,6 @@ i { margin-left: 4px; - vertical-align: middle; font-size: 15px; } @@ -31,9 +30,10 @@ font-size: 12px; img { - width: 13px; + width: 12px; + top: -1px; position: relative; - top: -2px; + margin: 0; } &.disabled { @@ -42,21 +42,13 @@ } } &:not(.dialog-window) { - input { - - &[type="checkbox"] { - vertical-align: text-bottom; - } - } button { width: 56px; - vertical-align: bottom; } } select { width: 82px; - vertical-align: middle; } input { diff --git a/lib/scss/table.scss b/lib/scss/table.scss index 5432505b..fce098a5 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -110,7 +110,7 @@ .table-infos { background: $bg-light; max-height: 159px; - padding: 0 5px 8px 5px; + padding: 0 5px 11px 5px; overflow-y: auto; font-size: 12px; color: $color-777; From bbb2dcb3ac33db22c892c91aef7b5bf2c42dae09 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:30:08 +0100 Subject: [PATCH 52/74] going on --- lib/scss/table.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/scss/table.scss b/lib/scss/table.scss index fce098a5..ee71f06c 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -40,6 +40,9 @@ line-height: 22.5px; padding: 0 5px; + b { + font-weight: 500; + } &:nth-child(odd) { background: $bg-lighter; } From 93cece4d38af2a2e6a73ce682924a0788e12464e Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:35:28 +0100 Subject: [PATCH 53/74] going on --- lib/scss/prompt.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index 44a1a0aa..edd16bac 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -49,6 +49,7 @@ select { width: 82px; + height: 19px; } input { @@ -59,7 +60,7 @@ border-radius: $border-radius-inputs; box-shadow: 0 1px 1px rgba(0, 0, 0, .25) inset; font-size: 11px; - padding: 3.5px 4px 4px 4px; + padding: 3px 4px 2.5px 4px; width: 18%; &:first-child { @@ -74,7 +75,7 @@ border-radius: 3px; box-shadow: 0 1px 1px rgba(0, 0, 0, .25) inset; font-size: 12.5px; - padding: 3.5px 4px 4px 4px; + padding: 3px 4px 2.5px 4px; width: calc(72% - 15px); background: white; white-space: nowrap; From f6ca6e8e4f1740544824090ee48f85a8c9fa14ac Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:37:51 +0100 Subject: [PATCH 54/74] going on --- lib/scss/prompt.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index edd16bac..6b31c122 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -107,7 +107,8 @@ background: $bg-tags; border-radius: $border-radius-tags; border: $border-tags; - padding: 0 3px 1.5px 3px; + padding: 0 3px 1px 3px; + margin: 1px 0 0 0; } } From af4f9cf8680602d960c1897af0edd447af077fe2 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:40:13 +0100 Subject: [PATCH 55/74] going on --- lib/install-new-package-version.pug | 2 +- lib/install-new-package.pug | 2 +- lib/scss/prompt.scss | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/install-new-package-version.pug b/lib/install-new-package-version.pug index d89261e8..101db3f0 100644 --- a/lib/install-new-package-version.pug +++ b/lib/install-new-package-version.pug @@ -26,4 +26,4 @@ div.dialog.prompt(ng-if="shell.activeLink === '4'", ng-init="topMenu.versionPack img(src="img/loading.svg", width="13") = " " = " " - i(class="fa fa-times-circle-o", ng-click="shell.activeLink = undefined;") + i(class="fa fa-times-circle-o button-close-prompt", ng-click="shell.activeLink = undefined;") diff --git a/lib/install-new-package.pug b/lib/install-new-package.pug index d2a23728..fda9a11c 100644 --- a/lib/install-new-package.pug +++ b/lib/install-new-package.pug @@ -17,4 +17,4 @@ div.dialog.prompt(ng-if="shell.activeLink === '1'") img(src="img/loading.svg", width="13") = " " = " " - i(class="fa fa-times-circle-o", ng-click="shell.activeLink = undefined") + i(class="fa fa-times-circle-o button-close-prompt", ng-click="shell.activeLink = undefined") diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index 6b31c122..a0b4e07a 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -230,4 +230,8 @@ cursor: ns-resize; } } + .button-close-prompt { + position: relative; + bottom: -1px; + } } From 8af1319018f1a1a2f36142efae74d096b7b5647d Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:43:44 +0100 Subject: [PATCH 56/74] going on --- lib/scss/prompt.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index a0b4e07a..3a31737d 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -21,6 +21,11 @@ font-size: 15px; } + .button-close-prompt { + position: relative; + bottom: -1px; + } + button { min-width: 13%; width: auto; @@ -149,6 +154,9 @@ width: 100%; margin: 0 auto; + &:first-child { + padding-top: 3px; + } &:hover { &:not(.active) { background: $bg-lighter; @@ -230,8 +238,4 @@ cursor: ns-resize; } } - .button-close-prompt { - position: relative; - bottom: -1px; - } } From eb80d47d9cccd644a8874bbfd0c8b58e23e0f256 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:46:02 +0100 Subject: [PATCH 57/74] going on --- lib/scss/layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index b351fa12..0ab2ed9d 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -44,6 +44,7 @@ line-height: 25px; } + img { &.global-img { width: 20px; @@ -55,7 +56,7 @@ i { font-size: 14.5px; margin-right: 2px; - margin-left: 14px; + margin-left: 10px; color: $color-primary; } @@ -95,7 +96,6 @@ color: $color-222; margin: 0 auto; font-size: 12px; - margin-left: 3px; position: relative; top: -2px; } From c082772070a9aef0ab19797615c87fac76718d64 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:48:33 +0100 Subject: [PATCH 58/74] going on --- lib/left.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/left.pug b/lib/left.pug index 0c4d79c0..7203479c 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -3,7 +3,7 @@ div(ng-controller='LeftBarController as leftBar') include ./history-prompt.pug .left-column.overflow-x-hidden .row - a.row.action-link-disabled(ng-class="{'active': leftBar.global, 'action-link-disabled': shell.globalDisabled, 'action-link-enabled': !shell.globalDisabled}", ng-click='leftBar.selectGlobal()') + a.row.action-link-disabled(ng-class="{'active': leftBar.global, 'action-link-disabled': shell.globalDisabled, 'action-link-enabled': !shell.globalDisabled}", ng-click='leftBar.selectGlobal() ? !shell.globalDisabled : shell.enableGlobal()') img.global-img(src="img/npm-logo-cube.svg") | Globals div(ng-repeat='item in shell.projects track by $index') From 5fc5695d06706dafdc2a08a890e688ba3d169268 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 20:50:17 +0100 Subject: [PATCH 59/74] going on --- lib/scss/footer.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scss/footer.scss b/lib/scss/footer.scss index 4c291d24..916a4ffa 100644 --- a/lib/scss/footer.scss +++ b/lib/scss/footer.scss @@ -76,7 +76,7 @@ button { margin-left: 4px; font-size: 11.5px; - line-height: 13px; + line-height: 12px; padding: 0 2px 0 0; height: 19px; From 349d2ef826667ab97a452ec962e7823211a9456a Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 21:03:44 +0100 Subject: [PATCH 60/74] going on --- lib/left.pug | 14 +++++++------- lib/scss/progress.scss | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/left.pug b/lib/left.pug index 7203479c..a5c76273 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -16,49 +16,49 @@ div(ng-controller='LeftBarController as leftBar') div(ng-init="leftBar.cancelProgressActionId = false;") .left-progress.left-progress-minor.color-white.fake-link(ng-repeat="runningScript in leftBar.npmRunningScriptsProject[item.path] track by $index") small.running-name - | running: {{runningScript}} + | ↳ running: {{runningScript}} small.running-end(ng-click="leftBar.deleteRunningScript(item.path, runningScript)") i.fa.fa-times-circle-o | dismiss .left-progress-loading .left-progress.color-white.fake-link(ng-show="leftBar.npmInstallingProjects[item.dirName]") small.running-name - | installing + | ↳ installing small.running-end(ng-click="leftBar.deleteInstallingProjects(item.dirName)") i.fa.fa-times-circle-o | dismiss .left-progress-loading .left-progress.color-white(ng-show="leftBar.npmReinstallingProjects[item.dirName]") small.running-name - | reinstalling + | ↳ reinstalling small.running-end(ng-click="leftBar.deleteReinstallingProjects(item.dirName)") i.fa.fa-times-circle-o | dismiss .left-progress-loading .left-progress.color-white(ng-show="leftBar.npmBuildingProjects[item.dirName]") small.running-name - | building + | ↳ building small.running-end(ng-click="leftBar.deleteBuildingProjects(item.dirName)") i.fa.fa-times-circle-o | dismiss .left-progress-loading .left-progress.color-white(ng-show="leftBar.npmPruningProjects[item.dirName]") small.running-name - | pruning + | ↳ pruning small.running-end(ng-click="leftBar.deletePruningProjects(item.dirName)") i.fa.fa-times-circle-o | dismiss .left-progress-loading .left-progress.color-white(ng-show="leftBar.npmDedupingProjects[item.dirName]") small.running-name - | deduping + | ↳ deduping small.running-end(ng-click="leftBar.deleteDedupingProjects(item.dirName)") i.fa.fa-times-circle-o | dismiss .left-progress-loading .left-progress.color-white(ng-show="leftBar.npmShrinkwrappingProjects[item.dirName]") small.running-name - | shrinkwrapping + | ↳ shrinkwrapping small.running-end(ng-click="leftBar.deleteShrinkwrappingProjects(item.dirName)") i.fa.fa-times-circle-o | dismiss diff --git a/lib/scss/progress.scss b/lib/scss/progress.scss index b1b1bef7..6f756d11 100644 --- a/lib/scss/progress.scss +++ b/lib/scss/progress.scss @@ -1,11 +1,10 @@ .left-progress { animation: loadingStripes 1.3s linear infinite; - width: 100%; font-size: 11px; - margin: 0 auto; line-height: 0; - padding: 5px 10px; + width: 85%; + margin: 0 0 0 25px; small { font-size: 11px; From 925b172c12f61b06f0e1cf022d935ae75ad38424 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 21:13:26 +0100 Subject: [PATCH 61/74] going on --- lib/left.pug | 2 -- lib/scss/layout.scss | 23 +---------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/left.pug b/lib/left.pug index a5c76273..28eb9383 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -8,8 +8,6 @@ div(ng-controller='LeftBarController as leftBar') | Globals div(ng-repeat='item in shell.projects track by $index') a.row.project(title="{{ item.shrinkwrap ? 'Has shrinkwrap' : '' }}", ng-right-click="leftBar.rightClickMenu(item, $event)", ng-class="{'active': leftBar.selectedProject === item && !leftBar.global, 'shrinkwrapped': item.shrinkwrap}", ng-if="leftBar.removedProject !== item", ng-click='leftBar.selectProject(item, $event)') - button(ng-click='leftBar.deleteProject(item, $event)') - i.fa.fa-times-circle-o i.fa.fa-folder-o i.fa.fa-lock(ng-if="item.shrinkwrap") | {{item.dirName}} diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 0ab2ed9d..3288f5a6 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -56,7 +56,7 @@ i { font-size: 14.5px; margin-right: 2px; - margin-left: 10px; + margin-left: 7px; color: $color-primary; } @@ -80,27 +80,6 @@ background: $bg-muted-invisible; } - button { - position: absolute; - display: none; - float: left; - max-width: 21px; - transition: color .11s linear; - z-index: 999; - left: 6px; - background: none; - border: none; - line-height: 18px; - - i { - color: $color-222; - margin: 0 auto; - font-size: 12px; - position: relative; - top: -2px; - } - } - b { font-weight: normal; white-space: nowrap; From f9b9e4e9bb259df051070af9eadb3b91e171c8f7 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 21:29:13 +0100 Subject: [PATCH 62/74] going on --- lib/scss/prompt.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/scss/prompt.scss b/lib/scss/prompt.scss index 3a31737d..05ab17df 100644 --- a/lib/scss/prompt.scss +++ b/lib/scss/prompt.scss @@ -59,6 +59,10 @@ input { + &[type="checkbox"] { + vertical-align: middle; + margin: 0; + } &[type='text'] { border: none; line-height: initial; From 6d3b89a0278e004e83b2cd64a058b6d0e53e41a9 Mon Sep 17 00:00:00 2001 From: 45kb Date: Thu, 9 Feb 2017 21:31:34 +0100 Subject: [PATCH 63/74] going on --- lib/scss/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scss/variables.scss b/lib/scss/variables.scss index 6979179b..cb81aea6 100644 --- a/lib/scss/variables.scss +++ b/lib/scss/variables.scss @@ -15,7 +15,7 @@ $color-muted-more: rgba(0, 0, 0, .28); $color-muted-less: rgba(0, 0, 0, .5); $color-royalblue: royalblue; $color-green: #00d842; -$color-npm: #cb3837; +$color-npm: #cc0000; $color-999: #999; $color-777: #777; $color-666: #666; From 0e282077ba13c9a756706776354150945b29d6fa Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 09:04:22 +0100 Subject: [PATCH 64/74] fix for globals --- lib/left.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/left.pug b/lib/left.pug index 28eb9383..fb0eb43c 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -3,7 +3,7 @@ div(ng-controller='LeftBarController as leftBar') include ./history-prompt.pug .left-column.overflow-x-hidden .row - a.row.action-link-disabled(ng-class="{'active': leftBar.global, 'action-link-disabled': shell.globalDisabled, 'action-link-enabled': !shell.globalDisabled}", ng-click='leftBar.selectGlobal() ? !shell.globalDisabled : shell.enableGlobal()') + a.row(ng-class="{'active': leftBar.global}", ng-click='shell.globalDisabled ? shell.enableGlobal() : leftBar.selectGlobal()') img.global-img(src="img/npm-logo-cube.svg") | Globals div(ng-repeat='item in shell.projects track by $index') From 2b7712939c9bb60d8bc879da4cb3817989fc1792 Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 09:20:03 +0100 Subject: [PATCH 65/74] progress fix --- lib/scss/layout.scss | 1 + lib/scss/table.scss | 9 ++++----- lib/scss/variables.scss | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 3288f5a6..3a866eff 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -18,6 +18,7 @@ font-weight: 500; padding: 0 5px; margin: 0; + border-top: 1px solid $color-ccc; } } diff --git a/lib/scss/table.scss b/lib/scss/table.scss index ee71f06c..1c86f26d 100644 --- a/lib/scss/table.scss +++ b/lib/scss/table.scss @@ -48,11 +48,10 @@ } &:focus, &:active, &.active { - &:not(.table-row-loading) { - &:not(.disabled) { - * { - color: white; - } + + &:not(.disabled) { + * { + color: white; } } diff --git a/lib/scss/variables.scss b/lib/scss/variables.scss index cb81aea6..08f9feb9 100644 --- a/lib/scss/variables.scss +++ b/lib/scss/variables.scss @@ -34,9 +34,9 @@ $bg-muted-more: rgba(0, 0, 0, .15); $bg-muted-invisible: rgba(0, 0, 0, .065); $bg-error: #e81616; $bg-table-row-highlight: $color-positive; -$bg-progress: repeating-linear-gradient(90deg, $color-stripes-one, $color-stripes-one 5px, $color-stripes-two 5px, $color-stripes-two 10px); +$bg-progress: repeating-linear-gradient(135deg, #d83232, #d83232 5px, #c71212 5px, #c71212 10px); $bg-progress-secondary: repeating-linear-gradient(135deg, $color-primary, $color-primary 5px, #147ada 5px, #147ada 10px); -$bg-progress-minor: repeating-linear-gradient(135deg, $color-error, $color-error 5px, #c71212 5px, #c71212 10px); +$bg-progress-minor: $bg-progress; $bg-tags: #d7ebff; /*border-radius*/ $border-radius-inputs: 3px; From 1ebbfd724e4fbcc9d1c4a426d01245937a61638b Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 09:38:23 +0100 Subject: [PATCH 66/74] global link fix --- lib/js/interface/shell.js | 2 +- lib/left.pug | 2 +- lib/scss/utils.scss | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/js/interface/shell.js b/lib/js/interface/shell.js index 251ed81c..0427921b 100644 --- a/lib/js/interface/shell.js +++ b/lib/js/interface/shell.js @@ -245,7 +245,7 @@ angular.module(moduleName, [ dialog.showMessageBox({ 'title': 'Global Access', 'message': 'ndm wants to access your global folder', - 'detail': 'FIX PERMISSIONS\n\nPlease follow the tutorial at:\nhttps://docs.npmjs.com/getting-started/fixing-npm-permissions\n\n\nREADME\n\nYou may need to restart your terminal (after you fixed the permissions) then type `npm outdated -g` to check if permissions are correctly fixed.\n\nIf no errors then reopen ndm.\n', + 'detail': 'FIX NPM PERMISSIONS\n\n1) Follow the tutorial at:\nhttps://docs.npmjs.com/getting-started/fixing-npm-permissions\n\n2) Restart your terminal and run "npm outdated -g"\nwithout "sudo".\n\n3) If no errors in your terminal then quit and reopen ndm.\n', buttons }, buttonIndex => { //move global folder diff --git a/lib/left.pug b/lib/left.pug index fb0eb43c..683de9ad 100644 --- a/lib/left.pug +++ b/lib/left.pug @@ -3,7 +3,7 @@ div(ng-controller='LeftBarController as leftBar') include ./history-prompt.pug .left-column.overflow-x-hidden .row - a.row(ng-class="{'active': leftBar.global}", ng-click='shell.globalDisabled ? shell.enableGlobal() : leftBar.selectGlobal()') + a.row(ng-class="{'active': leftBar.global, 'action-link-disabled': shell.globalDisabled}", ng-click='shell.globalDisabled ? shell.enableGlobal() : leftBar.selectGlobal()') img.global-img(src="img/npm-logo-cube.svg") | Globals div(ng-repeat='item in shell.projects track by $index') diff --git a/lib/scss/utils.scss b/lib/scss/utils.scss index 51008bf6..7907d53d 100644 --- a/lib/scss/utils.scss +++ b/lib/scss/utils.scss @@ -16,10 +16,4 @@ .action-link-disabled { opacity: .5; - pointer-events: none; -} - -.action-link-enabled { - opacity: inherit; - pointer-events: all; } From 89b73d7b79e128beae85623996a2dc7baf10f078 Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 09:39:54 +0100 Subject: [PATCH 67/74] global link fix --- lib/js/interface/shell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/js/interface/shell.js b/lib/js/interface/shell.js index 0427921b..2a740954 100644 --- a/lib/js/interface/shell.js +++ b/lib/js/interface/shell.js @@ -245,7 +245,7 @@ angular.module(moduleName, [ dialog.showMessageBox({ 'title': 'Global Access', 'message': 'ndm wants to access your global folder', - 'detail': 'FIX NPM PERMISSIONS\n\n1) Follow the tutorial at:\nhttps://docs.npmjs.com/getting-started/fixing-npm-permissions\n\n2) Restart your terminal and run "npm outdated -g"\nwithout "sudo".\n\n3) If no errors in your terminal then quit and reopen ndm.\n', + 'detail': 'FIX NPM PERMISSIONS\n\n1) Follow the tutorial at:\nhttps://docs.npmjs.com/getting-started/fixing-npm-permissions\n\n2) Restart your terminal and run "npm outdated -g"\nwithout "sudo".\n\n3) If no errors in your terminal then quit and reopen ndm.\n\n4) Done.\n', buttons }, buttonIndex => { //move global folder From d7f62785eaafa6048ca349e2dd17b63b5eddd50f Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 09:45:44 +0100 Subject: [PATCH 68/74] global link fix --- lib/js/interface/shell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/js/interface/shell.js b/lib/js/interface/shell.js index 2a740954..0427921b 100644 --- a/lib/js/interface/shell.js +++ b/lib/js/interface/shell.js @@ -245,7 +245,7 @@ angular.module(moduleName, [ dialog.showMessageBox({ 'title': 'Global Access', 'message': 'ndm wants to access your global folder', - 'detail': 'FIX NPM PERMISSIONS\n\n1) Follow the tutorial at:\nhttps://docs.npmjs.com/getting-started/fixing-npm-permissions\n\n2) Restart your terminal and run "npm outdated -g"\nwithout "sudo".\n\n3) If no errors in your terminal then quit and reopen ndm.\n\n4) Done.\n', + 'detail': 'FIX NPM PERMISSIONS\n\n1) Follow the tutorial at:\nhttps://docs.npmjs.com/getting-started/fixing-npm-permissions\n\n2) Restart your terminal and run "npm outdated -g"\nwithout "sudo".\n\n3) If no errors in your terminal then quit and reopen ndm.\n', buttons }, buttonIndex => { //move global folder From 89277dc5b8c6b4918361eaed25a142551514fbb8 Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 11:39:50 +0100 Subject: [PATCH 69/74] little fix --- lib/scss/layout.scss | 3 ++- lib/scss/loading.scss | 2 +- lib/scss/progress.scss | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 3a866eff..73b59e75 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -67,7 +67,8 @@ &.fa-lock { color: $color-444; margin:0 auto; - margin-left:-4px; + margin-left: -6px; + margin-right: -2px; font-size: 11.5px; } diff --git a/lib/scss/loading.scss b/lib/scss/loading.scss index d5373028..8fa57b06 100644 --- a/lib/scss/loading.scss +++ b/lib/scss/loading.scss @@ -11,7 +11,7 @@ body { img { width: 33px; - margin-top: 45vh; + margin-top: 40vh; opacity: .6; } } diff --git a/lib/scss/progress.scss b/lib/scss/progress.scss index 6f756d11..55b16a5a 100644 --- a/lib/scss/progress.scss +++ b/lib/scss/progress.scss @@ -3,7 +3,7 @@ animation: loadingStripes 1.3s linear infinite; font-size: 11px; line-height: 0; - width: 85%; + width: 80%; margin: 0 0 0 25px; small { From eb37540a9337a935bd0b346d1aee73693120dccf Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 15:17:00 +0100 Subject: [PATCH 70/74] win fix --- lib/scss/win/win.scss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/scss/win/win.scss b/lib/scss/win/win.scss index 2955787c..48a402e0 100644 --- a/lib/scss/win/win.scss +++ b/lib/scss/win/win.scss @@ -16,10 +16,15 @@ a, button, .fake-link { } } -select { - margin-top: 2px; +.dialog { + select { + vertical-align: top; + } } +.top-menu .button-add-project { + line-height: 30px; +} .ace_editor { font-size: 14px !important; } From 622888b538733454acf9061e1982887280d3b119 Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 15:24:07 +0100 Subject: [PATCH 71/74] win fix --- lib/scss/layout.scss | 1 + lib/scss/win/win.scss | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 73b59e75..0b981d42 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -1,5 +1,6 @@ .page { height: calc(100vh - 23px); + box-shadow: 0 0 1px $color-ddd inset; } .right-column { diff --git a/lib/scss/win/win.scss b/lib/scss/win/win.scss index 48a402e0..b57c28ec 100644 --- a/lib/scss/win/win.scss +++ b/lib/scss/win/win.scss @@ -18,11 +18,11 @@ a, button, .fake-link { .dialog { select { - vertical-align: top; + vertical-align: text-top; } } -.top-menu .button-add-project { +.top-menu .button-add-package { line-height: 30px; } .ace_editor { From 454acb9460f4d72c1121db6a01f955c64b21b49b Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 15:28:18 +0100 Subject: [PATCH 72/74] win fix --- lib/scss/layout.scss | 1 - lib/scss/linux/linux.scss | 5 +++++ lib/scss/win/win.scss | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/scss/layout.scss b/lib/scss/layout.scss index 0b981d42..73b59e75 100644 --- a/lib/scss/layout.scss +++ b/lib/scss/layout.scss @@ -1,6 +1,5 @@ .page { height: calc(100vh - 23px); - box-shadow: 0 0 1px $color-ddd inset; } .right-column { diff --git a/lib/scss/linux/linux.scss b/lib/scss/linux/linux.scss index 60fe8762..6df2a220 100644 --- a/lib/scss/linux/linux.scss +++ b/lib/scss/linux/linux.scss @@ -15,6 +15,11 @@ body, html { } } +.page { + + box-shadow: 0 1px 0 $color-ccc inset; +} + .home { button { height: 23px; diff --git a/lib/scss/win/win.scss b/lib/scss/win/win.scss index b57c28ec..30f05a10 100644 --- a/lib/scss/win/win.scss +++ b/lib/scss/win/win.scss @@ -10,6 +10,11 @@ a, button, .fake-link { } } +.page { + + box-shadow: 0 1px 0 $color-ccc inset; +} + .home { button { height: 23px; From a836c46b8562bb53537bc622b8eaf01a1d5a1e72 Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 16:48:04 +0100 Subject: [PATCH 73/74] linux fix --- lib/scss/linux/linux.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/scss/linux/linux.scss b/lib/scss/linux/linux.scss index 6df2a220..7ad3a4be 100644 --- a/lib/scss/linux/linux.scss +++ b/lib/scss/linux/linux.scss @@ -26,6 +26,11 @@ body, html { } } +.footer { + button { + font-size: 10.5px; + } +} .ace_editor { font-size: 15px !important; } From d977af7cdd9c8bfffb4a3880842ddcb381bdd043 Mon Sep 17 00:00:00 2001 From: 45kb Date: Fri, 10 Feb 2017 17:31:19 +0100 Subject: [PATCH 74/74] linux fix --- lib/scss/linux/linux.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/scss/linux/linux.scss b/lib/scss/linux/linux.scss index 7ad3a4be..236015fb 100644 --- a/lib/scss/linux/linux.scss +++ b/lib/scss/linux/linux.scss @@ -15,11 +15,6 @@ body, html { } } -.page { - - box-shadow: 0 1px 0 $color-ccc inset; -} - .home { button { height: 23px;