The layout.css file is auto-generated by the uxd tool and should remain so for now to
reduce headaches. I know this has already been ACKed and pushed, but in the future, you
should submit a patch for the UXdev repo, or simply put the patch in another file. I will
manually merge these changes into UXdev in the appropriate places.
Otherwise, nice work!
Cheers,
Ken Keiter (tigger)
On Jun 23, 2011, at 1:30 AM, jtomasek(a)redhat.com wrote:
From: Jiri Tomasek <jtomasek(a)redhat.com>
---
src/app/stylesheets/layout.scss | 9 +++++++--
src/app/views/layouts/application.haml | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 18fff1c..a207bef 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -663,7 +663,7 @@ $contentpadding: 7px;
div#content{
width: $width - (2 * $contentpadding);
margin: 0 auto;
- margin-bottom: 98px;
+ margin-bottom: 58px;
min-height: 200px;
-webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px;
background-color: #FAFAFA;
@@ -2336,6 +2336,11 @@ Page Footer -- v.0.0.1 [footer] (footer.scss)
/* Footer */
+.clearfooter{
+ height: 40px;
+ clear: both;
+}
+
footer.standard{
background: rgba(0, 0, 0, 0.20);
@@ -2364,7 +2369,7 @@ footer.standard{
nav.footer{
display: inline-block;
- padding: 14px;
+ padding: 14px 14px 13px 14px;
a{
color: #fff;
padding-right: 6px;
diff --git a/src/app/views/layouts/application.haml
b/src/app/views/layouts/application.haml
index 044d9e0..c943ef3 100644
--- a/src/app/views/layouts/application.haml
+++ b/src/app/views/layouts/application.haml
@@ -42,7 +42,7 @@
-# works with any 960 container (.container_16 or .container_24)
= render :partial => 'layouts/nav_history'
= yield
-
+ .clearfooter
%footer.standard
.container
= image_tag('footer-rhlogo.png', :id => 'logo')
--
1.7.4.2