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

Proposed by Anthony Dillon
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) Approve
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.
Revision history for this message
Graham Bancroft (gbancroft-canonical) wrote :

Lgtm +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'css/scratch.css'
--- css/scratch.css 2015-10-23 11:06:32 +0000
+++ css/scratch.css 2016-01-07 12:24:53 +0000
@@ -387,29 +387,6 @@
387 border-color: #333;387 border-color: #333;
388}388}
389389
390/*#form-filter-search input[type='text'] {
391 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;
392 -webkit-border-radius: 6px 6px 6px 6px;
393 -moz-border-radius: 6px 6px 6px 6px;
394 border-radius: 6px 6px 6px 6px;
395 border: 0;
396 -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
397 -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
398 box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
399 color: #FFFFFF;
400 font-size: 0.813em;
401 height: 24px;
402 margin-bottom: 0;
403 padding-left: 30px;
404 -webkit-transition: all 0.5s ease 0s;
405 -moz-transition: all 0.5s ease 0s;
406 transition: all 0.5s ease 0s;
407 width: 170px;
408}
409#form-filter-search input[type='text']:focus {
410 background-color: #A63603;
411}*/
412
413#form-filter-search input[type='submit'] {390#form-filter-search input[type='submit'] {
414 position: relative;391 position: relative;
415 top: 3px;392 top: 3px;
@@ -741,6 +718,15 @@
741 padding-left: 20px;718 padding-left: 20px;
742}719}
743720
721.image-container {
722 background: #ececec;
723 padding: 40px;
724 display: inline-block;
725 width: 100%;
726 text-align: center;
727 box-sizing: border-box;
728}
729
744/* END general */730/* END general */
745731
746/* Scopes hero */732/* Scopes hero */

Subscribers

People subscribed via source and target branches