Ubuntu Insights

Merge lp:~canonical-website-editors/resource-centre/remove-topic-background into lp:resource-centre

  1. remove-topic-background
  2. Merge into resource-centre
Proposed by Graham Bancroft
Status: Merged
Approved by: Graham Bancroft
Approved revision: 100
Merged at revision: 99
Proposed branch: lp:~canonical-website-editors/resource-centre/remove-topic-background
Merge into: lp:resource-centre
Diff against target: 269 lines (+26/-105)
4 files modified
single.php (+1/-1)
static/css/large.css (+3/-38)
static/css/large.css.map (+1/-1)
static/css/large.scss (+21/-65)
To merge this branch: bzr merge lp:~canonical-website-editors/resource-centre/remove-topic-background
Reviewer Review Type Date Requested Status
Peter Mahnke (community) Approve
Review via email: mp+325191@code.launchpad.net

Description of the change

## Done

Remove background images from topic boxes

## QA

Go to https://insights.ubuntu.com/2017/06/02/kubernetes-webinar-series/ and inspect the 'Ubuntu Desktop' box on the right hand side and remove the right padding and background image

To post a comment you must log in.
Revision history for this message
Peter Mahnke (peterm-ubuntu) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'single.php'
2--- single.php 2017-03-23 22:57:31 +0000
3+++ single.php 2017-06-06 22:13:51 +0000
4@@ -457,7 +457,7 @@
5 $do_not_duplicate[] = $post->ID;
6 $slug = basename(get_permalink());
7 ?>
8- <div id="rtp-<?php echo $current_tax; ?>" class="box box-<?php echo $current_tax; ?> box-highlight contextual-footer four-col">
9+ <div id="rtp-<?php echo $current_tax; ?>" class="box box-highlight contextual-footer four-col">
10 <div class="box-<?php echo $slug; ?> four-col">
11 <ul class="no-bullets">
12 <li>
13
14=== modified file 'static/css/large.css'
15--- static/css/large.css 2017-03-29 10:00:48 +0000
16+++ static/css/large.css 2017-06-06 22:13:51 +0000
17@@ -1,12 +1,12 @@
18-/*
19+/*
20 Theme Name: Ubuntu Resources
21 Theme URI: http://canonical.com
22 Description: Ubuntu resource hub theme
23 Version: 1
24-Author: Canonical Ltd
25+Author: Canonical Ltd
26 Author URI: http://canonical.com
27
28-Copyright (C) 2012 Canonical Ltd
29+Copyright (C) 2012 Canonical Ltd
30
31 Contents:
32
33@@ -174,41 +174,6 @@
34 top: -28px;
35 right: 43px; }
36
37-.box-desktop,
38-.box-phone,
39-.box-tablet,
40-.box-server,
41-.box-cloud,
42-.box-digest {
43- background-size: 167px 167px;
44- background-repeat: no-repeat;
45- background-position: 154% 50%;
46- border: 0;
47- padding-right: 90px; }
48-
49-.box-digest {
50- background-position: 87% 36%;
51- background-size: 90px 90px;
52- padding-right: 20px; }
53-
54-.box-phone {
55- background-image: url("static/img/pictograms/picto-phone-orange.svg"); }
56-
57-.box-tablet {
58- background-image: url("static/img/pictograms/picto-tablet-orange.svg"); }
59-
60-.box-desktop {
61- background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-desktop-orange.svg"); }
62-
63-.box-server {
64- background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-server-midaubergine.svg"); }
65-
66-.box-cloud {
67- background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-cloudcomputing-orange.svg"); }
68-
69-.box-digest {
70- background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-email-orange.svg"); }
71-
72 .search .row {
73 padding-bottom: 40px; }
74
75
76=== modified file 'static/css/large.css.map'
77--- static/css/large.css.map 2017-03-29 10:00:48 +0000
78+++ static/css/large.css.map 2017-06-06 22:13:51 +0000
79@@ -1,6 +1,6 @@
80 {
81 "version": 3,
82-"mappings": "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",
83+"mappings": "AAAA;;;;;;;;;;;;;;;;;;;EAmBE;ACnBF;;;;;;;;;;GAUG;AAcH;;;;GAIG;AC5BH;;;;GAIG;AFyB2B,mBAAmB;AACnB,oCAAoC;AACpC,eAAe;AACf,eAAe;AACf,gBAAgB;AAClB,eAAe;AAM3C,0BAA0B;AAE1B,+GAA+E;AAK/E,IAAK;EACJ,qBAAqB,EAAE,KAAK;EAC5B,SAAS,EAAE,IAAI;;AAGhB,UAAW;EACV,OAAO,EAAE,OAAO;EAChB,OAAO,EAAE,IAAI;;AAGd,QAAS;EAAE,UAAU,EAAE,IAAI;;AAE3B,aAAc;EAAE,aAAa,EAAE,CAAC;;AAEhC,kCAAmC;EAC/B,UAAU,EAAE,CAAC;;AAGjB;mEACoE;EAChE,gBAAgB,EAAE,OAAO;;AAG7B,0CAA2C;EACvC,OAAO,EAAE,KAAK;;AAGlB,4CAA6C;EACzC,OAAO,EAAE,IAAI;;AAOjB,sCAAuC;EACnC,YAAY,EAAE,YAAY;EAC1B,aAAa,EAAE,YAAY;;AAG/B;8CAC+C;EAC3C,OAAO,EAAE,KAAK;EACd,YAAY,EAAE,YAAY;EAC1B,aAAa,EAAE,YAAY;;AAG/B,mBAAoB;EACnB,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,KAAK;;AAGb,WAAY;EAAE,YAAY,EAAE,CAAC;;AAE7B,IAAK;EAAE,OAAO,EAAE,cAAc;;AAE9B,aAAc;EAAE,KAAK,EAAE,KAAK;;AAE5B,qBAAsB;EACrB,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,OAAO;;AAKpB,EAAG;EAAE,SAAS,EAAE,QAAQ;;AAIxB,0CAA2C;EAC1C,OAAO,EAAE,CAAC;EACV,QAAQ,EAAE,QAAQ;;AAGnB,oBAAqB;EACpB,YAAY,EAAE,CAAC;EACf,WAAW,EAAE,IAAI;;AAGlB,iBAAkB;EAAE,WAAW,EAAE,CAAC;;AAElC,kCAAmC;EAAE,YAAY,EAAE,CAAC;;AAEpD,6BAA8B;EAAE,cAAc,EAAE,IAAI;;AAEpD,+BAAgC;EAAE,aAAa,EAAE,CAAC;;AAIlD,aAAc;EAGV,OAAO,EAAE,CAAC;EAEV,4BAAe;IACX,eAAe,EAAE,WAAW;IAC5B,mBAAmB,EAAE,qBAAqB;;AAIlD,4BAA6B;EACzB,UAAU,EAAE,KAAK;;AAQb;;;;;0EAAe;EACX,UAAU,EAAE,CAAC;EACb,cAAc,EAAE,IAAI;;AAKhC,yCAA0C;EACtC,cAAc,EAAE,CAAC;;AAGrB,qCAAsC;EAClC,cAAc,EAAE,IAAI;;AAIxB;;;;;+CAKiD;EAC7C,eAAe,EAAE,WAAW;EAC5B,mBAAmB,EAAE,OAAO;EAC5B,cAAc,EAAE,IAAI;;AAGxB,+CAAiD;EAC/C,eAAe,EAAE,WAAW;;AAG9B,mBAAoB;EAChB,OAAO,EAAE,WAAW;EAEpB,kCAAe;IACX,UAAU,EAAE,KAAK;EAGrB,4CAAyB;IACrB,eAAe,EAAE,WAAW;IAC5B,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,KAAK;IACZ,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,IAAI;;AAInB,YAAa;EACX,cAAc,EAAE,IAAI;;AAGtB,mBAAoB;EACnB,OAAO,EAAE,YAAY;EACrB,KAAK,EAAE,IAAI;EACX,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,IAAI;;AAGZ,sCAAuC;EAAE,aAAa,EAAE,IAAI;;AAE5D,4BAA6B;EAAE,GAAG,EAAE,MAAM;;AAE1C,mCAAoC;EACnC,KAAK,EAAE,IAAI;EACX,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,IAAI;;AAGZ,kCAAmC;EAAE,MAAM,EAAE,CAAC;;AAI9C,0BAA2B;EAC1B,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,aAAa;;AAKtB,gCAAiC;EAC7B,MAAM,EAAE,SAAS;;AAGrB,cAAe;EACb,WAAW,EAAE,IAAI;EACjB,aAAa,EAAE,IAAI;;AAGrB,qBAAsB;EACpB,GAAG,EAAE,IAAI;;AASX,uBAAwB;EAAE,OAAO,EAAE,IAAI;;AAEvC,gCAAiC;EAChC,SAAS,EAAE,IAAI;;AAKhB,6DAA8D;EAC7D,UAAU,EAAE,IAAI",
84 "sources": ["large.scss","core-constants.scss","core-mixins.scss"],
85 "names": [],
86 "file": "large.css"
87
88=== modified file 'static/css/large.scss'
89--- static/css/large.scss 2017-03-29 10:00:48 +0000
90+++ static/css/large.scss 2017-06-06 22:13:51 +0000
91@@ -1,12 +1,12 @@
92-/*
93+/*
94 Theme Name: Ubuntu Resources
95 Theme URI: http://canonical.com
96 Description: Ubuntu resource hub theme
97 Version: 1
98-Author: Canonical Ltd
99+Author: Canonical Ltd
100 Author URI: http://canonical.com
101
102-Copyright (C) 2012 Canonical Ltd
103+Copyright (C) 2012 Canonical Ltd
104
105 Contents:
106
107@@ -17,7 +17,7 @@
108 share
109 product-business-card
110
111-*/
112+*/
113
114 @import 'core-constants';
115 @import 'core-mixins';
116@@ -46,7 +46,7 @@
117 $grid_unit_med: 20;
118
119 body {
120- background-attachment: fixed;
121+ background-attachment: fixed;
122 font-size: 16px;
123 }
124
125@@ -60,7 +60,7 @@
126 header.banner { margin-bottom: 0; }
127
128 header.banner .nav-primary .topics {
129- border-top: 0;
130+ border-top: 0;
131 }
132
133 header.banner .nav-primary ul li.active a,
134@@ -121,8 +121,8 @@
135 position: relative;
136 }
137
138-footer.global .legal {
139- padding-left: 0;
140+footer.global .legal {
141+ padding-left: 0;
142 padding-top: 13px;
143 }
144
145@@ -136,11 +136,11 @@
146
147 // glossary-box
148 // -----------------------------------------------------------------
149-.glossary-box {
150- //padding-bottom: 30px;
151+.glossary-box {
152+ //padding-bottom: 30px;
153 //margin-top: -10px;
154 padding: 0;
155-
156+
157 .inner-wrapper {
158 background-size: 210px 210px;
159 background-position: 100% -20px, 80% 148px;
160@@ -151,7 +151,7 @@
161 min-height: 330px;
162 }
163
164-body.category,
165+body.category,
166 body.tag,
167 body.page-template-page-category-php {
168 .glossary-box,
169@@ -160,11 +160,11 @@
170 min-height: 0;
171 padding-bottom: 10px;
172 }
173- }
174+ }
175 }
176
177 body.archive .glossary-box .inner-wrapper {
178- padding-bottom: 0;
179+ padding-bottom: 0;
180 }
181
182 body.tag .glossary-box .inner-wrapper {
183@@ -203,58 +203,14 @@
184 }
185 }
186
187-// cta boxes on single posts
188-.box-desktop,
189-.box-phone,
190-.box-tablet,
191-.box-server,
192-.box-cloud,
193-.box-digest {
194- background-size: 167px 167px;
195- background-repeat: no-repeat;
196- background-position: 154% 50%;
197- border: 0;
198- padding-right: 90px;
199-}
200-
201-.box-digest {
202- background-position: 87% 36%;
203- background-size: 90px 90px;
204- padding-right: 20px;
205-}
206-
207-.box-phone {
208- background-image: url("static/img/pictograms/picto-phone-orange.svg");
209-}
210-
211-.box-tablet {
212- background-image: url("static/img/pictograms/picto-tablet-orange.svg");
213-}
214-
215-.box-desktop {
216- background-image: url("#{$asset_path}pictograms/picto-pack/picto-desktop-orange.svg");
217-}
218-
219-.box-server {
220- background-image: url("#{$asset_path}pictograms/picto-pack/picto-server-midaubergine.svg");
221-}
222-
223-.box-cloud {
224- background-image: url("#{$asset_path}pictograms/picto-pack/picto-cloudcomputing-orange.svg");
225-}
226-
227-.box-digest {
228- background-image: url("#{$asset_path}pictograms/picto-pack/picto-email-orange.svg");
229-}
230-
231-.search .row {
232- padding-bottom: 40px;
233+.search .row {
234+ padding-bottom: 40px;
235 }
236
237 .search .no-results {
238 display: inline-block;
239 float: left;
240- margin-bottom: 40px;
241+ margin-bottom: 40px;
242 width: 100%;
243 }
244
245@@ -280,7 +236,7 @@
246 // single
247 // -----------------------------------------------------------------
248 .single #sidebar .list-social li {
249- margin: 0 6px 0 0;
250+ margin: 0 6px 0 0;
251 }
252
253 .video-wrapper {
254@@ -300,12 +256,12 @@
255 // -----------------------------------------------------------------
256 footer.global .top-link { display: none; }
257
258-.yes-js #main-nav.active li li a {
259- font-size: 18px;
260+.yes-js #main-nav.active li li a {
261+ font-size: 18px;
262 }
263
264 // press centre
265-// -----------------------------------------------------------------
266+// -----------------------------------------------------------------
267 body.page-template-page-press-php .row-resource-list .six-col {
268 min-height: 13em;
269 }

Subscribers

People subscribed via source and target branches

to all changes: