Download as
Browse Code »

Commit 2a874a00dc14b71f2967f137144dd25a14df26c5

Authored by Ricardo Rauch
1 parent c0dbebb1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fixing aside on dashboard

Showing 1 changed file with 5 additions and 4 deletions   Show diff stats
app/assets/stylesheets/style.scss
  Diff comments   View file @2a874a0
... ... @@ -531,7 +531,6 @@ header .account-links a:last-child{
531 531 background-image: -o-linear-gradient(90deg, #447790 6.1%, #5da2bf 89.7%)
532 532 }
533 533  
534   -
535 534 /* eo Account Box */
536 535 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 }
537 536 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;
545 544 /* Dashboard Page */
546 545 html, body { height: 100%; }
547 546  
  547 +
  548 +
548 549 body.dashboard-page h2.icon span{ background-position: 9px -69px; }
549 550 body.dashboard-page header{margin-bottom: 0}
550   -body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; margin-left: 1%}
  551 +body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%}
551 552 body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; }
552 553 body.dashboard-page .news-feed h2{float: left;}
553   -body.dashboard-page aside{ min-height: 700px; width: 420px; float: right; background-color: #f7f7f7; border-left: 1px solid #ccc }
  554 +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 }
554 555 body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
555 556 body.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;}
556 557 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}
592 593 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; }
593 594  
594 595 body.project-page input.text.git-url,
595   -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;}
  596 +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}
596 597 body.projects-page input.text.git-url {margin:10px 0 0 }
597 598 .git_url_wrapper { margin-right:50px }
598 599  
... ...