diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css index ebd29bae..d378b2f8 100644 --- a/res/app/device-list/device-list.css +++ b/res/app/device-list/device-list.css @@ -3,15 +3,12 @@ } .stf-device-list .filtering-buttons { - /*margin-top: -32px;*/ - position: absolute; top: 10px; right: 20px; } .stf-device-list .device-not-usable { - /*background: rgb(245, 245, 245);*/ opacity: 0.8; } @@ -26,7 +23,6 @@ .stf-device-list .line { height: 1px; width: 100%; - /*padding: 10px 15px 12px 2px;*/ border-bottom: 1px solid #e2e2e2; margin: 0; } @@ -61,12 +57,10 @@ img.device-icon-smallest { .device-list-active-tabs.ng-enter { -webkit-transition: 250ms; transition: 250ms; - /*margin-top: -100%;*/ opacity: 0; } .device-list-active-tabs.ng-enter-active { - /*margin-top: 0;*/ opacity: 1; } @@ -77,17 +71,3 @@ img.device-icon-smallest { .stf-device-list .device-product-name-using { border-bottom: 1px solid; /* leaving out the color inherits text color */ } - - -.device-status .using { - -} - -/*using: 'state-using btn-primary',*/ -/*busy: 'state-busy btn-warning',*/ -/*available: 'state-available btn-primary-outline',*/ -/*ready: 'state-ready btn-primary-outline',*/ -/*present: 'state-present btn-primary-outline',*/ -/*preparing: 'state-preparing btn-primary-outline btn-success-outline',*/ -/*unauthorized: 'state-unauthorized btn-danger-outline',*/ -/*offline: 'state-offline btn-warning-outline'*/ diff --git a/res/app/device-list/icons/device-list-icons-directive.js b/res/app/device-list/icons/device-list-icons-directive.js index 5e2aa8fe..92118e77 100644 --- a/res/app/device-list/icons/device-list-icons-directive.js +++ b/res/app/device-list/icons/device-list-icons-directive.js @@ -132,12 +132,6 @@ module.exports = function DeviceListDetailsDirective( element.on('click', function (e) { - // TODO: find a way to find the correct parent - //if (e.shiftKey) { - // console.log(e) - // //StandaloneService.open() - // e.preventDefault() - //} var id if (e.target.classList.contains('thumbnail')) { diff --git a/res/app/device-list/search/device-list-search.css b/res/app/device-list/search/device-list-search.css index 73aa7435..98f6fb03 100644 --- a/res/app/device-list/search/device-list-search.css +++ b/res/app/device-list/search/device-list-search.css @@ -7,7 +7,3 @@ .stf-device-list .filter-out { display: none; } - -.stf-device-list .device-search:focus { - /*width: 25em;*/ -} diff --git a/res/app/device-list/stats/device-list-stats.css b/res/app/device-list/stats/device-list-stats.css index f1cb4829..2ede24b5 100644 --- a/res/app/device-list/stats/device-list-stats.css +++ b/res/app/device-list/stats/device-list-stats.css @@ -1,5 +1,3 @@ -/* TODO: REFORMAT device-stats */ - .device-stats { min-height: 100px; height: 100px; diff --git a/res/app/docs/docs-controller.js b/res/app/docs/docs-controller.js index cad87190..babedf6c 100644 --- a/res/app/docs/docs-controller.js +++ b/res/app/docs/docs-controller.js @@ -2,7 +2,6 @@ module.exports = function DocsCtrl($rootScope, $scope, $window, $location) { function hasHistory() { - // TODO: watch this return $window.history.length > 1 } diff --git a/res/app/layout/small.css b/res/app/layout/small.css index af8a0a95..0fe4ee2d 100644 --- a/res/app/layout/small.css +++ b/res/app/layout/small.css @@ -1,11 +1,3 @@ -/*.row {*/ -/*margin: 0 !important;*/ -/*}*/ - -/* Fix Bootstrap */ - -/* Make tabs smaller */ - .row { margin: 0 5px; } @@ -23,7 +15,6 @@ margin-top: 0; } -/*@media (max-width: 1200px) {*/ [class*="col-sm"], [class*="col-md"], [class*="col-lg"], @@ -31,7 +22,6 @@ margin-bottom: 10px; } -/*}*/ .row [class^="col-"] { padding: 0 5px; @@ -41,10 +31,6 @@ font-size: 12px; } -.btn .btn-sm span { - /*font-size: 12px;*/ -} - .btn i+span, .btn span+span{ margin-left: 5px; @@ -65,29 +51,3 @@ a tab-heading i + span { table.table .btn { margin: 0; } - -/* Widget Container */ -/*.widget-container .heading-for-tabs {*/ -/*background: rgba(255, 255, 255, 0.94);*/ -/*height: 50px;*/ -/*padding: 15px 15px;*/ -/*color: #007aff;*/ -/*font-size: 15px;*/ -/*width: 100%;*/ -/*font-weight: 400;*/ -/*margin: 0;*/ -/*height: 44px;*/ -/*}*/ - -/*.widget-container .heading-for-tabs [class^="fa"],*/ -/*.widget-container .heading-for-tabs [class*="fa"] {*/ -/*margin-right: 5px;*/ -/*}*/ - -/*.widget-container .heading-for-tabs [class^="fa"].pull-right,*/ -/*.widget-container .heading-for-tabs [class*="fa"].pull-right {*/ -/*margin-right: 0;*/ -/*margin-left: 15px;*/ -/*opacity: 0.35;*/ -/*font-size: 1.1em;*/ -/*}*/ \ No newline at end of file diff --git a/res/app/layout/stf-styles.css b/res/app/layout/stf-styles.css index 1c002904..c2abdc25 100644 --- a/res/app/layout/stf-styles.css +++ b/res/app/layout/stf-styles.css @@ -1,8 +1,3 @@ -body { - /*font-size: 14px;*/ - /*background: #eee;*/ -} - .page-container { padding: 0 30px; margin: 0 auto; @@ -95,10 +90,6 @@ Colors for awesome fonts height: 150px; } -.stf-mini-ace-viewer { - /*min-height: 10px;*/ -} - .ace_editor_wrapper { position: relative; height: 180px; @@ -215,7 +206,6 @@ svg { /* Movement Area */ .movement-area-container { - /*background: #555;*/ width: 100%; height: 100%; } @@ -322,18 +312,13 @@ svg { text-align: right; } -/* For se7en bootstrap */ +/* For nine-bootstrap */ .btn [class^="fa"], .btn [class*="fa"] { margin-right: 0 !important; } -/*.btn [class^="fa"]+span i,*/ -/*.btn [class*="fa"]+span {*/ -/*margin-right: 15px;*/ -/*}*/ - .interact-control .navbar { height: auto !important; } @@ -432,11 +417,3 @@ fieldset[disabled] input[type="text"].form-control cursor: text; } -/* - Fix scrolling behaviour change of overflow: auto; introduced in Chrome 41. - It prevented the y-scrolling of the parent while the mouse is positioned on - the child element. -*/ - - - diff --git a/res/app/menu/menu.css b/res/app/menu/menu.css index 999cc318..539700a0 100644 --- a/res/app/menu/menu.css +++ b/res/app/menu/menu.css @@ -11,7 +11,6 @@ .stf-menu .stf-top-bar { height: 44px; - /*border-bottom: 1px solid #e6e6e6;*/ padding: 0 10px 0 20px; width: 100%; float: left; @@ -42,7 +41,6 @@ font-size: 15px; line-height: 44px; color: #777777; - /*border-bottom: 1px solid #eee;*/ font-weight: 400; height: 44px; position: relative; @@ -61,8 +59,6 @@ .stf-menu .stf-nav > li > a.current { color: #007aff; - /*border-bottom: 1px solid #eee;*/ - /*border-bottom-color: #007aff;*/ } .stf-menu.navbar { diff --git a/res/app/menu/menu.jade b/res/app/menu/menu.jade index a9abcaef..19b73576 100644 --- a/res/app/menu/menu.jade +++ b/res/app/menu/menu.jade @@ -18,32 +18,6 @@ button(type='button', ng-model='$root.platform', btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web button(type='button', ng-model='$root.platform', btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native - //li - a - badge-icon(type='warning', message='There was an error') - - //button.btn.btn-sm.btn-primary-outline(type='button', dropdown-toggle) - i.fa.fa-columns - span(ng-bind='"Customize"|translate') - - //ul.dropdown-menu(role='menu').pointer.stf-device-details-customize - - //li.dropdown.notifications.hidden-xs(dropdown, style='z-index: 11000;') - a(href='#', dropdown-toggle) - span.se7en-flag - .sr-only Notifications - p.counter 4 - ul.dropdown-menu(role='menu') - li - a(href='') - .notifications.label.label-info New - p New device added: Nexus 6 - li - a(href='#') - .notifications.label.label-info Bug fix - p Devices now don't turn off - - li(ng-show='!$root.basicMode') a(ng-href='/#!/help', accesskey='6') i.fa.fa-question-circle.fa-fw diff --git a/res/app/settings/general/local/local-settings-controller.js b/res/app/settings/general/local/local-settings-controller.js index 84c08e1a..9ea3a129 100644 --- a/res/app/settings/general/local/local-settings-controller.js +++ b/res/app/settings/general/local/local-settings-controller.js @@ -4,20 +4,4 @@ module.exports = function ($scope, SettingsService) { console.log('Settings cleared') } -// $scope.resetSettings = function () { -// var title = 'Reset Settings'; -// var msg = 'Are you sure you want to revert all settings to ' + -// 'their default values?'; -// var btns = [ -// {result: 'cancel', label: 'Cancel'}, -// {result: 'ok', label: 'OK', cssClass: 'btn-primary'} -// ]; -// $dialog.messageBox(title, msg, btns) -// .open() -// .then(function (result) { -// if (result === 'ok') { -// //SettingsService.clearAll(); -// } -// }); -// }; } diff --git a/res/app/settings/keys/access-tokens/access-tokens.jade b/res/app/settings/keys/access-tokens/access-tokens.jade index af6ff1b6..098177e4 100644 --- a/res/app/settings/keys/access-tokens/access-tokens.jade +++ b/res/app/settings/keys/access-tokens/access-tokens.jade @@ -13,13 +13,9 @@ .widget-content.padded - //add-adb-key(show-clipboard='true', show-add='showAdd') - nothing-to-show(icon='fa-key', message='{{"No access tokens" | translate}}', ng-if='!adbKeys.length && !showAdd') - - ul.list-group.key-list li.list-group-item(ng-repeat='key in adbKeys').animate-repeat a diff --git a/res/app/settings/keys/adb-keys/adb-keys-controller.js b/res/app/settings/keys/adb-keys/adb-keys-controller.js index 19b69b2a..2f0dc637 100644 --- a/res/app/settings/keys/adb-keys/adb-keys-controller.js +++ b/res/app/settings/keys/adb-keys/adb-keys-controller.js @@ -12,17 +12,4 @@ module.exports = $scope.$on('user.keys.adb.updated', updateKeys) updateKeys() - - //AddAdbKeyModalService.open({ - // fingerprint: '9a:12:5b:14:e3:3e:c9:d3:59:be:4f:16:0d:4d:cd:26', - // title: 'a12907@PC-5954.local' - //}) - - //FatalMessageService.open({ - // enhancedName: 'dev', - // enhancedStatePassive: 'online', - // likelyLeaveReason: 'Not good enough' - //}) - - } diff --git a/res/app/settings/keys/adb-keys/adb-keys.jade b/res/app/settings/keys/adb-keys/adb-keys.jade index 6c0dfc5c..c335cd76 100644 --- a/res/app/settings/keys/adb-keys/adb-keys.jade +++ b/res/app/settings/keys/adb-keys/adb-keys.jade @@ -3,12 +3,9 @@ i.fa.fa-android span(translate) ADB Keys - - button.btn.pull-right.btn-sm( ng-click='showAdd = !showAdd', ng-class='{ "btn-primary-outline": !showAdd, "btn-primary": showAdd }') - //(tooltip='{{ "Add ADB Key" | translate }}') i.fa.fa-plus.fa-fw a(ng-href='/#!/docs/ADB-Keys').pull-right.btn.btn-sm @@ -21,86 +18,6 @@ add-adb-key(show-clipboard='true', show-add='showAdd') - - //accordion(ng-if='showAdd').pointer - accordion-group(is-open='showAdd') - accordion-heading.pointer - i.fa.fa-fw.fa-key - span(translateX) Add ADB Key - - form.form-horizontal(name='adbkeyform', ng-submit='addKey(key)') - - .alert.alert-info.selectable Tip: Run this command to copy the key to your clipboard - a(ng-href='/#!/docs/adb-keys').pull-right - i.fa.fa-question-circle(tooltip='{{"More about ADB Keys" | translate}}', tooltip-placement='left') - textarea(readonly, rows='1', text-focus-select, - ).form-control.remote-debug-textarea pbcopy < ~/.android/adbkey.pub - //pbcopy < ~/.android/adbkey.pub - - br - - .form-group - label.control-label.col-md-1 - i.fa.fa-key.fa-fw - span(translate) Key - .col-md-11 - textarea(rows='4', ng-model='key', ng-required='true', - autocorrect='off', autocapitalize='off', spellcheck='false', - focus-element='focusAddKey').form-control - - .form-group - label.control-label.col-md-1 - i.fa.fa-laptop.fa-fw - span(translate) Device - .col-md-11 - input(type='text', ng-model='title', ng-required='true', - text-focus-select, focus-element='focusAddTitle').form-control - - button.btn.btn-primary-outline.btn-sm.pull-right(type='submit') - i.fa.fa-plus.fa-fw - span(translate) Add Key - - //.panel.panel-default(ng-show='showAdd') - .panel-heading - h3.panel-title(translate) Add ADB Key - .panel-body - form.form-horizontal(name='adbkeyform', ng-submit='addKey(key)') - - .alert.alert-info.selectable Tip: Run this command to copy the key to your clipboard - a(ng-href='/#!/docs/adb-keys').pull-right - i.fa.fa-question-circle(tooltip='{{"More about ADB Keys" | translate}}', tooltip-placement='left') - textarea(readonly, rows='1', text-focus-select, ng-copy='focusAddKey = true' - ).form-control.remote-debug-textarea pbcopy < ~/.android/adbkey.pub - //pbcopy < ~/.android/adbkey.pub - - br - - .form-group - label.control-label.col-md-1 - i.fa.fa-key.fa-fw - span(translate) Key - .col-md-11 - textarea(rows='4', ng-model='key', ng-required='true', - autocorrect='off', autocapitalize='off', spellcheck='false', - focus-element='focusAddKey', ng-paste='focusAddTitle = true').form-control - - .form-group - label.control-label.col-md-1 - i.fa.fa-laptop.fa-fw - span(translate) Device - .col-md-11 - input(type='text', ng-model='title', ng-required='true', - text-focus-select, focus-element='focusAddTitle').form-control - - - - button.btn.btn-primary-outline.btn-sm.pull-right(type='submit') - i.fa.fa-plus.fa-fw - span(translate) Add Key - - //error-message(message='{{error}}') - - ul.list-group.key-list li.list-group-item(ng-repeat='key in adbKeys').animate-repeat a diff --git a/res/app/settings/settings-controller.js b/res/app/settings/settings-controller.js index e5df7707..7dd306e9 100644 --- a/res/app/settings/settings-controller.js +++ b/res/app/settings/settings-controller.js @@ -1,11 +1,6 @@ module.exports = function SettingsCtrl($scope, gettext) { $scope.settingTabs = [ - //{ - // title: gettext('Keys'), - // icon: 'fa-key fa-fw', - // templateUrl: 'settings/keys/keys.jade' - //}, { title: gettext('General'), icon: 'fa-gears fa-fw', diff --git a/res/app/settings/settings.jade b/res/app/settings/settings.jade index 60d1d42b..23e8971a 100644 --- a/res/app/settings/settings.jade +++ b/res/app/settings/settings.jade @@ -1,4 +1,3 @@ div(pane='center', ng-controller='SettingsCtrl') - //br .widget-container.fluid-height nice-tabs(key='SettingsTabs', tabs='settingTabs', filter='') diff --git a/res/app/terminal/terminal.css b/res/app/terminal/terminal.css index 514139e0..54a3316e 100644 --- a/res/app/terminal/terminal.css +++ b/res/app/terminal/terminal.css @@ -1,7 +1,6 @@ html, body { padding: 0; margin: 0; - /*height: 100%;*/ cursor: text; background: #000; } @@ -15,5 +14,4 @@ html, body { -webkit-font-smoothing: antialiased; font-smoothing: antialiased; cursor: text; - /*min-height: 100%;*/ } diff --git a/res/app/views/index.jade b/res/app/views/index.jade index 77468a40..71a565d0 100644 --- a/res/app/views/index.jade +++ b/res/app/views/index.jade @@ -21,14 +21,6 @@ html(ng-app='app') pane-handle='') div(ng-include='"menu.jade"') - //.pane-alert(fa-pane, pane-id='toptop', pane-anchor='north', pane-size='100px', ng-show='true') - .row - .col-md-12 - .widget-container.fluid-height - .widget-content.padded - div(style='text-align: center; color: #007aff;') - i.fa.fa-newspaper-o.fa-3x - h4(ng-bind='"ただいま、システムメンテナンス中です。"') .pane-center(fa-pane, pane-id='main', pane-anchor='center').fill-height socket-state div(growl)