diff --git a/app/index.pug b/app/index.pug index 1132e12c..82238d51 100644 --- a/app/index.pug +++ b/app/index.pug @@ -13,22 +13,9 @@ html app-root .preload-logo div - .terminus-logo.animated - .part(style='transform: rotateZ(0deg)') - div - .part(style='transform: rotateZ(51deg)') - div - .part(style='transform: rotateZ(102deg)') - div - .part(style='transform: rotateZ(154deg)') - div - .part(style='transform: rotateZ(205deg)') - div - .part(style='transform: rotateZ(257deg)') - div - .part(style='transform: rotateZ(308deg)') - div + .terminus-logo h1.terminus-title Terminus + sup α .progress .bar(style='width: 0%') diff --git a/app/main.js b/app/main.js index 23ca8704..5814d998 100644 --- a/app/main.js +++ b/app/main.js @@ -192,7 +192,6 @@ start = () => { let options = { width: 800, height: 600, - //icon: `${app.getAppPath()}/assets/img/icon.png`, title: 'Terminus', minWidth: 400, minHeight: 300, diff --git a/app/src/logo.svg b/app/src/logo.svg new file mode 100644 index 00000000..ca74f3ab --- /dev/null +++ b/app/src/logo.svg @@ -0,0 +1,89 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/app/src/preload.scss b/app/src/preload.scss index c5a1d0be..95742e57 100644 --- a/app/src/preload.scss +++ b/app/src/preload.scss @@ -1,6 +1,3 @@ -$color: rgba(66, 142, 173, 0.75); - - .preload-logo { -webkit-app-region: drag; position: fixed; @@ -24,7 +21,7 @@ $color: rgba(66, 142, 173, 0.75); .bar { transition: 1s ease-out width; - background: $color; + background: #a1c5e4; height: 3px; } } @@ -42,63 +39,22 @@ $color: rgba(66, 142, 173, 0.75); .terminus-logo { width: 160px; height: 160px; + background: url('./logo.svg'); + background-repeat: none; + background-size: contain; margin: auto; - position: relative; - transform: rotateZ(-14.5deg); - - .part { - position: absolute; - width: 160px; - height: 160px; - - div { - position: absolute; - top: 33px; - left: 24px; - width: 44px; - height: 44px; - background: $color; - transform: rotateX(52deg) rotateY(-42deg); - animation: terminusLogoPartOnce ease-out 1s; - } - } - - &.animated .part div { - animation: terminusLogoPart infinite ease-out 2s; - } } .terminus-title { - color: $color; + color: #a1c5e4; font-family: 'Source Sans Pro'; text-align: center; font-weight: normal; font-size: 42px; margin: 0; -} - -@keyframes terminusLogoPart { - 0% { - transform: rotateX(90deg) rotateY(-90deg); - } - 25% { - transform: rotateX(52deg) rotateY(-42deg); - } - 75% { - transform: rotateX(52deg) rotateY(-42deg); - } - 100% { - transform: rotateX(-90deg) rotateY(-90deg); - } -} - -@keyframes terminusLogoPartOnce { - 0% { - transform: rotateX(90deg) rotateY(-90deg); - } - 100% { - transform: rotateX(52deg) rotateY(-42deg); + sup { + color: #842fe0; } } diff --git a/build/icons/128x128.png b/build/icons/128x128.png index 5776baf9..9e9f87a4 100644 Binary files a/build/icons/128x128.png and b/build/icons/128x128.png differ diff --git a/build/icons/16x16.png b/build/icons/16x16.png index e630b2a4..497c87ac 100644 Binary files a/build/icons/16x16.png and b/build/icons/16x16.png differ diff --git a/build/icons/256x256.png b/build/icons/256x256.png index f9eb7a65..909b2fd2 100644 Binary files a/build/icons/256x256.png and b/build/icons/256x256.png differ diff --git a/build/icons/32x32.png b/build/icons/32x32.png index ee79ae12..713bdee6 100644 Binary files a/build/icons/32x32.png and b/build/icons/32x32.png differ diff --git a/build/icons/512x512.png b/build/icons/512x512.png index 26c650b8..3fb2fcd5 100644 Binary files a/build/icons/512x512.png and b/build/icons/512x512.png differ diff --git a/build/icons/64x64.png b/build/icons/64x64.png index bc990f65..2efed529 100644 Binary files a/build/icons/64x64.png and b/build/icons/64x64.png differ diff --git a/build/icons/icon.svg b/build/icons/icon.svg new file mode 100644 index 00000000..d1b5bc68 --- /dev/null +++ b/build/icons/icon.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/terminus-core/src/components/startPage.component.pug b/terminus-core/src/components/startPage.component.pug index 50ae8ef8..73e071f5 100644 --- a/terminus-core/src/components/startPage.component.pug +++ b/terminus-core/src/components/startPage.component.pug @@ -1,28 +1,15 @@ div .terminus-logo - .part(style='transform: rotateZ(0deg)') - div - .part(style='transform: rotateZ(51deg)') - div - .part(style='transform: rotateZ(102deg)') - div - .part(style='transform: rotateZ(154deg)') - div - .part(style='transform: rotateZ(205deg)') - div - .part(style='transform: rotateZ(257deg)') - div - .part(style='transform: rotateZ(308deg)') - div h1.terminus-title Terminus - span.text-muted α + sup α - button.btn.btn-primary.btn-lg.btn-block( - *ngFor='let button of getButtons()', - (click)='button.click()', - ) - i.fa([class]='"fa fa-" + button.icon') - span {{button.title}} + .list-group + a.list-group-item.list-group-item-action( + *ngFor='let button of getButtons()', + (click)='button.click()', + ) + i([class]='"fa fa-fw fa-" + button.icon') + span {{button.title}} footer .pull-right diff --git a/terminus-core/src/components/startPage.component.scss b/terminus-core/src/components/startPage.component.scss index 315e81de..13fcace1 100644 --- a/terminus-core/src/components/startPage.component.scss +++ b/terminus-core/src/components/startPage.component.scss @@ -24,6 +24,6 @@ footer { background: rgba(0,0,0,.5); } -button { +a, button { -webkit-app-region: no-drag; } diff --git a/terminus-core/src/theme.scss b/terminus-core/src/theme.scss index dd4f96ce..7f172715 100644 --- a/terminus-core/src/theme.scss +++ b/terminus-core/src/theme.scss @@ -71,7 +71,11 @@ $dropdown-link-disabled-color: #333; $dropdown-header-color: #333; $list-group-color: $body-color; -$list-group-bg: $body-bg2; +$list-group-bg: rgba(255,255,255,.05); +$list-group-border-color: rgba(255,255,255,.1); +$list-group-hover-bg: rgba(255,255,255,.1); +$list-group-link-active-bg: rgba(255,255,255,.2); + @import '~bootstrap/scss/bootstrap.scss'; @@ -271,12 +275,6 @@ hotkey-input-modal { } } -start-page { - .terminus-title { - color: $blue; - } -} - .form-group label { margin-bottom: 2px; } @@ -314,3 +312,11 @@ ngb-tabset .tab-content { .input-group > select.form-control { flex-direction: row; } + +.list-group-item { + transition: 0.25s background; + + i + * { + margin-left: 10px; + } +}