Andrew Starr-Bochicchio has proposed merging lp:~andrewsomething/ubuntu-packaging-guide/lp1201636 into lp:ubuntu-packaging-guide.
Requested reviews: Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team) Related bugs: Bug #1201636 in Ubuntu Packaging Guide: "Minimized css is not the "preferred form of modification"" https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/1201636 For more details, see: https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/lp1201636/+merge/174914 Use un-minified versions of 960.css and reset.css and fix a little fallout from changes to 960.css upstream -- https://code.launchpad.net/~andrewsomething/ubuntu-packaging-guide/lp1201636/+merge/174914 Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~andrewsomething/ubuntu-packaging-guide/lp1201636 into lp:ubuntu-packaging-guide.
=== modified file 'debian/changelog' --- debian/changelog 2013-07-13 17:41:18 +0000 +++ debian/changelog 2013-07-16 03:54:22 +0000 @@ -1,6 +1,7 @@ ubuntu-packaging-guide (0.3.3) UNRELEASED; urgency=low - * + * Use un-minified versions of 960.css and reset.css (Closes: #717008, + LP: #1201636). -- Andrew Starr-Bochicchio <[email protected]> Sat, 13 Jul 2013 13:40:17 -0400 === modified file 'themes/ubuntu/layout.html' --- themes/ubuntu/layout.html 2013-04-21 04:31:44 +0000 +++ themes/ubuntu/layout.html 2013-07-16 03:54:22 +0000 @@ -152,8 +152,8 @@ {%- block content %} -<div id="content" class="body container-12"> - <div class="grid-12"> +<div id="content" class="body container_12"> + <div class="grid_12"> {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %} @@ -162,7 +162,7 @@ {%- if render_sidebar %} {%- endif %} - <div class="grid-9 alpha"> + <div class="grid_9 alpha"> {% block body %} {% endblock %} <div class="divide"></div> === modified file 'themes/ubuntu/sidebar.html' --- themes/ubuntu/sidebar.html 2012-05-10 16:52:05 +0000 +++ themes/ubuntu/sidebar.html 2013-07-16 03:54:22 +0000 @@ -8,7 +8,7 @@ :license: BSD, see LICENSE for details. #} - <div id="sidebar" class="grid-3 omega"> + <div id="sidebar" class="grid_3 omega"> <div class="container-tweet"> {%- if logo %} === modified file 'themes/ubuntu/static/960.css' --- themes/ubuntu/static/960.css 2012-05-10 22:37:51 +0000 +++ themes/ubuntu/static/960.css 2013-07-16 03:54:22 +0000 @@ -12,4 +12,346 @@ Note: IE6 works fine without this fix. */ -body{min-width:960px}.container-12{margin-left:auto;margin-right:auto;width:960px}.grid-1,.grid-2,.grid-3,.grid-4,.grid-5,.grid-6,.grid-7,.grid-8,.grid-9,.grid-10,.grid-11,.grid-12{display:inline;float:left;margin-left:10px;margin-right:10px}.push-1,.pull-1,.push-2,.pull-2,.push-3,.pull-3,.push-4,.pull-4,.push-5,.pull-5,.push-6,.pull-6,.push-7,.pull-7,.push-8,.pull-8,.push-9,.pull-9,.push-10,.pull-10,.push-11,.pull-11{position:relative}.alpha{margin-left:0}.omega{margin-right:0}.container-12 .grid-1{width:60px}.container-12 .grid-2{width:140px}.container-12 .grid-3{width:220px}.container-12 .grid-4{width:300px}.container-12 .grid-5{width:380px}.container-12 .grid-6{width:460px}.container-12 .grid-7{width:540px}.container-12 .grid-8{width:620px}.container-12 .grid-9{width:700px}.container-12 .grid-10{width:780px}.container-12 .grid-11{width:860px}.container-12 .grid-12{width:940px}.container-12 .prefix-1{padding-left:80px}.container-12 .prefix-2{padding-left:160px}.container-12 .prefix-3{padding-left:240px}.container-12 .prefix-4{padding-left:320px}.container-12 .prefix-5{padding-left:400px}.container-12 .prefix-6{padding-left:480px}.container-12 .prefix-7{padding-left:560px}.container-12 .prefix-8{padding-left:640px}.container-12 .prefix-9{padding-left:720px}.container-12 .prefix-10{padding-left:800px}.container-12 .prefix-11{padding-left:880px}.container-12 .suffix-1{padding-right:80px}.container-12 .suffix-2{padding-right:160px}.container-12 .suffix-3{padding-right:240px}.container-12 .suffix-4{padding-right:320px}.container-12 .suffix-5{padding-right:400px}.container-12 .suffix-6{padding-right:480px}.container-12 .suffix-7{padding-right:560px}.container-12 .suffix-8{padding-right:640px}.container-12 .suffix-9{padding-right:720px}.container-12 .suffix-10{padding-right:800px}.container-12 .suffix-11{padding-right:880px}.container-12 .push-1{left:80px}.container-12 .push-2{left:160px}.container-12 .push-3{left:240px}.container-12 .push-4{left:320px}.container-12 .push-5{left:400px}.container-12 .push-6{left:480px}.container-12 .push-7{left:560px}.container-12 .push-8{left:640px}.container-12 .push-9{left:720px}.container-12 .push-10{left:800px}.container-12 .push-11{left:880px}.container-12 .pull-1{left:-80px}.container-12 .pull-2{left:-160px}.container-12 .pull-3{left:-240px}.container-12 .pull-4{left:-320px}.container-12 .pull-5{left:-400px}.container-12 .pull-6{left:-480px}.container-12 .pull-7{left:-560px}.container-12 .pull-8{left:-640px}.container-12 .pull-9{left:-720px}.container-12 .pull-10{left:-800px}.container-12 .pull-11{left:-880px}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}.clearfix:before,.clearfix:after,.container-12:before,.container-12:after{content:'.';display:block;overflow:hidden;visibility:hidden;font-size:0;line-height:0;width:0;height:0}.clearfix:after,.container-12:after{clear:both}.clearfix,.container-12{zoom:1} + +body { + min-width: 960px; +} + +/* `Container +----------------------------------------------------------------------------------------------------*/ + +.container_12 { + margin-left: auto; + margin-right: auto; + width: 960px; +} + +/* `Grid >> Global +----------------------------------------------------------------------------------------------------*/ + +.grid_1, +.grid_2, +.grid_3, +.grid_4, +.grid_5, +.grid_6, +.grid_7, +.grid_8, +.grid_9, +.grid_10, +.grid_11, +.grid_12 { + display: inline; + float: left; + margin-left: 10px; + margin-right: 10px; +} + +.push_1, .pull_1, +.push_2, .pull_2, +.push_3, .pull_3, +.push_4, .pull_4, +.push_5, .pull_5, +.push_6, .pull_6, +.push_7, .pull_7, +.push_8, .pull_8, +.push_9, .pull_9, +.push_10, .pull_10, +.push_11, .pull_11 { + position: relative; +} + +/* `Grid >> Children (Alpha ~ First, Omega ~ Last) +----------------------------------------------------------------------------------------------------*/ + +.alpha { + margin-left: 0; +} + +.omega { + margin-right: 0; +} + +/* `Grid >> 12 Columns +----------------------------------------------------------------------------------------------------*/ + +.container_12 .grid_1 { + width: 60px; +} + +.container_12 .grid_2 { + width: 140px; +} + +.container_12 .grid_3 { + width: 220px; +} + +.container_12 .grid_4 { + width: 300px; +} + +.container_12 .grid_5 { + width: 380px; +} + +.container_12 .grid_6 { + width: 460px; +} + +.container_12 .grid_7 { + width: 540px; +} + +.container_12 .grid_8 { + width: 620px; +} + +.container_12 .grid_9 { + width: 700px; +} + +.container_12 .grid_10 { + width: 780px; +} + +.container_12 .grid_11 { + width: 860px; +} + +.container_12 .grid_12 { + width: 940px; +} + +/* `Prefix Extra Space >> 12 Columns +----------------------------------------------------------------------------------------------------*/ + +.container_12 .prefix_1 { + padding-left: 80px; +} + +.container_12 .prefix_2 { + padding-left: 160px; +} + +.container_12 .prefix_3 { + padding-left: 240px; +} + +.container_12 .prefix_4 { + padding-left: 320px; +} + +.container_12 .prefix_5 { + padding-left: 400px; +} + +.container_12 .prefix_6 { + padding-left: 480px; +} + +.container_12 .prefix_7 { + padding-left: 560px; +} + +.container_12 .prefix_8 { + padding-left: 640px; +} + +.container_12 .prefix_9 { + padding-left: 720px; +} + +.container_12 .prefix_10 { + padding-left: 800px; +} + +.container_12 .prefix_11 { + padding-left: 880px; +} + +/* `Suffix Extra Space >> 12 Columns +----------------------------------------------------------------------------------------------------*/ + +.container_12 .suffix_1 { + padding-right: 80px; +} + +.container_12 .suffix_2 { + padding-right: 160px; +} + +.container_12 .suffix_3 { + padding-right: 240px; +} + +.container_12 .suffix_4 { + padding-right: 320px; +} + +.container_12 .suffix_5 { + padding-right: 400px; +} + +.container_12 .suffix_6 { + padding-right: 480px; +} + +.container_12 .suffix_7 { + padding-right: 560px; +} + +.container_12 .suffix_8 { + padding-right: 640px; +} + +.container_12 .suffix_9 { + padding-right: 720px; +} + +.container_12 .suffix_10 { + padding-right: 800px; +} + +.container_12 .suffix_11 { + padding-right: 880px; +} + +/* `Push Space >> 12 Columns +----------------------------------------------------------------------------------------------------*/ + +.container_12 .push_1 { + left: 80px; +} + +.container_12 .push_2 { + left: 160px; +} + +.container_12 .push_3 { + left: 240px; +} + +.container_12 .push_4 { + left: 320px; +} + +.container_12 .push_5 { + left: 400px; +} + +.container_12 .push_6 { + left: 480px; +} + +.container_12 .push_7 { + left: 560px; +} + +.container_12 .push_8 { + left: 640px; +} + +.container_12 .push_9 { + left: 720px; +} + +.container_12 .push_10 { + left: 800px; +} + +.container_12 .push_11 { + left: 880px; +} + +/* `Pull Space >> 12 Columns +----------------------------------------------------------------------------------------------------*/ + +.container_12 .pull_1 { + left: -80px; +} + +.container_12 .pull_2 { + left: -160px; +} + +.container_12 .pull_3 { + left: -240px; +} + +.container_12 .pull_4 { + left: -320px; +} + +.container_12 .pull_5 { + left: -400px; +} + +.container_12 .pull_6 { + left: -480px; +} + +.container_12 .pull_7 { + left: -560px; +} + +.container_12 .pull_8 { + left: -640px; +} + +.container_12 .pull_9 { + left: -720px; +} + +.container_12 .pull_10 { + left: -800px; +} + +.container_12 .pull_11 { + left: -880px; +} + +/* `Clear Floated Elements +----------------------------------------------------------------------------------------------------*/ + +/* http://sonspring.com/journal/clearing-floats */ + +.clear { + clear: both; + display: block; + overflow: hidden; + visibility: hidden; + width: 0; + height: 0; +} + +/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */ + +.clearfix:before, +.clearfix:after, +.container_12:before, +.container_12:after { + content: '.'; + display: block; + overflow: hidden; + visibility: hidden; + font-size: 0; + line-height: 0; + width: 0; + height: 0; +} + +.clearfix:after, +.container_12:after { + clear: both; +} + +/* + The following zoom:1 rule is specifically for IE6 + IE7. + Move to separate stylesheet if invalid CSS is a problem. +*/ + +.clearfix, +.container_12 { + zoom: 1; +} \ No newline at end of file === modified file 'themes/ubuntu/static/base.css' --- themes/ubuntu/static/base.css 2012-10-28 14:18:03 +0000 +++ themes/ubuntu/static/base.css 2013-07-16 03:54:22 +0000 @@ -421,11 +421,11 @@ .box-clear { margin-bottom: 40px; } -.box-clear .grid-4.first { +.box-clear .grid_4.first { margin-right: 15px; padding-right: 15px; } -.box-clear .grid-4 { +.box-clear .grid_4 { margin-left: 0; margin-right: 10px; padding-right: 10px; === modified file 'themes/ubuntu/static/reset.css' --- themes/ubuntu/static/reset.css 2012-01-27 11:59:17 +0000 +++ themes/ubuntu/static/reset.css 2013-07-16 03:54:22 +0000 @@ -1,8 +1,123 @@ /* -Copyright (c) 2010, Yahoo! Inc. All rights reserved. +Copyright (c) 2011, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html -version: 3.3.0 -build: 3167 +version: 2.9.0 */ -html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;} \ No newline at end of file +/** + * YUI Reset + * @module reset + * @namespace + * @requires + */ +html { + color: #000; + background: #FFF; +} + +body, +div, +dl, +dt, +dd, +ul, +ol, +li, +h1, +h2, +h3, +h4, +h5, +h6, +pre, +code, +form, +fieldset, +legend, +input, +button, +textarea, +select, +p, +blockquote, +th, +td { + margin: 0; + padding: 0; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +fieldset, +img { + border: 0; +} + +address, +button, +caption, +cite, +code, +dfn, +em, +input, +optgroup, +option, +select, +strong, +textarea, +th, +var { + font:inherit; +} + +del, +ins { + text-decoration: none; +} + +li { + list-style: none; +} + +caption, +th { + text-align: left; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-size: 100%; + font-weight: normal; +} + +q:before, +q:after { + content: ''; +} + +abbr, +acronym { + border: 0; + font-variant: normal; +} + +sup { + vertical-align: baseline; +} + +sub { + vertical-align: baseline; +} + +/*because legend doesn't inherit in IE */ +legend { + color: #000; +}
_______________________________________________ Mailing list: https://launchpad.net/~ubuntu-packaging-guide-team Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-packaging-guide-team More help : https://help.launchpad.net/ListHelp
