Merge lp:~mcintire-evan/ubuntu-terminal-app/fix-ubuntu-colorscheme into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Evan McIntire
Status: Merged
Approved by: Florian Boucault
Approved revision: 227
Merge reported by: Florian Boucault
Merged at revision: not available
Proposed branch: lp:~mcintire-evan/ubuntu-terminal-app/fix-ubuntu-colorscheme
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 142 lines (+138/-0)
1 file modified
src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme (+138/-0)
To merge this branch: bzr merge lp:~mcintire-evan/ubuntu-terminal-app/fix-ubuntu-colorscheme
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing
Ubuntu Terminal Developers Pending
Review via email: mp+313660@code.launchpad.net

Commit message

Description of the change

Re-adds the Ubuntu Colorscheme that was removed

Fixes https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1631628

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:227
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/fix-ubuntu-colorscheme/+merge/313660/+edit-commit-message

https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/63/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/1000/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/63/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

This patch was applied to lp:ubuntu-terminal-app.

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme'
2--- src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme 1970-01-01 00:00:00 +0000
3+++ src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme 2016-12-21 01:16:01 +0000
4@@ -0,0 +1,138 @@
5+# UbuntuColors are taken from:
6+# http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/staging/view/head:/src/Ubuntu/Components/1.3/UbuntuColors.qml
7+
8+# Colors that are not included in the official palette have been generated with:
9+# http://www.color-hex.com/
10+
11+# Same as Color0 (Black)
12+[Background]
13+Bold=false
14+Color=17,17,17
15+Transparency=false
16+
17+# Same as Color0Intense (Black)
18+[BackgroundIntense]
19+Bold=true
20+Color=59,59,59
21+Transparency=false
22+
23+# Black: UbuntuColors.jet
24+[Color0]
25+Bold=false
26+Color=17,17,17
27+Transparency=false
28+
29+# BlackIntense: UbuntuColors.inkstone
30+[Color0Intense]
31+Bold=true
32+Color=59,59,59
33+Transparency=false
34+
35+# Red: UbuntuColors.red
36+[Color1]
37+Bold=false
38+Color=237,49,70
39+Transparency=false
40+
41+# RedIntense: a tint of UbuntuColors.red (#f05a6a)
42+# http://www.color-hex.com/color/ed3146
43+[Color1Intense]
44+Bold=true
45+Color=240,90,106
46+Transparency=false
47+
48+#`Green: UbuntuColors.green
49+[Color2]
50+Bold=false
51+Color=62,179,79
52+Transparency=false
53+
54+#`GreenIntense: a tint of UbuntuColors.green (#64c272)
55+# http://www.color-hex.com/color/3eb34f
56+[Color2Intense]
57+Bold=true
58+Color=100,194,114
59+Transparency=false
60+
61+# Yellow: analogous of UbuntuColors.orange (#e9b920)
62+# http://www.color-hex.com/color/e95420
63+[Color3]
64+Bold=false
65+Color=223,185,32
66+Transparency=false
67+
68+# YellowIntense: a tint of the yellow above (#edc74c)
69+# http://www.color-hex.com/color/e9b920
70+[Color3Intense]
71+Bold=true
72+Color=237,199,76
73+Transparency=false
74+
75+# Blue: UbuntuColors.blue
76+[Color4]
77+Bold=false
78+Color=25,182,238
79+Transparency=false
80+
81+# BlueIntense: a tint of UbuntuColors.blue (#46c4f1)
82+# http://www.color-hex.com/color/19b6ee
83+[Color4Intense]
84+Bold=true
85+Color=70,196,241
86+Transparency=false
87+
88+# Magenta: complementary of UbuntuColors.green (#b33ea2)
89+# http://www.color-hex.com/color/3eb34f
90+[Color5]
91+Bold=false
92+Color=179,62,162
93+Transparency=false
94+
95+# MagentaIntense: a tint of the magenta above (#c264b4)
96+# http://www.color-hex.com/color/b33ea2
97+[Color5Intense]
98+Bold=true
99+Color=194,100,180
100+Transparency=false
101+
102+# Cyan: complementary of UbuntuColors.red (#31edd8)
103+# http://www.color-hex.com/color/ed3146
104+[Color6]
105+Bold=false
106+Color=49,237,216
107+Transparency=false
108+
109+# CyanIntense: a tint of the cyan above (#5af0df)
110+# http://www.color-hex.com/color/31edd8
111+[Color6Intense]
112+Bold=true
113+Color=90,240,223
114+Transparency=false
115+
116+# White: UbuntuColors.silk
117+[Color7]
118+Bold=false
119+Color=193,193,193
120+Transparency=false
121+
122+# WhiteIntense: 255 - UbuntuColors.jet
123+[Color7Intense]
124+Bold=true
125+Color=236,236,236
126+Transparency=false
127+
128+# Same as Color7 (White)
129+[Foreground]
130+Bold=false
131+Color=193,193,193
132+Transparency=false
133+
134+# Same as Color7Intense (White)
135+[ForegroundIntense]
136+Bold=true
137+Color=236,236,236
138+Transparency=false
139+
140+[General]
141+Description=Ubuntu
142+Opacity=1

Subscribers

People subscribed via source and target branches