Merge lp:~amireldor/ubuntu-drupal-theme/ubuntu-drupal-theme into lp:ubuntu-drupal-theme

Proposed by Amir Eldor on 2013-05-15
Status: Needs review
Proposed branch: lp:~amireldor/ubuntu-drupal-theme/ubuntu-drupal-theme
Merge into: lp:ubuntu-drupal-theme
Diff against target: 82 lines (+27/-1)
5 files modified
page.tpl.php (+1/-1)
scripts/prefixfree.min.js (+5/-0)
styles/base.css (+1/-0)
styles/ubuntu-2010.css (+18/-0)
udtheme.info (+2/-0)
To merge this branch: bzr merge lp:~amireldor/ubuntu-drupal-theme/ubuntu-drupal-theme
Reviewer Review Type Date Requested Status
UD Devs 2013-05-15 Pending
Review via email: mp+163981@code.launchpad.net

Description of the change

Fixed bug https://bugs.launchpad.net/ubuntu-drupal-theme/+bug/1160254 (RTL layout problems on ubuntu-il.org).
I added `clear: both` on `#content` and it seemed to have done the trick.

To post a comment you must log in.
87. By Amir Eldor on 2013-06-01

Adding scripts/prefixfree and nice-button class

This needs a visit to the theme selection page on Drupal because udtheme.info
was updated.

88. By Amir Eldor on 2013-06-01

If $title is empty don't show <h1> in the page

This is when using something like the exclude_node_title module.

Unmerged revisions

88. By Amir Eldor on 2013-06-01

If $title is empty don't show <h1> in the page

This is when using something like the exclude_node_title module.

87. By Amir Eldor on 2013-06-01

Adding scripts/prefixfree and nice-button class

This needs a visit to the theme selection page on Drupal because udtheme.info
was updated.

86. By Amir Eldor on 2013-05-15

A better fix to that RTL bug. The previous fix didn't work on all situations.

85. By Amir Eldor on 2013-05-15

Seems to fix #1160254, RTL went mad with browser-customized font-size.

84. By Amir Eldor on 2013-05-15

Removing executable permission on all files. Why was it there in the first place?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'favicon.ico' (properties changed: +x to -x)
2=== modified file 'images/launchpad-logo.png' (properties changed: +x to -x)
3=== modified file 'page.tpl.php' (properties changed: +x to -x)
4--- page.tpl.php 2011-05-08 19:17:15 +0000
5+++ page.tpl.php 2013-06-01 17:47:23 +0000
6@@ -63,7 +63,7 @@
7 <?php } ?>
8 <div id="center" <?php print udtheme_body_class($left, $right); ?>>
9 <?php print $top_content ?>
10- <h1><?php print $title ?></h1>
11+ <?php if ($title) print "<h1>$title</h1>"; ?>
12 <?php if ($tabs) print $tabs; ?>
13 <?php print $content; ?>
14 </div>
15
16=== added directory 'scripts'
17=== added file 'scripts/prefixfree.min.js'
18--- scripts/prefixfree.min.js 1970-01-01 00:00:00 +0000
19+++ scripts/prefixfree.min.js 2013-06-01 17:47:23 +0000
20@@ -0,0 +1,5 @@
21+/**
22+ * StyleFix 1.0.3 & PrefixFree 1.0.7
23+ * @author Lea Verou
24+ * MIT license
25+ */(function(){function t(e,t){return[].slice.call((t||document).querySelectorAll(e))}if(!window.addEventListener)return;var e=window.StyleFix={link:function(t){try{if(t.rel!=="stylesheet"||t.hasAttribute("data-noprefix"))return}catch(n){return}var r=t.href||t.getAttribute("data-href"),i=r.replace(/[^\/]+$/,""),s=(/^[a-z]{3,10}:/.exec(i)||[""])[0],o=(/^[a-z]{3,10}:\/\/[^\/]+/.exec(i)||[""])[0],u=/^([^?]*)\??/.exec(r)[1],a=t.parentNode,f=new XMLHttpRequest,l;f.onreadystatechange=function(){f.readyState===4&&l()};l=function(){var n=f.responseText;if(n&&t.parentNode&&(!f.status||f.status<400||f.status>600)){n=e.fix(n,!0,t);if(i){n=n.replace(/url\(\s*?((?:"|')?)(.+?)\1\s*?\)/gi,function(e,t,n){return/^([a-z]{3,10}:|#)/i.test(n)?e:/^\/\//.test(n)?'url("'+s+n+'")':/^\//.test(n)?'url("'+o+n+'")':/^\?/.test(n)?'url("'+u+n+'")':'url("'+i+n+'")'});var r=i.replace(/([\\\^\$*+[\]?{}.=!:(|)])/g,"\\$1");n=n.replace(RegExp("\\b(behavior:\\s*?url\\('?\"?)"+r,"gi"),"$1")}var l=document.createElement("style");l.textContent=n;l.media=t.media;l.disabled=t.disabled;l.setAttribute("data-href",t.getAttribute("href"));a.insertBefore(l,t);a.removeChild(t);l.media=t.media}};try{f.open("GET",r);f.send(null)}catch(n){if(typeof XDomainRequest!="undefined"){f=new XDomainRequest;f.onerror=f.onprogress=function(){};f.onload=l;f.open("GET",r);f.send(null)}}t.setAttribute("data-inprogress","")},styleElement:function(t){if(t.hasAttribute("data-noprefix"))return;var n=t.disabled;t.textContent=e.fix(t.textContent,!0,t);t.disabled=n},styleAttribute:function(t){var n=t.getAttribute("style");n=e.fix(n,!1,t);t.setAttribute("style",n)},process:function(){t('link[rel="stylesheet"]:not([data-inprogress])').forEach(StyleFix.link);t("style").forEach(StyleFix.styleElement);t("[style]").forEach(StyleFix.styleAttribute)},register:function(t,n){(e.fixers=e.fixers||[]).splice(n===undefined?e.fixers.length:n,0,t)},fix:function(t,n,r){for(var i=0;i<e.fixers.length;i++)t=e.fixers[i](t,n,r)||t;return t},camelCase:function(e){return e.replace(/-([a-z])/g,function(e,t){return t.toUpperCase()}).replace("-","")},deCamelCase:function(e){return e.replace(/[A-Z]/g,function(e){return"-"+e.toLowerCase()})}};(function(){setTimeout(function(){t('link[rel="stylesheet"]').forEach(StyleFix.link)},10);document.addEventListener("DOMContentLoaded",StyleFix.process,!1)})()})();(function(e){function t(e,t,r,i,s){e=n[e];if(e.length){var o=RegExp(t+"("+e.join("|")+")"+r,"gi");s=s.replace(o,i)}return s}if(!window.StyleFix||!window.getComputedStyle)return;var n=window.PrefixFree={prefixCSS:function(e,r,i){var s=n.prefix;n.functions.indexOf("linear-gradient")>-1&&(e=e.replace(/(\s|:|,)(repeating-)?linear-gradient\(\s*(-?\d*\.?\d*)deg/ig,function(e,t,n,r){return t+(n||"")+"linear-gradient("+(90-r)+"deg"}));e=t("functions","(\\s|:|,)","\\s*\\(","$1"+s+"$2(",e);e=t("keywords","(\\s|:)","(\\s|;|\\}|$)","$1"+s+"$2$3",e);e=t("properties","(^|\\{|\\s|;)","\\s*:","$1"+s+"$2:",e);if(n.properties.length){var o=RegExp("\\b("+n.properties.join("|")+")(?!:)","gi");e=t("valueProperties","\\b",":(.+?);",function(e){return e.replace(o,s+"$1")},e)}if(r){e=t("selectors","","\\b",n.prefixSelector,e);e=t("atrules","@","\\b","@"+s+"$1",e)}e=e.replace(RegExp("-"+s,"g"),"-");e=e.replace(/-\*-(?=[a-z]+)/gi,n.prefix);return e},property:function(e){return(n.properties.indexOf(e)?n.prefix:"")+e},value:function(e,r){e=t("functions","(^|\\s|,)","\\s*\\(","$1"+n.prefix+"$2(",e);e=t("keywords","(^|\\s)","(\\s|$)","$1"+n.prefix+"$2$3",e);return e},prefixSelector:function(e){return e.replace(/^:{1,2}/,function(e){return e+n.prefix})},prefixProperty:function(e,t){var r=n.prefix+e;return t?StyleFix.camelCase(r):r}};(function(){var e={},t=[],r={},i=getComputedStyle(document.documentElement,null),s=document.createElement("div").style,o=function(n){if(n.charAt(0)==="-"){t.push(n);var r=n.split("-"),i=r[1];e[i]=++e[i]||1;while(r.length>3){r.pop();var s=r.join("-");u(s)&&t.indexOf(s)===-1&&t.push(s)}}},u=function(e){return StyleFix.camelCase(e)in s};if(i.length>0)for(var a=0;a<i.length;a++)o(i[a]);else for(var f in i)o(StyleFix.deCamelCase(f));var l={uses:0};for(var c in e){var h=e[c];l.uses<h&&(l={prefix:c,uses:h})}n.prefix="-"+l.prefix+"-";n.Prefix=StyleFix.camelCase(n.prefix);n.properties=[];for(var a=0;a<t.length;a++){var f=t[a];if(f.indexOf(n.prefix)===0){var p=f.slice(n.prefix.length);u(p)||n.properties.push(p)}}n.Prefix=="Ms"&&!("transform"in s)&&!("MsTransform"in s)&&"msTransform"in s&&n.properties.push("transform","transform-origin");n.properties.sort()})();(function(){function i(e,t){r[t]="";r[t]=e;return!!r[t]}var e={"linear-gradient":{property:"backgroundImage",params:"red, teal"},calc:{property:"width",params:"1px + 5%"},element:{property:"backgroundImage",params:"#foo"},"cross-fade":{property:"backgroundImage",params:"url(a.png), url(b.png), 50%"}};e["repeating-linear-gradient"]=e["repeating-radial-gradient"]=e["radial-gradient"]=e["linear-gradient"];var t={initial:"color","zoom-in":"cursor","zoom-out":"cursor",box:"display",flexbox:"display","inline-flexbox":"display",flex:"display","inline-flex":"display",grid:"display","inline-grid":"display","min-content":"width"};n.functions=[];n.keywords=[];var r=document.createElement("div").style;for(var s in e){var o=e[s],u=o.property,a=s+"("+o.params+")";!i(a,u)&&i(n.prefix+a,u)&&n.functions.push(s)}for(var f in t){var u=t[f];!i(f,u)&&i(n.prefix+f,u)&&n.keywords.push(f)}})();(function(){function s(e){i.textContent=e+"{}";return!!i.sheet.cssRules.length}var t={":read-only":null,":read-write":null,":any-link":null,"::selection":null},r={keyframes:"name",viewport:null,document:'regexp(".")'};n.selectors=[];n.atrules=[];var i=e.appendChild(document.createElement("style"));for(var o in t){var u=o+(t[o]?"("+t[o]+")":"");!s(u)&&s(n.prefixSelector(u))&&n.selectors.push(o)}for(var a in r){var u=a+" "+(r[a]||"");!s("@"+u)&&s("@"+n.prefix+u)&&n.atrules.push(a)}e.removeChild(i)})();n.valueProperties=["transition","transition-property"];e.className+=" "+n.prefix;StyleFix.register(n.prefixCSS)})(document.documentElement);
26\ No newline at end of file
27
28=== modified file 'styles/base.css'
29--- styles/base.css 2011-05-09 01:30:41 +0000
30+++ styles/base.css 2013-06-01 17:47:23 +0000
31@@ -184,6 +184,7 @@
32
33 #content {
34 line-height: 1.4em;
35+ clear: both;
36 }
37
38 #content .container {
39
40=== modified file 'styles/ubuntu-2010.css'
41--- styles/ubuntu-2010.css 2011-05-12 01:00:56 +0000
42+++ styles/ubuntu-2010.css 2013-06-01 17:47:23 +0000
43@@ -174,6 +174,24 @@
44 color: #444444;
45 }
46
47+.nice-button {
48+ background-color: #C03F11;
49+ background-image: linear-gradient(#DD4814, #C03F11);
50+ border-radius: 4px 4px 4px 4px;
51+ color: #FFFFFF;
52+ display: inline-block;
53+ font-family: Ubuntu,Arial,"libra sans",sans-serif;
54+ font-size: 1em;
55+ font-weight: 300;
56+ margin: 0;
57+ padding: 6px 10px;
58+ text-decoration: none;
59+}
60+
61+.nice-button:hover {
62+ background-color: #DD4814;
63+}
64+
65 /**
66 * 5. Sidebar
67 */
68
69=== modified file 'template.php' (properties changed: +x to -x)
70=== modified file 'theme-settings.php' (properties changed: +x to -x)
71=== modified file 'udtheme.info' (properties changed: +x to -x)
72--- udtheme.info 2010-09-10 02:43:22 +0000
73+++ udtheme.info 2013-06-01 17:47:23 +0000
74@@ -7,6 +7,8 @@
75
76 stylesheets[all][] = styles/base.css
77
78+scripts[] = scripts/prefixfree.min.js
79+
80 regions[header] = Header
81 regions[subheader] = Second Header
82 regions[above_content] = Above Content and Sidebars

Subscribers

People subscribed via source and target branches