Merge lp:~ya-bo-ng/ubuntu-brand-guidelines/image-container into lp:ubuntu-brand-guidelines

Proposed by Anthony Dillon on 2016-01-07
Status: Merged
Merged at revision: 46
Proposed branch: lp:~ya-bo-ng/ubuntu-brand-guidelines/image-container
Merge into: lp:ubuntu-brand-guidelines
Diff against target: 49 lines (+9/-23)
1 file modified
css/scratch.css (+9/-23)
To merge this branch: bzr merge lp:~ya-bo-ng/ubuntu-brand-guidelines/image-container
Reviewer Review Type Date Requested Status
Graham Bancroft (community) 2016-01-07 Approve on 2016-01-07
Review via email: mp+281849@code.launchpad.net

Description of the change

# Done
- Added an image-container class which adds a grey border around images if wrapped

## QA
- Check the css is ok

To post a comment you must log in.

Lgtm +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/scratch.css'
2--- css/scratch.css 2015-10-23 11:06:32 +0000
3+++ css/scratch.css 2016-01-07 12:24:53 +0000
4@@ -387,29 +387,6 @@
5 border-color: #333;
6 }
7
8-/*#form-filter-search input[type='text'] {
9- background: url("http://assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-search.png") no-repeat scroll 5px center, none repeat scroll 0 0 #BE3D00;
10- -webkit-border-radius: 6px 6px 6px 6px;
11- -moz-border-radius: 6px 6px 6px 6px;
12- border-radius: 6px 6px 6px 6px;
13- border: 0;
14- -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
15- -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
16- box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
17- color: #FFFFFF;
18- font-size: 0.813em;
19- height: 24px;
20- margin-bottom: 0;
21- padding-left: 30px;
22- -webkit-transition: all 0.5s ease 0s;
23- -moz-transition: all 0.5s ease 0s;
24- transition: all 0.5s ease 0s;
25- width: 170px;
26-}
27-#form-filter-search input[type='text']:focus {
28- background-color: #A63603;
29-}*/
30-
31 #form-filter-search input[type='submit'] {
32 position: relative;
33 top: 3px;
34@@ -741,6 +718,15 @@
35 padding-left: 20px;
36 }
37
38+.image-container {
39+ background: #ececec;
40+ padding: 40px;
41+ display: inline-block;
42+ width: 100%;
43+ text-align: center;
44+ box-sizing: border-box;
45+}
46+
47 /* END general */
48
49 /* Scopes hero */

Subscribers

People subscribed via source and target branches