From 2a874a00dc14b71f2967f137144dd25a14df26c5 Mon Sep 17 00:00:00 2001 From: Ricardo Rauch Date: Thu, 17 Nov 2011 16:49:02 -0300 Subject: [PATCH] fixing aside on dashboard --- app/assets/stylesheets/style.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 771fe48b..1f050b9f 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -531,7 +531,6 @@ header .account-links a:last-child{ background-image: -o-linear-gradient(90deg, #447790 6.1%, #5da2bf 89.7%) } - /* eo Account Box */ input.search-input{float: left; text-shadow: none; width: 116px; background-image: url('icon-search.png') ; background-repeat: no-repeat; background-position: 10px; border-radius: 100px; border: 1px solid rgba(0,0,0,.7); box-shadow: 0 1px 0 rgba(255,255,255,.2), 0 2px 2px rgba(0,0,0,.4) inset ; background-color: #D2D5DA; background-color: rgba(255,255,255,.5); padding: 5px; padding-left: 26px; margin-top: 4px; margin-right: 10px } input.search-input:focus{ background-color: white; width: 216px;} @@ -545,12 +544,14 @@ h2.icon span{background: #E3E5EA url('images.png'); height: 32px; width: 32px; /* Dashboard Page */ html, body { height: 100%; } + + body.dashboard-page h2.icon span{ background-position: 9px -69px; } body.dashboard-page header{margin-bottom: 0} -body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; margin-left: 1%} +body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%} body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; } body.dashboard-page .news-feed h2{float: left;} -body.dashboard-page aside{ min-height: 700px; width: 420px; float: right; background-color: #f7f7f7; border-left: 1px solid #ccc } +body.dashboard-page aside{ min-height: 700px; position: absolute; top: 0; bottom: 0; right: 0; width: 420px; float: right; background-color: #f7f7f7; border-left: 1px solid #ccc } body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;} body.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;} body.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;} @@ -592,7 +593,7 @@ body.project-page .page-title{margin-bottom: 0} body.project-page .project-sidebar {width: 220px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; } body.project-page input.text.git-url, -body.projects-page input.text.git-url { font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 8px 14px 8px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -40px;} +body.projects-page input.text.git-url { font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 8px 0 8px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -40px; width: 176px} body.projects-page input.text.git-url {margin:10px 0 0 } .git_url_wrapper { margin-right:50px }