Commit 4cd5161605697b46eb094242687121bb02c9c9fd
1 parent
a79644a4
Exists in
master
and in
29 other branches
ActionItem220: design editor ok!
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1571 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
6 changed files
with
12 additions
and
2 deletions
Show diff stats
app/views/layouts/application.rhtml
| @@ -172,5 +172,11 @@ | @@ -172,5 +172,11 @@ | ||
| 172 | </div> | 172 | </div> |
| 173 | <%= javascript_include_tag 'better-browser-promotion' %> | 173 | <%= javascript_include_tag 'better-browser-promotion' %> |
| 174 | 174 | ||
| 175 | + <script type="text/javascript"> | ||
| 176 | + // the onload will run only after all related documents load. | ||
| 177 | + // by that we need to cal this here: | ||
| 178 | + if ( window.addEventListener ) resizePrincipalTemplateBox() | ||
| 179 | + </script> | ||
| 180 | + | ||
| 175 | </body> | 181 | </body> |
| 176 | </html> | 182 | </html> |
public/designs/icons/default/cancel-fat-HC.gif
130 Bytes
public/designs/icons/default/style.css
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | .icon-cancel { background-image: url(cancel-HC.gif) } | 9 | .icon-cancel { background-image: url(cancel-HC.gif) } |
| 10 | .icon-person { background-image: url(user_icon.png) } | 10 | .icon-person { background-image: url(user_icon.png) } |
| 11 | .icon-product { background-image: url(gnome-other.png) } | 11 | .icon-product { background-image: url(gnome-other.png) } |
| 12 | -.icon-delete { background-image: url(gtk-delete.png) } | 12 | +.icon-delete { background-image: url(cancel-HC.gif) } |
| 13 | .icon-find { background-image: url(noosfero-find.png) } | 13 | .icon-find { background-image: url(noosfero-find.png) } |
| 14 | .icon-back { background-image: url(go-back-HC.gif) } | 14 | .icon-back { background-image: url(go-back-HC.gif) } |
| 15 | .icon-next { background-image: url(gtk-media-next-ltr.png) } | 15 | .icon-next { background-image: url(gtk-media-next-ltr.png) } |
168 Bytes
public/designs/templates/default/stylesheets/style.css
| @@ -6,6 +6,10 @@ | @@ -6,6 +6,10 @@ | ||
| 6 | .box-1 { | 6 | .box-1 { |
| 7 | /* the width of this element is seted by javascript for Firefox */ | 7 | /* the width of this element is seted by javascript for Firefox */ |
| 8 | float: left; | 8 | float: left; |
| 9 | + margin-left: 4px; | ||
| 10 | +} | ||
| 11 | +.msie .box-1 { | ||
| 12 | + margin-right: 4px; | ||
| 9 | } | 13 | } |
| 10 | 14 | ||
| 11 | .box-2 { | 15 | .box-2 { |
public/javascripts/application.js
| @@ -28,7 +28,7 @@ function focus_first_field() { | @@ -28,7 +28,7 @@ function focus_first_field() { | ||
| 28 | /* * * Template Box Size Help * * */ | 28 | /* * * Template Box Size Help * * */ |
| 29 | function resizePrincipalTemplateBox() { | 29 | function resizePrincipalTemplateBox() { |
| 30 | var box1 = $$( "div.box-1" )[0]; | 30 | var box1 = $$( "div.box-1" )[0]; |
| 31 | - var otherBoxSum = 0; | 31 | + var otherBoxSum = 10; |
| 32 | var i = 2; | 32 | var i = 2; |
| 33 | var b = $$( "div.box-" + i++ )[0]; | 33 | var b = $$( "div.box-" + i++ )[0]; |
| 34 | while ( b.nodeName ) { | 34 | while ( b.nodeName ) { |