Merge pull request #694 from CanonicalLtd/palette-console-conf
Use common palette.
This commit is contained in:
commit
854802bd07
|
@ -25,7 +25,7 @@ log = logging.getLogger("console_conf.core")
|
|||
|
||||
class ConsoleConf(Application):
|
||||
|
||||
from console_conf.palette import COLORS, STYLES, STYLES_MONO
|
||||
from subiquitycore.palette import COLORS, STYLES, STYLES_MONO
|
||||
|
||||
project = "console_conf"
|
||||
|
||||
|
@ -40,7 +40,7 @@ class ConsoleConf(Application):
|
|||
|
||||
class RecoveryChooser(Application):
|
||||
|
||||
from console_conf.palette import COLORS, STYLES, STYLES_MONO
|
||||
from subiquitycore.palette import COLORS, STYLES, STYLES_MONO
|
||||
|
||||
project = "console_conf"
|
||||
|
||||
|
|
|
@ -1,81 +0,0 @@
|
|||
# Copyright 2015 Canonical, Ltd.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
""" Palette definitions """
|
||||
|
||||
COLORS = [
|
||||
("bg", (0x11, 0x11, 0x11)),
|
||||
("orange", (0xe9, 0x54, 0x20)),
|
||||
("danger", (0xff, 0x00, 0x00)),
|
||||
("good", (0x0e, 0x84, 0x20)),
|
||||
("neutral", (0x00, 0x7a, 0xa6)),
|
||||
("gray", (0x66, 0x66, 0x66)),
|
||||
("brand", (0x33, 0x33, 0x33)),
|
||||
("fg", (0xff, 0xff, 0xff)),
|
||||
]
|
||||
|
||||
STYLES = [
|
||||
('frame_header', 'fg', 'orange'),
|
||||
('body', 'fg', 'bg'),
|
||||
|
||||
('done_button', 'fg', 'bg'),
|
||||
('danger_button', 'fg', 'bg'),
|
||||
('other_button', 'fg', 'bg'),
|
||||
('done_button focus', 'fg', 'good'),
|
||||
('danger_button focus', 'fg', 'danger'),
|
||||
('other_button focus', 'fg', 'gray'),
|
||||
|
||||
('menu_button', 'fg', 'bg'),
|
||||
('menu_button focus', 'fg', 'gray'),
|
||||
|
||||
('info_primary', 'fg', 'bg'),
|
||||
('info_minor', 'gray', 'bg'),
|
||||
('info_error', 'danger', 'bg'),
|
||||
|
||||
('string_input', 'bg', 'fg'),
|
||||
('string_input focus', 'fg', 'gray'),
|
||||
|
||||
('progress_incomplete', 'fg', 'gray'),
|
||||
('progress_complete', 'fg', 'neutral'),
|
||||
('scrollbar', 'brand', 'bg'),
|
||||
('scrollbar focus', 'gray', 'bg'),
|
||||
]
|
||||
|
||||
STYLES_MONO = [
|
||||
('frame_header', 'white', 'black'),
|
||||
('body', 'white', 'black'),
|
||||
|
||||
('done_button', 'white', 'black'),
|
||||
('danger_button', 'white', 'black'),
|
||||
('other_button', 'white', 'black'),
|
||||
('done_button focus', 'black', 'white'),
|
||||
('danger_button focus', 'black', 'white'),
|
||||
('other_button focus', 'black', 'white'),
|
||||
|
||||
('menu_button', 'white', 'black'),
|
||||
('menu_button focus', 'black', 'white'),
|
||||
|
||||
('info_primary', 'white', 'black'),
|
||||
('info_minor', 'white', 'black'),
|
||||
('info_error', 'white', 'black'),
|
||||
|
||||
('string_input', 'white', 'black'),
|
||||
('string_input focus', 'black', 'white'),
|
||||
|
||||
('progress_incomplete', 'white', 'black'),
|
||||
('progress_complete', 'black', 'white'),
|
||||
('scrollbar_fg', 'white', 'black'),
|
||||
('scrollbar_bg', 'white', 'black'),
|
||||
]
|
|
@ -16,6 +16,7 @@ subiquitycore/testing/view_helpers.py
|
|||
subiquitycore/testing/__init__.py
|
||||
subiquitycore/netplan.py
|
||||
subiquitycore/core.py
|
||||
subiquitycore/palette.py
|
||||
subiquitycore/ssh.py
|
||||
subiquitycore/__init__.py
|
||||
subiquitycore/lsb_release.py
|
||||
|
@ -73,7 +74,6 @@ subiquity/cmd/__init__.py
|
|||
subiquity/cmd/tui.py
|
||||
subiquity/cmd/schema.py
|
||||
subiquity/snapd.py
|
||||
subiquity/palette.py
|
||||
subiquity/models/identity.py
|
||||
subiquity/models/locale.py
|
||||
subiquity/models/mirror.py
|
||||
|
@ -145,7 +145,6 @@ console_conf/controllers/chooser.py
|
|||
console_conf/cmd/__init__.py
|
||||
console_conf/cmd/tui.py
|
||||
console_conf/cmd/write_login_details.py
|
||||
console_conf/palette.py
|
||||
console_conf/models/identity.py
|
||||
console_conf/models/systems.py
|
||||
console_conf/models/console_conf.py
|
||||
|
|
|
@ -83,7 +83,7 @@ class Subiquity(Application):
|
|||
'additionalProperties': True,
|
||||
}
|
||||
|
||||
from subiquity.palette import COLORS, STYLES, STYLES_MONO
|
||||
from subiquitycore.palette import COLORS, STYLES, STYLES_MONO
|
||||
|
||||
project = "subiquity"
|
||||
|
||||
|
|
Loading…
Reference in New Issue