Skip to content

Replace black theme to bisque theme #152

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
TWT99 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Replace black theme to bisque theme #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fb3e8f
Added new css in Ao project
TWT99 Aug 16, 2020
9c765b9
Replace black css to bisque css
TWT99 Aug 16, 2020
4671027
Change shortcut key of bisque mode
TWT99 Aug 16, 2020
b0e703a
Create Homepage.html
TWT99 Sep 1, 2020
0a5e257
Delete Homepage.html
TWT99 Sep 1, 2020
c69341b
Create Homepage.html
TWT99 Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<html>

<p>Welcome to Software Construction and Configuration</p>
<p>This is an original work by TWT</p>

</html>
9,593 changes: 9,593 additions & 0 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ ipc.on('return', () => {
nav.click('.detailFooter-close');
});

ipc.on('toggle-black-mode', () => mode.black());
ipc.on('toggle-bisque-mode', () => mode.bisque());

ipc.on('toggle-dark-mode', () => mode.dark());

Expand Down
4 changes: 2 additions & 2 deletions src/menu/tray.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ module.exports = [
win.activate('toggle-sepia-mode');
}
}, {
label: 'Black Theme',
label: 'Bisque Theme',
click() {
win.appear();
win.activate('toggle-black-mode');
win.activate('toggle-bisque-mode');
}
}, {
label: 'Dark Theme',
Expand Down
6 changes: 3 additions & 3 deletions src/menu/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ module.exports = {
activate('toggle-sepia-mode');
}
}, {
label: 'Black Theme',
accelerator: setAcc('toggle-black-mode', 'CmdOrCtrl+B'),
label: 'Bisque Theme',
accelerator: setAcc('toggle-bisque-mode', 'CmdOrCtrl+B'),
click() {
activate('toggle-black-mode');
activate('toggle-bisque-mode');
}
}, {
label: 'Dark Theme',
Expand Down
7 changes: 3 additions & 4 deletions src/mode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ class Mode {
return settings.get('autoNightMode') ? this._enableAutoNight() : this._disableAutoNight();
}

black() {
this._toggle('black');
}

dark() {
this._toggle('dark');
}
Expand All @@ -54,6 +50,9 @@ class Mode {
sepia() {
this._toggle('sepia');
}
bisque() {
this._toggle('bisque');
}
}

module.exports = new Mode();
5 changes: 3 additions & 2 deletions src/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ settings.setAll({
launchMinimized: settings.get('launchMinimized', false),
menuBarHidden: settings.get('menuBarHidden', false),
mode: {
black: settings.get('mode.black', false),
bisque: settings.get('mode.bisque', false),
dark: settings.get('mode.dark', false),
sepia: settings.get('mode.sepia', false)
sepia: settings.get('mode.sepia', false),

},
requestExitConfirmation: settings.get('requestExitConfirmation', true),
sideBarHidden: settings.get('sideBarHidden', false),
Expand Down
90 changes: 90 additions & 0 deletions src/style/bisque-mode.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
html.dark-mode span, html.dark-mode .todayToolbar-count, html.dark-mode .o365sx-button {
color: #6E6F6F !important;
}
html.bisque-mode ::-webkit-scrollbar-track {
background-color: #FFE4C4!important;
}
html.bisque-mode .sidebar, html.bisque-mode #main, html.bisque-mode .steps, html.bisque-mode .detailFooter {
background-color: #FFE4C4 !important;
}
html.bisque-mode .steps {
border: 1px solid #FFE4C4!important;
}
html.bisque-mode .step .step-body {
box-shadow: 0 1px 0 0 #FFE4C4;
}
html.bisque-mode .details .details-separator {
background: #FFE4C4 !important;
border: 1px solid #FFE4C4!important;
}
html.bisque-mode .details .section, html.bisque-mode .details .section-item.detailNote, html.bisque-mode .detailHeader, html.bisque-mode .taskCard {
border: 1px solid #FFE4C4!important;
background-color: #FFE4C4 !important;
}
html.bisque-mode .button:hover {
background: #FFE4C4 !important;
}
html.bisque-mode .backgroundLines, html.bisque-mode #main .main-background, html.bisque-mode .rightColumn {
background-color: #FFEBCD !important;
background: #FFEBCD !important;
}
html.bisque-mode .active, html.bisque-mode .details, html.bisque-mode .details .section-item:hover {
background: #FFE4C4 !important;
}
html.bisque-mode .detailNote .editableContent .editableContent-edit {
background-color: #FFE4C4 !important;
background: #FFE4C4 !important;
}
html.bisque-mode .listItem:hover, html.bisque-mode .todayToolbar-item:hover, html.bisque-mode .baseAdd.addList:hover, html.bisque-mode .baseAdd.addList:active:hover, html.bisque-mode .baseAdd.addList:hover:hover, html.bisque-mode .hamburgerMenu button:hover, html.bisque-mode .step:hover, html.bisque-mode .step.selected, html.bisque-mode .step.selected:hover, html.bisque-mode .searchStep:hover .searchStep-body, html.bisque-mode .searchStep.selected .searchStep-body, html.bisque-mode .searchStep.selected:hover .searchStep-body, html.bisque-mode .modal-close:hover, html.bisque-mode .modal-return:hover, html.bisque-mode .moreEntriesButton:hover {
background-color: #A9A9A9 !important;
}
html.bisque-mode .hamburgerMenu button:hover {
box-shadow: 0 0 0 1px #FFE4C4!important;
}
html.bisque-mode .taskItem.selected .taskItem-body, html.bisque-mode .taskItem:hover .taskItem-body {
background: #FFE4C4 !important;
box-shadow: inset 0 0 0 0px #FFE4C4 !important;
}
html.bisque-mode #app > div.leftColumn.leftColumn-entered, html.bisque-mode #app > div.leftColumn.leftColumn-exited {
border-right: 1px solid #F0FFFF !important;
}
html.bisque-mode #app > div.rightColumn.rightColumn-entered > div, html.bisque-mode #app > div.rightColumn.rightColumn-exited > div {
border-left: 1px solid #FFE4C4 !important;
}
html.bisque-mode .sidebar-footer {
border-top: 1px solid #F0FFFF !important;
}
html.bisque-mode .taskItem-body, html.bisque-mode .collapsible-taskCard .taskCard {
box-shadow: 0 17px 0 -16px #FFE4C4 !important;
}
html.bisque-mode .baseAdd.addTask, html.bisque-mode .searchStep .searchStep-body {
box-shadow: 0 -17px 0 -16px #FFE4C4 !important;
}
html.bisque-mode .backgroundLines {
border-top: 1px solid #FFE4C4;
}
html.bisque-mode .detailFooter {
border-top: 1px solid #FFE4C4;
}
html.bisque-mode .detailFooter .detailFooter-close:hover, .detailFooter .detailFooter-trash:hover {
background-color: #FFE4C4 !important;
}
html.bisque-mode .modal, html.bisque-mode .popover, html.bisque-mode .popoverMenuItem:hover, html.bisque-mode .isOpen, html.bisque-mode .notificationToast, html.bisque-mode .datePicker-header, html.bisque-mode .popover-footerRight, html.bisque-mode .timePicker-input {
background: #FFE4C4 !important;
}
html.bisque-mode .notificationToast-postponeButton {
border-bottom: 1px solid #FFE4C4 !important;
}
html.bisque-mode .notificationToast-buttons button {
border-left: 1px solid #FFE4C4 !important;
}
html.bisque-mode .popover-header, html.bisque-mode .popover-footer, html.bisque-mode .popover-headerLeft, html.bisque-mode .popover-footerRight, html.bisque-mode .modal-sharing .modal-header {
border-bottom: 1px solid #FFE4C4 !important;
}
html.bisque-mode .modal-sharing .shared .modal-footer {
border-top: 1px solid #FFE4C4 !important;
}
html.bisque-mode .sidebar-addList-fixed {
box-shadow: 0 -1px 0 #FFE4C4 !important;
}

86 changes: 0 additions & 86 deletions src/style/black-mode.css
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/win.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Win {
return Object.assign({}, this._minDimensions, this._lastState, {
alwaysOnTop: settings.get('alwaysOnTop'),
autoHideMenuBar: settings.get('menuBarHidden'),
darkTheme: settings.get('mode.dark') || settings.get('mode.black'),
darkTheme: settings.get('mode.dark'),
icon: is.linux && file.icon,
show: false,
title: app.getName(),
Expand Down