From fed0da80768a09ca54fc4dd0f9355a0429f2ab34 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 26 Jan 2012 19:25:35 +0200 Subject: [PATCH] Cleaning css. layout is broken --- app/assets/stylesheets/commits.css.scss | 24 +-- app/assets/stylesheets/common.scss | 50 +++++-- app/assets/stylesheets/dashboard.scss | 16 +- app/assets/stylesheets/issues.css.scss | 14 -- app/assets/stylesheets/notes.css.scss | 12 +- app/assets/stylesheets/projects.css.scss | 148 +++++-------------- app/assets/stylesheets/style.scss | 110 -------------- app/assets/stylesheets/top_panel.scss | 90 +++++++++++ app/views/dashboard/index.html.haml | 6 +- app/views/dashboard/issues.html.haml | 6 +- app/views/dashboard/merge_requests.html.haml | 6 +- app/views/layouts/application.html.haml | 13 +- app/views/layouts/profile.html.haml | 34 ++--- app/views/layouts/project.html.haml | 18 +-- app/views/merge_requests/_commits.html.haml | 4 +- 15 files changed, 219 insertions(+), 332 deletions(-) diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss index ffc87efc..1e425994 100644 --- a/app/assets/stylesheets/commits.css.scss +++ b/app/assets/stylesheets/commits.css.scss @@ -1,19 +1,19 @@ /* Commit Page */ -body.project-page.commits-page .commit-info{float: right;} -body.project-page.commits-page .commit-info data{ +.commit-info{float: right;} +.commit-info data{ padding: 4px 10px; font-size: 11px; } -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: none; 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;} +.commits-date {display: block; width: 100%; margin-bottom: 20px} +.commits-date .data {padding: 0} +a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +a.commit {padding: 10px; border-bottom: none; overflow: hidden; display: block;} +a.commit:last-child{border-bottom: 0} +a.commit img{float: left; margin-right: 10px;} +a.commit .commit-title{display: block;} +a.commit .commit-title{margin-bottom: 10px} +a.commit .commit-author{color: #999; font-weight: normal; font-style: italic;} +a.commit .commit-author strong{font-weight: bold; font-style: normal;} /* eo Commit Page */ /** Commit diff view **/ diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9edcee93..7b7780cf 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,5 +1,6 @@ @import "bootstrap"; +/** GITLAB colors **/ $text_color:#222; $lite_text_color: #666; $link_color:#111; @@ -86,38 +87,61 @@ $blue_link: "#2fa0bb"; padding:0 !important; } -/* General */ +/** LAYOUT **/ -body.collapsed { - background-color: $bg_color; +.container-fluid { + max-width:980px; + margin:auto; + margin-top:80px; +} - #container{ - margin: auto; - margin-top:51px; - width: $app_width; - border-top: 0; - background-color: $bg_color; +.container-fluid > .sidebar { + width: 110px; + left: 0; + top: 0; + height: 100%; + bottom: 0; + position: absolute; + float: left; + display: inline-block; + background: #FFF; + padding: $app_padding; + padding-right:0px; + margin: 0; + border-right: 1px solid $border_color; + + aside { + width: 109px } } +.container-fluid > .content { + margin-left: 130px; +} + +/** GITLAB reset **/ a { color: $link_color; &:hover { text-decoration:none; } } +@import "top_panel.scss"; +@import "projects.css.scss"; @import "style.scss"; -@import "projects.css.scss"; @import "commits.css.scss"; @import "notes.css.scss"; @import "merge_requests.css.scss"; -@import "highlight.css.scss"; -@import "highlight.black.css.scss"; + @import "issues.css.scss"; @import "commits.css.scss"; -@import "top_panel.scss"; @import "dashboard.scss"; @import "tree.scss"; @import "tags.scss"; @import "buttons.scss"; + +/** CODE HIGHTLIGHT **/ +@import "highlight.css.scss"; +@import "highlight.black.css.scss"; + diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 5e38fcc6..bc2b9024 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -1,10 +1,10 @@ -body.dashboard-page h2.icon span{ background-position: 9px -69px; } -body.dashboard-page header{margin-bottom: 0} -body.dashboard-page .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;} -body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; } -body.dashboard-page .news-feed h2{float: left;} +.application h2.icon span{ background-position: 9px -69px; } +.application header{margin-bottom: 0} +.application .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;} +.application .application-content{ position: relative; float: left; width: 100%; height: 100%; } +.application .news-feed h2{float: left;} -body.dashboard-page aside{ +body.application aside{ min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 260px; float: left; border-right: 1px solid $border_color; padding:20px; padding-right:0; h4{margin: 0; border-bottom: 1px solid #ccc; padding: 20px 20px 20px 0px; font-size: 11px; font-weight: bold; text-transform: uppercase;} h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;} @@ -15,13 +15,13 @@ 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 { +body.application .news-feed .project-updates { margin-bottom: 20px; display: block; width: 100%; .data{ padding: 0} a.project-update {padding: 10px; overflow: hidden; display: block;} a.project-update:last-child{border-bottom: 0} a.project-update img{float: left; margin-right: 10px;} - a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} + a.project-update span.update-title, .application .news-feed .project-updates li a span.update-author{display: block;} a.project-update span.update-title{margin-bottom: 10px} a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;} a.project-update span.update-author strong{font-weight: bold; font-style: normal;} diff --git a/app/assets/stylesheets/issues.css.scss b/app/assets/stylesheets/issues.css.scss index d2341edc..8547bc40 100644 --- a/app/assets/stylesheets/issues.css.scss +++ b/app/assets/stylesheets/issues.css.scss @@ -58,20 +58,6 @@ padding: 0; } -body.project-page .merge-request-form-holder table.no-borders tr, -body.project-page .merge-request-form-holder table.no-borders td, -body.project-page .issue-form-holder table.no-borders tr, -body.project-page .issue-form-holder table.no-borders td, -body.project-page .new_snippet table tr, -body.project-page .new_snippet table td, -body.project-page .edit_snippet table tr, -body.project-page .edit_snippet table td -{ - &:hover { - background:none; - } -} - #issues-table { tr { diff --git a/app/assets/stylesheets/notes.css.scss b/app/assets/stylesheets/notes.css.scss index 4aba53cf..184bdec9 100644 --- a/app/assets/stylesheets/notes.css.scss +++ b/app/assets/stylesheets/notes.css.scss @@ -33,12 +33,12 @@ #notes-list .note .delete-note { display:none; } #notes-list .note:hover .delete-note { display:block; } -body.project-page #notes-list .note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -body.project-page #notes-list .note img{float: left; margin-right: 10px;} -body.project-page #notes-list .note span.note-title{display: block;} -body.project-page #notes-list .note span.note-title{margin-bottom: 10px} -body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;} -body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;} +#notes-list .note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +#notes-list .note img{float: left; margin-right: 10px;} +#notes-list .note span.note-title{display: block;} +#notes-list .note span.note-title{margin-bottom: 10px} +#notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;} +#notes-list .note span.note-author strong{font-weight: bold; font-style: normal;} .note .note-title { margin-left:55px; } diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 18d8b96d..ba69bf85 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -1,77 +1,33 @@ -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%; padding-bottom: 10px;} -body.project-page .page-title{margin-bottom: 0} - -body.project-page .project-sidebar { - width: 110px; - left: 0; - top: 0; - height: 100%; - bottom: 0; - position: absolute; - float: left; - display: inline-block; - background: #FFF; - padding: $app_padding; - padding-right:0px; - margin: 0; - border-right: 1px solid $border_color; -} - -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: 136px} -body.projects-page input.text.git-url {margin:10px 0 0 } .git_url_wrapper { margin-right:50px } -.projects_selector:hover > .project-box{ -moz-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); -webkit-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); box-shadow:0px 0px 10px rgba(0, 0, 0, .1); } - - -/* New project Page */ -.new-project-page .container table{background: white} -body.project-page .project-sidebar aside{width: 109px} -body.project-page .project-sidebar aside a{ +.sidebar aside a{ display: block; position: relative; padding: 15px 10px; margin: 10px 0 0 0; + 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; + } + &.current { + color: white; + background: $active_bg_color; + border: 1px solid $active_bd_color; + border-radius:5px; + -webkit-border-top-right-radius: 0; + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-topright: 0px; + -moz-border-radius-bottomright: 0px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + margin-right: -1px; + } } -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 { - color: white; - background: $active_bg_color; - border: 1px solid $active_bd_color; - border-radius:5px; - - - -webkit-border-top-right-radius: 0; - -webkit-border-bottom-right-radius: 0; - -moz-border-radius-topright: 0px; - -moz-border-radius-bottomright: 0px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - margin-right: -1px; -} -body.project-page .project-content{ padding: $app_padding; display: block; margin-left: 130px; min-height: 600px} -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; } - - +body table .commit a{color: #{$blue_link}} +body table th, body table td{ border-bottom: 1px solid #DEE2E3;} +body .fixed{position: fixed; } /** File stat **/ .file_stats { @@ -146,7 +102,7 @@ input.ssh_project_url { .filter .left { margin-right:15px; } -body.project-page table .commit { +body table .commit { a.tree-commit-link { color:#444; &:hover { @@ -187,22 +143,6 @@ body.project-page table .commit { } } -/** Snippets **/ -.new_snippet textarea, -.edit_snippet textarea { - height:300px; - padding: 8px; - width: 95%; -} -.snippet .action-links { - display:none; - a { - margin-left:10px; - } -} -.snippet:hover .action-links { display:block; } - - #holder { background:#FAFAFA; border: 1px solid #EEE; @@ -214,31 +154,19 @@ body.project-page table .commit { /* Project Dashboard Page */ html, body { height: 100%; } -body.dashboard.project-page .news-feed h2{float: left;} -body.dashboard.project-page .news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;} -body.dashboard.project-page .news-feed .project-updates .data{ padding: 0} -body.dashboard.project-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -body.dashboard.project-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0} -body.dashboard.project-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;} -body.dashboard.project-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.project-page .news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px} -body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;} -body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;} +.news-feed h2{float: left;} +.news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;} +.news-feed .project-updates .data{ padding: 0} +.news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +.news-feed .project-updates a.project-update:last-child{border-bottom: 0} +.news-feed .project-updates a.project-update img{float: left; margin-right: 10px;} +.news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} +.news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px} +.news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;} +.news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;} /* eo Dashboard Page */ -/** Merge requests */ -body.project-page .merge-request-commits {margin-bottom: 20px; display: block; width: 100%;} -body.project-page .merge-request-commits .data{ padding: 0} -body.project-page .merge-request-commits a.commit {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -body.project-page .merge-request-commits a.commit:last-child{border-bottom: 0} -body.project-page .merge-request-commits a.commit img{float: left; margin-right: 10px;} -body.project-page .merge-request-commits a.commit span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} -body.project-page .merge-request-commits a.commit span.update-title{margin-bottom: 10px} -body.project-page .merge-request-commits a.commit span.update-author{color: #999; font-weight: normal; font-style: italic;} -body.project-page .merge-request-commits a.commit span.update-author strong{font-weight: bold; font-style: normal;} - - /** Update entry **/ .update-data { padding: 0 } .update-data { width:100%; } @@ -252,19 +180,19 @@ a.update-item span.update-author{color: #999; font-weight: normal; font-style: i a.update-item span.update-author strong{font-weight: bold; font-style: normal;} -body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; } +body .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; } body.projects-page input.text.git-url.project_list_url { width:165px; } -body.project-page table.no-borders th { +body table.no-borders th { background:none; border-bottom:1px solid #CCC; color:#333; } -body.project-page table.no-borders tr, -body.project-page table.no-borders td{ +body table.no-borders tr, +body table.no-borders td{ border:none; } @@ -454,9 +382,3 @@ a.project-update.titled { font-size:11px; margin: 10px 0; } - - - -.new-project-hodler { - padding:20px; -} diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 41db5af3..dbf11e59 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -365,93 +365,6 @@ header{margin-bottom: 0; clear: both; position:relative;} .page-title a.grey-button{float: right;} .right{float: right;} -/* Account box */ -header .account-box{ - position: absolute; - right: 0; - top: 8px; - z-index: 10000; - width: 128px; - font-size: 11px; - float: right; - display: block; - cursor: pointer;} -header .account-box img{ - border-radius: 4px; - right: 20px; - position: absolute; - width: 33px; height: 33px; - display: block; top:0;} -header .account-box img:after{ - content: " "; - display: block; - position: absolute; - top: 0; - right: 0; -left: 0; - bottom: 0; -float: right; - border-radius: 5px; - border: 1px solid rgba(255, 255, 255, .1); - border-bottom: 0; - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0))); - background: -moz-linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0)); - background: linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0)); - -webkit-background-origin: border-box; - -moz-background-origin: border; - background-origin: border-box; -} - -.account-box.hover{height: 138px;} - -.account-box:hover > .account-links{display: block;} -header .account-links{ - background: #79C3E0; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); position:relative;} -header .account-links:before { - content: "."; - width:0; - height:0; - position:absolute; - border:5px solid transparent; - border-color:rgba(255,255,255,0); - border-bottom-color:#fafafa; - text-indent:-9999px; - top:-10px; - line-height:0; - right:10px; - z-index:10; -} - -/* Inspired by http://maxvoltar.com/temp/nowplaying/ */ -header .account-links{background: white; display: none; z-index: 100000; border-radius: 5px; width: 100px; position: absolute; right: 20px; top: 46px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); } -header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #eee} -header .account-links a:hover{ - background: #3aacec; - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#39acec), to(#279ada), color-stop(.05, #4cbefe)); - background: -moz-linear-gradient(top, #39acec, #4cbefe 5%, #279ada); - background: linear-gradient(top, #39acec, #4cbefe 5%, #279ada); - color: #fff; - text-shadow: #1488c8 0 -1px 0; -} -.account-box.hover .arrow-up{top: 41px; right: 6px; position: absolute} -header .account-links a:first-child{ - -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; -} - -header .account-links a:last-child{ - -webkit-border-bottom-right-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-bottomright: 5px; - -moz-border-radius-bottomleft: 5px; - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; - border-bottom: 0; -} .big-message{ background-image: -webkit-gradient(linear, 0 48, 0 0, color-stop(0.041, #eccb40), to(#ffee4d)); @@ -592,29 +505,6 @@ body, button, input, select, textarea { font-family: "helvetica", "arial", "freesans", "clean", sans-serif; } -/** FORM INPUTS **/ -.new_merge_request, -.edit_merge_request, -.user_new, -.new_key, -.new_issue, -.new_note, -.edit_user, -.edit_issue, -.new_project, -.new_snippet, -.edit_snippet, -.edit_project { - input[type='text'], - input[type='email'], - input[type='password'], - textarea { - width:400px; - padding:8px; - font-size:14px; - @include round-borders-all(4px); - } -} .text_field { width:400px; diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss index 57c1e077..edc6f7f8 100644 --- a/app/assets/stylesheets/top_panel.scss +++ b/app/assets/stylesheets/top_panel.scss @@ -144,3 +144,93 @@ body header { border-radius:3px; float:left; } + + + +/* Account box */ +header .account-box{ + position: absolute; + right: 0; + top: 8px; + z-index: 10000; + width: 128px; + font-size: 11px; + float: right; + display: block; + cursor: pointer;} +header .account-box img{ + border-radius: 4px; + right: 20px; + position: absolute; + width: 33px; height: 33px; + display: block; top:0;} +header .account-box img:after{ + content: " "; + display: block; + position: absolute; + top: 0; + right: 0; +left: 0; + bottom: 0; +float: right; + border-radius: 5px; + border: 1px solid rgba(255, 255, 255, .1); + border-bottom: 0; + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0))); + background: -moz-linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0)); + background: linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0)); + -webkit-background-origin: border-box; + -moz-background-origin: border; + background-origin: border-box; +} + +.account-box.hover{height: 138px;} + +.account-box:hover > .account-links{display: block;} +header .account-links{ + background: #79C3E0; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); position:relative;} +header .account-links:before { + content: "."; + width:0; + height:0; + position:absolute; + border:5px solid transparent; + border-color:rgba(255,255,255,0); + border-bottom-color:#fafafa; + text-indent:-9999px; + top:-10px; + line-height:0; + right:10px; + z-index:10; +} + +/* Inspired by http://maxvoltar.com/temp/nowplaying/ */ +header .account-links{background: white; display: none; z-index: 100000; border-radius: 5px; width: 100px; position: absolute; right: 20px; top: 46px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); } +header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #eee} +header .account-links a:hover{ + background: #3aacec; + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#39acec), to(#279ada), color-stop(.05, #4cbefe)); + background: -moz-linear-gradient(top, #39acec, #4cbefe 5%, #279ada); + background: linear-gradient(top, #39acec, #4cbefe 5%, #279ada); + color: #fff; + text-shadow: #1488c8 0 -1px 0; +} +.account-box.hover .arrow-up{top: 41px; right: 6px; position: absolute} +header .account-links a:first-child{ + -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; +} + +header .account-links a:last-child{ + -webkit-border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomright: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-right-radius: 5px; + border-bottom-left-radius: 5px; + border-bottom: 0; +} diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index b3de30f2..2f05bf00 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -1,5 +1 @@ -- content_for(:body_class, "dashboard-page") - -#dashboard-content.dashboard-content.content - = render "dashboard/sidebar" - #news-feed.news-feed= render "dashboard/projects_feed" +.news-feed= render "dashboard/projects_feed" diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 063183ed..fb2dd0c7 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -1,5 +1 @@ -- content_for(:body_class, "dashboard-page") - -#dashboard-content.dashboard-content.content - = render "dashboard/sidebar" - #news-feed.news-feed= render "dashboard/issues_feed" +.news-feed= render "dashboard/issues_feed" diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 088577ea..f50abe0c 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -1,5 +1 @@ -- content_for(:body_class, "dashboard-page") - -#dashboard-content.dashboard-content.content - = render "dashboard/sidebar" - #news-feed.news-feed= render "dashboard/merge_requests_feed" +.news-feed= render "dashboard/merge_requests_feed" diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 2c03916a..96d50672 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -8,12 +8,9 @@ = stylesheet_link_tag "application" = javascript_include_tag "application" = csrf_meta_tags - = javascript_tag do - REQ_URI = "#{request.env["REQUEST_URI"]}"; - REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; - %body{ :class => body_class, :id => yield(:boyd_id)} + %body.application = render :partial => "layouts/flash" - #container - = render :partial => "layouts/head_panel" - = render :partial => "layouts/page_title" - = yield + = render :partial => "layouts/head_panel" + .container-fluid + .sidebar= render :partial => "dashboard/sidebar" + .content= yield diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml index 9c561d4c..fcc8d975 100644 --- a/app/views/layouts/profile.html.haml +++ b/app/views/layouts/profile.html.haml @@ -8,24 +8,18 @@ = stylesheet_link_tag "application" = javascript_include_tag "application" = csrf_meta_tags - = javascript_tag do - REQ_URI = "#{request.env["REQUEST_URI"]}"; - REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; - %body{ :class => body_class('project-page'), :id => yield(:boyd_id)} + %body.profile = render :partial => "layouts/flash" - #container - = render :partial => "layouts/head_panel" - .project-container - .project-sidebar - .fixed - %aside - = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil - = link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil - = link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil - = link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do - Keys - - unless current_user.keys.empty? - %span{ :class => "number" }= current_user.keys.count - - .project-content - = yield + = render :partial => "layouts/head_panel" + .container-fluid + .sidebar + .fixed + %aside + = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil + = link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil + = link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil + = link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do + Keys + - unless current_user.keys.empty? + %span{ :class => "number" }= current_user.keys.count + .content= yield diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 3b915239..67882a24 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -3,7 +3,8 @@ %head %meta{:charset => "utf-8"} %title - GitLab #{" - #{@project.name}" if @project && !@project.new_record?} + GitLab + = " - #{@project.name}" if @project && !@project.new_record? = favicon_link_tag 'favicon.ico' = stylesheet_link_tag "application" = javascript_include_tag "application" @@ -12,14 +13,9 @@ - if request.path == project_issues_path(@project) = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues") = csrf_meta_tags - = javascript_tag do - REQ_URI = "#{request.env["REQUEST_URI"]}"; - REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; - %body{ :class => body_class('project-page'), :id => yield(:boyd_id)} + %body.project = render :partial => "layouts/flash" - #container - = render :partial => "layouts/head_panel" - .project-container - = render :partial => "layouts/project_side" - .project-content - = yield + = render :partial => "layouts/head_panel" + .container-fluid + .sidebar= render :partial => "layouts/project_side" + .content= yield diff --git a/app/views/merge_requests/_commits.html.haml b/app/views/merge_requests/_commits.html.haml index c0d7486b..af2bb411 100644 --- a/app/views/merge_requests/_commits.html.haml +++ b/app/views/merge_requests/_commits.html.haml @@ -6,9 +6,9 @@ = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;" - else = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" - %span.update-title + %span.commit-title = truncate commit.safe_message, :length => 60 - %span.update-author + %span.commit-author %strong= commit.author_name authored = time_ago_in_words(commit.created_at)