diff options
author | gitlabhq <m@gitlabhq.com> | 2011-11-01 11:00:59 +0200 |
---|---|---|
committer | gitlabhq <m@gitlabhq.com> | 2011-11-01 11:00:59 +0200 |
commit | d405292388c642117c8300a0a4931fc9a4eb1f66 (patch) | |
tree | 1cdc94df6762574ff49afc561c93cff10a756674 /app | |
parent | 9bf39477dec99eacda9443e39a631d5b5a11eef6 (diff) | |
download | gitlab-ce-d405292388c642117c8300a0a4931fc9a4eb1f66.tar.gz |
project page fixed
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/images/images.png | bin | 6472 -> 8698 bytes | |||
-rwxr-xr-x | app/assets/stylesheets/style.scss | 296 | ||||
-rw-r--r-- | app/views/layouts/_page_title.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/application.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/_tile.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/index.html.haml | 9 |
6 files changed, 245 insertions, 66 deletions
diff --git a/app/assets/images/images.png b/app/assets/images/images.png Binary files differindex 8af7472e70e..973d3bdd39d 100644 --- a/app/assets/images/images.png +++ b/app/assets/images/images.png diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 9d300d81f50..97be566ffe8 100755 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -69,9 +69,14 @@ td { vertical-align: top; } .container_4{width:98%;margin-left:1%;margin-right:1%}.grid_1,.grid_2,.grid_3,.grid_4{display:inline;float:left;position:relative;margin-left:1%;margin-right:1%}.alpha{margin-left:0}.omega{margin-right:0}.container_4 .grid_1{width:23.0%}.container_4 .grid_2{width:48.0%}.container_4 .grid_3{width:73.0%}.container_4 .grid_4{width:98.0%}.container_4 .prefix_1{padding-left:25.0%}.container_4 .prefix_2{padding-left:50.0%}.container_4 .prefix_3{padding-left:75.0%}.container_4 .suffix_1{padding-right:25.0%}.container_4 .suffix_2{padding-right:50.0%}.container_4 .suffix_3{padding-right:75.0%}.container_4 .push_1{left:25.0%}.container_4 .push_2{left:50.0%}.container_4 .push_3{left:75.0%}.container_4 .pull_1{left:-25.0%}.container_4 .pull_2{left:-50.0%}.container_4 .pull_3{left:-75.0%}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0}.clearfix{display:inline-block}* html .clearfix{height:1%}.clearfix{display:block} /* eo 960gs*/ +/* Vars */ +$color: "#4BB8D2"; +$blue_link: "#2fa0bb"; +/* eo Vars */ +html{ -webkit-font-smoothing:antialiased; } *{text-shadow: 0 1px 0 white} -body{font-size: 12px} +body{font-size: 12px; background-color: #eee;} a{text-decoration: none; font-weight: bold; color: #666} a:hover{color: #333} /* Typography */ @@ -84,6 +89,34 @@ input[type="text"]:focus, input[type="password"]:focus { outline: none; } input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px} /* eo Forms */ +/* Tables */ +table {width:100%; border: 1px solid #DEE2E3} +table thead{ + -webkit-border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topleft: 5px; + -moz-border-radius-topright: 5px; + border-top-left-radius: 5px; + border-top-right-radius: 5px; +} +table thead th{ + background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8)); + background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8); + background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8); + background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8); + margin: 0; + font-weight: normal; + font-weight: bold; + text-align: left; + color: #97A0A5; +} +td, th{ padding: .9em 1em; vertical-align: middle; } + +table thead .image{width:100px} +table tr:hover, .listed_items tr.odd:hover{background-color:#FFFFCF} +/* eo Tables */ + + /* Buttons */ .grey-button{ border-radius: 5px; @@ -115,11 +148,9 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0); } -.button:hover{color: rgba(0,0,0,.8)} +.button:hover {color: rgba(0,0,0,.8)} -.button.green{ - margin-right: 0; -} +.button.green {margin-right: 0; } .button.yellow{ color: #908054; @@ -130,6 +161,18 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7); } +.button.blue{ + color: #417E97; + border-color: #b2cdec; + background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1)); + background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1); + background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1); + background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1); +} + +.button-small{ text-shadow: none; padding: 4px 10px; } +.button-green{background: #A6B807; color: white} + /* eo Buttons */ /* UI Box */ @@ -159,7 +202,6 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: font-size: 12px; } -.ui-box h3 a{font-weight: normal;} .ui-box .data{padding: .5em 1em} @@ -172,6 +214,8 @@ input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: border-bottom-left-radius: 5px; } +.ui-box .buttons .button{padding: 8px 9px; font-size: 11px} + .ui-box.hover:hover{box-shadow: 0 0 10px rgba(0,0,0,.1); border: 1px solid #ccc; -webkit-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); @@ -225,7 +269,32 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} .login-box a.forgot{float: right; padding-top: 6px} +/* Icons */ +.directory, .file{ + display: inline-block; + margin-right: 10px; + width: 14px; +} + +.directory{ + background: url('images.png') no-repeat -73px -26px; + height: 11px; + margin-bottom: -1px; +} + +.file{ + background: url('images.png') no-repeat -114px -24px; + height: 16px; + margin-bottom: -3px; +} + +/* eo Icons*/ + /* General */ +#container{background-color: white; overflow: hidden;} +/*#container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}*/ + + /* Header */ header{background: #474D57 url('bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%} @@ -234,15 +303,20 @@ header a:hover{color: #f1f1f1} header h1{ width: 65px; } -header h1.logo{ - background: url('images.png') no-repeat -3px -6px; - width: 65px; - height: 26px; +header h1.logo{margin: 0; padding: 0} +header h1.logo a{ + background: url('images.png') no-repeat -3px -7px; + width: 65px; + height: 26px; margin: 5px 0; padding: 0; + display: block; float: left; text-indent: -1000em; } + + + header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 294px; margin: auto; background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#31363e)); background-image: -webkit-linear-gradient(#595d63 6.6%, #31363e); @@ -282,9 +356,42 @@ header nav a.admin{ border-top-right-radius: 4px; border-bottom-right-radius: 4px; } -header nav a.dashboard span{background: url('images.png') no-repeat -161px -4px; width: 20px; height: 20px; } -header nav a.admin span{background: url('images.png') no-repeat -184px -4px; width: 20px; height: 20px;} -header nav a.project span{background: url('images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px} + + +header .search{ display: inline-block; float: right; margin-right: 10px} + +header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;} + +header nav a.dashboard span{background: url('images.png') no-repeat -161px 0;} +header nav a.admin span{background: url('images.png') no-repeat -184px 0;} +header nav a.project span{background: url('images.png') no-repeat -209px -1px; top: 7px} +/* + +header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 14px;} + +header nav a.dashboard.current span{ background-position: -163px -22px; } +header nav a.admin.current span{ background-position: -186px -22px;} +header nav a.project.current span{ background-position: -211px -23px;} + +header nav a.project span{background: url('images.png') no-repeat -209px -1px; top: 15px} + + +header nav a span.current{top: 18px} + + +header nav {margin-left: 180px; display: inline-block; float: left;} +header nav a{float: left; background: #31363e; padding: 16px 20px 20px 34px; margin-right: 10px; + -webkit-border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topleft: 5px; + -moz-border-radius-topright: 5px; + border-top-left-radius: 5px; + border-top-right-radius: 5px; + position: relative; +} + +header nav a.current{background: white; color: #333; text-shadow: none;} +*/ header .login-top{float: right; width: 180px; background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); @@ -302,7 +409,8 @@ header .login-top a.username{margin-bottom: 5px} header .login-top a.logout{color: #ccc} header{margin-bottom: 0; clear: both; } -.page-title{background-color: #f1f1f1;display: block; float: left; clear: both; width: 98%; padding: 0 1%; border-bottom: 1px solid #ccc; box-shadow: 0 -1px 0 white inset; margin-bottom: 1.5em} +.page-title{background-color: #f1f1f1;display: block; float: left; clear: both; width: 98%; padding: 1% 1%; border-bottom: 1px solid #ccc; box-shadow: 0 -1px 0 white inset; margin-bottom: 1.5em} +.page-title h1{font-size: 20px; width: 400px; margin: 0; padding-top: 8px } .page-title a.grey-button{float: right;} .right{float: right;} @@ -366,57 +474,73 @@ header a.arrow-up{ border-bottom: 5px solid white; } /* eo Account Box */ -input.search-input{float: right; text-shadow: none; width: 216px; 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; } +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;} input.search-input::-webkit-input-placeholder {color: #666} /* eo Header */ -h2.icon{position: relative; padding-left: 36px} -h2.icon span{background: #E3E5EA; height: 26px; width: 26px; left: 0; top: -2px; border-radius: 4px; display: inline-block; position: absolute} - -.button-small{ text-shadow: none; padding: 4px 10px; } -.button-green{background: #A6B807; color: white} - - +h2.icon{position: relative; padding-left: 40px; float: left; } +/*h2 a{font-weight: normal;}*/ +h2.icon span{background: #E3E5EA url('images.png'); height: 32px; width: 32px; left: 0; top: -5px; border-radius: 4px; display: inline-block; position: absolute} /* Dashboard Page */ -.dashboard-page header{margin-bottom: 0} -.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; margin-left: 1%} - -.dashboard-content{ position: absolute; float: left; width: 100%; height: 100%;} -.dashboard-page .news-feed h2{float: left;} -.dashboard-page aside{ width: 420px; float: right; right: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; border-left: 1px solid #ccc } -.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;} -.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-top: -4px; display: block;} -.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;} -.dashboard-page aside .project-list li a {background: white; color: #4BB8D2; display: block; border-bottom: 1px solid #eee; padding: 14px 6% 14px 14px;} -.dashboard-page aside .project-list li a:hover {background: #f1f1f1} -.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;} -.dashboard-page aside .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px} -.dashboard-page aside .project-list li a span.time{color: #666; font-weight: normal; font-size: 11px} -.dashboard-page aside .project-list li a span.arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999} -.dashboard-page .news-feed .project-updates {margin-bottom: 20px;} -.dashboard-page .news-feed .project-updates .data{ padding: 0} -.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -.dashboard-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0} -.dashboard-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;} -.dashboard-page .news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} -.dashboard-page .news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px} -.dashboard-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;} -.dashboard-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;} +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 .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; } +body.dashboard-page .news-feed h2{float: left;} +body.dashboard-page aside{ width: 420px; float: right; right: 0; height: 100%; bottom: 0; position: absolute; 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: 4%; margin-top: -4px; display: block;} +body.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;} +body.dashboard-page aside .project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid #eee; padding: 14px 6% 14px 14px;} +body.dashboard-page aside .project-list li a:hover {background: #f1f1f1} +body.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;} +body.dashboard-page aside .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px} +body.dashboard-page aside .project-list li a span.time{color: #666; font-weight: normal; font-size: 11px} +body.dashboard-page aside .project-list li a span.arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999} +body.dashboard-page .news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;} +body.dashboard-page .news-feed .project-updates .data{ padding: 0} +body.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +body.dashboard-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0} +body.dashboard-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;} +body.dashboard-page .news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} +body.dashboard-page .news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px} +body.dashboard-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;} +body.dashboard-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;} /* eo Dashboard Page */ +.grey-button.right{margin-top: 20px} /* Project Page */ -.project-page .page-title{margin-bottom: 0} -.project-page .project-sidebar {width: 220px; margin-right: 1%; background: #f7f7f7; overflow: hidden; padding: 20px 0 20px 2%; margin: 0} -.project-page .project-sidebar input.text.git-url{width: 90%; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 3% 2%; margin: 0% 10% 7% 0} -.project-page .project-sidebar aside a{display: block; background: white; padding: 15px 10px; border-bottom: 1px solid #eee} -.project-page .project-sidebar aside a:first-child{ + +body.project-page h2.icon .project-name, body.project-page h2.icon d{border: 1px solid #eee; padding: 5px 30px 5px 10px; border-radius: 5px; position: relative;} +body.project-page h2.icon .project-name i.arrow{float: right; + position: absolute; + right: 10px; + top: 13px; + display: block; + background: url('images.png') no-repeat -97px -29px; + width: 4px; + height: 5px; +} + + + +body.project-page h2.icon span{ background-position: -78px -68px; } +body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; } +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; border-left: 1px solid #ccc; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; } +body.project-page .project-sidebar 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.project-page .project-sidebar aside{width: 219px} +body.project-page .project-sidebar aside a{display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee} +body.project-page .project-sidebar aside a:first-child{ -webkit-border-top-left-radius: 5px; -moz-border-radius-topleft: 5px; border-top-left-radius: 5px; @@ -426,16 +550,70 @@ h2.icon span{background: #E3E5EA; height: 26px; width: 26px; left: 0; top: -2px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; } -.project-page .project-sidebar aside a.current{background-color: #4bb8d2; color: white; text-shadow: none; border-color: transparent} -.project-page .project-content{ float: left; padding: 20px} -.project-page .project-content h2{margin-top: 0} +body.project-page .project-sidebar aside a:hover{background-color: #eee;} +body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px} +body.project-page .project-sidebar aside a.current{background-color: #79c3e0; color: white; text-shadow: none; border-color: transparent} +body.project-page .project-content{ padding: 20px; display: block; margin-left: 250px } +body.project-page .project-content h2{ margin-top: 6px} +body.project-page .project-content .button.right{margin-left: 20px} +body.project-page table .commit a{color: #{$blue_link}} +body.project-page table th, body.project-page table td{ border-bottom: 1px solid #DEE2E3;} +body.project-page .fixed{position: fixed; } + +/* Commit Page */ +body.project-page.commits-page .commit-info{float: right;} +body.project-page.commits-page .commit-info data{ + padding: 4px 10px; + font-size: 11px; +} +body.project-page.commits-page .commit-info data.commit-button{ + background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4)); + background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4); + background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4); + background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4); + box-shadow: 0 -1px 0 white inset; + display: block; + border: 1px solid #eee; + border-radius: 5px; + margin-bottom: 2px; + position: relative; + padding-right: 20px; +} + + +body.project-page.commits-page .commit-button i{ + background: url('images.png') no-repeat -138px -27px; + width: 6px; + height: 9px; + float: right; + position: absolute; + top: 6px; + right: 5px; +} +body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px} +body.project-page.commits-page .commits-date .data {padding: 0} +body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +body.project-page.commits-page .commits-date a.commit {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +body.project-page.commits-page .commits-date a.commit:last-child{border-bottom: 0} +body.project-page.commits-page .commits-date a.commit img{float: left; margin-right: 10px;} +body.project-page.commits-page .commits-date a.commit span.commit-title{display: block;} +body.project-page.commits-page .commits-date a.commit span.commit-title{margin-bottom: 10px} +body.project-page.commits-page .commits-date a.commit span.commit-author{color: #999; font-weight: normal; font-style: italic;} +body.project-page.commits-page .commits-date a.commit span.commit-author strong{font-weight: bold; font-style: normal;} + +/* eo Commit Page */ + /* eo Project Page */ + + + /* Projects Page */ -.project-box.ui-box .data .repository {margin-bottom: 20px} -.project-box.ui-box .data .title span{width: 80px; text-align: right; padding-right: 10px; display: inline-block; font-weight: bold;} -.project-box{width: 100%; margin-bottom: 3em} -.browse-code{margin-right: 10px} +body.projects-page h2.icon span{background-position: -31px -70px;} +body.projects-page .project-box.ui-box .data .repository {margin-bottom: 20px} +body.projects-page .project-box.ui-box .data .title span{ font-weight: bold;} +body.projects-page .project-box{width: 100%; margin-bottom: 3em} +body.projects-page .browse-code{margin-right: 10px} /* eo Projects Page */ diff --git a/app/views/layouts/_page_title.html.haml b/app/views/layouts/_page_title.html.haml index 9cd028bea36..ec8fa89d748 100644 --- a/app/views/layouts/_page_title.html.haml +++ b/app/views/layouts/_page_title.html.haml @@ -1,7 +1,7 @@ - if content_for?(:page_title) = yield :page_title - else - .grid-4 + .grid_4 .container_3 %h2.icon %span= controller.controller_name.capitalize diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 54a2ada41f8..b525df4493e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,7 +14,7 @@ = javascript_tag do REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; - %body#thebody + %body{ :class => yield(:body_class), :id => yield(:boyd_id)} #container = render :partial => "layouts/flash" = render :partial => "layouts/head_panel" diff --git a/app/views/projects/_tile.html.haml b/app/views/projects/_tile.html.haml index ced0bf3bd70..7c0b8679c08 100644 --- a/app/views/projects/_tile.html.haml +++ b/app/views/projects/_tile.html.haml @@ -1,7 +1,7 @@ - @projects.in_groups_of(3, false) do |projects| - projects.each_with_index do |project, i| %div.grid_1 - %div{ :class => "project-box ui-box ui-box-big", :style => i == 2 ? "" : "margin-right:30px;" } + %div{ :class => "project-box ui-box ui-box-big" } = link_to project_path(project) do %h3= project.name .data diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index 45187b444f8..a35ead82f7f 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -1,8 +1,9 @@ +- content_for(:body_class, "projects-page") - content_for(:page_title) do - .grid-4 - %h2.icon - - if current_user.can_create_project? - %a.grey-button.right{:href => new_project_path} Create new project + .grid_4 + - if current_user.can_create_project? + %a.grey-button.right{:href => new_project_path} Create new project + %h2.icon %span Projects |