diff options
Diffstat (limited to 'app/assets')
20 files changed, 1288 insertions, 1644 deletions
diff --git a/app/assets/javascripts/issues.js b/app/assets/javascripts/issues.js index dc4da58213e..ded66b1c540 100644 --- a/app/assets/javascripts/issues.js +++ b/app/assets/javascripts/issues.js @@ -1,18 +1,18 @@ function switchToNewIssue(form){ - $("#issues-table-holder").hide("slide", { direction: "left" }, 150, function(){ - $(".project-content").append(form); + $(".issues_content").hide("fade", { direction: "left" }, 150, function(){ + $(".issues_content").after(form); $('select#issue_assignee_id').chosen(); - $("#new_issue_dialog").show("slide", { direction: "right" }, 150); + $("#new_issue_dialog").show("fade", { direction: "right" }, 150); $('.top-tabs .add_new').hide(); }); } function switchToEditIssue(form){ - $("#issues-table-holder").hide("slide", { direction: "left" }, 150, function(){ - $(".project-content").append(form); + $(".issues_content").hide("fade", { direction: "left" }, 150, function(){ + $(".issues_content").after(form); $('select#issue_assignee_id').chosen(); - $("#edit_issue_dialog").show("slide", { direction: "right" }, 150); - $('.top-tabs .add_new').hide(); + $("#edit_issue_dialog").show("fade", { direction: "right" }, 150); + $('.add_new').hide(); }); } @@ -25,11 +25,11 @@ function switchFromEditIssue(){ } function backToIssues(){ - $("#edit_issue_dialog, #new_issue_dialog").hide("slide", { direction: "right" }, 150, function(){ - $("#issues-table-holder").show("slide", { direction: "left" }, 150, function() { + $("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){ + $(".issues_content").show("fade", { direction: "left" }, 150, function() { $("#edit_issue_dialog").remove(); $("#new_issue_dialog").remove(); - $('.top-tabs .add_new').show(); + $('.add_new').show(); }); }); } diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index 0d2f535586e..af59634f7ba 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -4,17 +4,17 @@ var MergeRequest = { init: function() { - $(".merge-tabs a").live("click", function() { - $(".merge-tabs a").removeClass("active"); - $(this).addClass("active"); + $(".tabs a").live("click", function() { + $(".tabs a").parent().removeClass("active"); + $(this).parent().addClass("active"); }); - $(".merge-tabs a.merge-notes-tab").live("click", function() { + $(".tabs a.merge-notes-tab").live("click", function() { $(".merge-request-commits, .merge-request-diffs").hide(); $(".merge-request-notes").show(); }); - $(".merge-tabs a.merge-commits-tab").live("click", function() { + $(".tabs a.merge-commits-tab").live("click", function() { if(!MergeRequest.commits_loaded) { MergeRequest.loadCommits(); } @@ -22,7 +22,7 @@ var MergeRequest = { $(".merge-request-commits").show(); }); - $(".merge-tabs a.merge-diffs-tab").live("click", function() { + $(".tabs a.merge-diffs-tab").live("click", function() { if(!MergeRequest.diffs_loaded) { MergeRequest.loadDiff(); } diff --git a/app/assets/javascripts/tree.js b/app/assets/javascripts/tree.js index 2e9bcc82a2b..1c62751ad25 100644 --- a/app/assets/javascripts/tree.js +++ b/app/assets/javascripts/tree.js @@ -5,21 +5,24 @@ var Tree = { init: function() { - (new Image).src = "ajax-loader-facebook.gif"; - - $('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live("click", function() { - history.pushState({ path: this.path }, '', this.href) + $('#tree-slider .tree-item-file-name a, .breadcrumb li > a').live("click", function() { $("#tree-content-holder").hide("slide", { direction: "left" }, 150) }) - $("#tree-slider tr.tree-item").live('click', function(e){ + $('.project-refs-form').live({ + "ajax:beforeSend": function() { + $("#tree-content-holder").hide("slide", { direction: "left" }, 150); + } + }) + + $("#tree-slider .tree-item").live('click', function(e){ if(e.target.nodeName != "A") { - link = $(this).find("td.tree-item-file-name a"); + link = $(this).find(".tree-item-file-name a"); link.trigger("click"); } }); - $('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live({ + $('#tree-slider .tree-item-file-name a, .breadcrumb a, .project-refs-form').live({ "ajax:beforeSend": function() { $('.tree_progress').addClass("loading"); }, "ajax:complete": function() { $('.tree_progress').removeClass("loading"); } }); diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss index a66d521f942..3f325d783d6 100644 --- a/app/assets/stylesheets/commits.css.scss +++ b/app/assets/stylesheets/commits.css.scss @@ -1,45 +1,10 @@ -/* 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; -} +/** + * + * COMMIT SHOw + * + */ -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: 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;} -/* eo Commit Page */ -/** Commit diff view **/ .diff_file { border:1px solid #CCC; margin-bottom:1em; @@ -72,6 +37,11 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{ border:none; margin:0px; padding:0px; + tr { + td { + font-size:12px; + } + } } .old_line, .new_line { margin:0px; @@ -110,14 +80,6 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{ } } -pre.commit_message { - white-space: pre-wrap; - font-family: "Helvetica", sans-serif; - color: #555; - font-weight:bold; - font-size:15px; -} - /** COMMIT BLOCK **/ .commit-title{display: block;} .commit-title{margin-bottom: 10px} @@ -147,45 +109,28 @@ ul.bordered-list li:last-child { border:none } } } -.per_line_form { - font-family: "Helvetica", sans-serif; - background: #2FA0BB; - - td { - padding:0; - } - - form { - margin:5px; - width: 756px; - border: 1px solid #CCC; - padding: 20px; - background: white; - } -} - tr.line_notes_row { - font-family: "Helvetica", sans-serif; - &:hover { - background:none; - } - td { - margin:0px; - padding:0px; - border-bottom:1px solid #DEE2E3; - - - ul { - display:block; - list-style:none; - margin:0px; - padding:0px; + border-bottom:1px solid #DDD; +} - li { - border-top:1px solid #DEE2E3; - padding:10px; - } - } +/** FLASH **/ +#flash_container { + height:45px; + position:fixed; + z-index:10001; + top:0px; + width:100%; + margin-bottom:15px; + overflow:hidden; + background:white; + cursor:pointer; + border-bottom:1px solid #777; + + h4 { + color:#444; + font-size:22px; + padding-top:5px; + margin:2px; } } diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 44538045171..61780e6869a 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,3 +1,6 @@ +@import "bootstrap"; + +/** GITLAB colors **/ $text_color:#222; $lite_text_color: #666; $link_color:#111; @@ -6,10 +9,13 @@ $active_bg_color:#79C3E0; $active_bd_color: #2FA0BB; $border_color:#CCC; $lite_border_color:#EEE; -$app_width:980px; +$min_app_width:980px; +$max_app_width:980px; $app_padding:20px; $bg_color: #FFF; $styled_border_color: #2FA0BB; +$color: "#4BB8D2"; +$blue_link: "#2fa0bb"; /** MIXINS **/ @mixin round-borders-bottom($radius) { @@ -81,36 +87,103 @@ $styled_border_color: #2FA0BB; .no-padding { padding:0 !important; } +.underlined { + border-bottom: 1px solid $border_color; +} + +/** LAYOUT **/ + +.container-fluid { + min-width:$min_app_width; + max-width:$max_app_width; + margin:auto; + margin-top:51px; +} + +.container-fluid > .sidebar { + width: 140px; + border-right: 1px solid $border_color; + height:100%; + min-height:450px; + + .fixed { + position:fixed; + } + + aside a { + display:block; + position:relative; + padding:15px 10px; + margin:10px 0 0 0; + font-size:13px; + font-weight:bold; + color:#444; + } +} + +.container-fluid > .content { + margin-left: 160px; + margin-top:20px; +} + +aside.projects, +aside.project-side +{ + margin-left: 0; + padding-left: 20px; +} -/* General */ +img.avatar { + float:left; + margin-right:15px; + width:40px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} -body.collapsed { - background-color: $bg_color; +img.lil_av { + padding-left: 5px; + position: relative; + top: 3px; +} - #container{ - margin: auto; - margin-top:51px; - width: $app_width; - border-top: 0; - background-color: $bg_color; +.media-grid { + h3, h2 , h4 { + &.media_h { + padding-left:10px; + float:left; + } } } -a { - color: $link_color; +.wll { + background-color: #FFF; + margin-bottom: 10px; + padding: 5px; + min-height: 20px; + border-bottom: 1px solid #eee; + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + .author { color: #999; } + &:last-child { border:none } + p { padding-top:5px;} +} + +.author_link { + color: $active_link_color; } -@import "style.scss"; +@import "reset_bootstrap.scss"; +@import "top_panel.scss"; @import "projects.css.scss"; @import "commits.css.scss"; -@import "notes.css.scss"; +@import "tree.scss"; +@import "issues.css.scss"; @import "merge_requests.css.scss"; +@import "notes.css.scss"; +@import "login.scss"; + +/** CODE HIGHTLIGHT **/ @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"; diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss deleted file mode 100644 index 5e38fcc6d63..00000000000 --- a/app/assets/stylesheets/dashboard.scss +++ /dev/null @@ -1,30 +0,0 @@ -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;} - -body.dashboard-page 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;} - .project-list {list-style: none; margin: 0; padding: 0;} - .project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid $lite_border_color; padding: 14px 6% 14px 0px;} - .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px} - .project-list li a span.time{color: #666; font-weight: normal; font-size: 11px} - .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%; - .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{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;} -} -/* eo Dashboard Page */ - diff --git a/app/assets/stylesheets/highlight.black.css.scss b/app/assets/stylesheets/highlight.black.css.scss index e094e48fad5..e63e08c8e94 100644 --- a/app/assets/stylesheets/highlight.black.css.scss +++ b/app/assets/stylesheets/highlight.black.css.scss @@ -1,5 +1,6 @@ .black .highlighttable { background: #333; + td.linenos { border:none; } pre { color: #eee } .highlight { background: #333; border-left:1px solid #555; } diff --git a/app/assets/stylesheets/highlight.css.scss b/app/assets/stylesheets/highlight.css.scss index d65865ecdb2..459ae81c248 100644 --- a/app/assets/stylesheets/highlight.css.scss +++ b/app/assets/stylesheets/highlight.css.scss @@ -25,7 +25,13 @@ td.linenos{ padding:10px 0px 0px 10px; margin-left:0px; } + +.linenodiv pre, .highlight pre{ + margin:0; + padding:0; + background:none; + border:none; } .linenodiv pre { diff --git a/app/assets/stylesheets/issues.css.scss b/app/assets/stylesheets/issues.css.scss index d2341edcf33..ecf1ca01142 100644 --- a/app/assets/stylesheets/issues.css.scss +++ b/app/assets/stylesheets/issues.css.scss @@ -1,84 +1,3 @@ -.issue-number { - float: left; - border-radius: 5px; - text-shadow: none; - background: rgba(0, 0, 0, 0.12); - text-align: center; - padding: 14px 8px; - width: 40px; - margin-right: 10px; - color: #444; -} - -.issues_filter { - margin:10px 0; - .left { - margin-right:15px; - } -} - -.top_panel_issues{ - #issue_search_form { - margin:5px 0; - input { - border:1px solid #D3D3D3; - padding: 3px; - height: 28px; - width: 250px; - -webkit-appearance:none; - box-sizing: border-box; - -moz-box-sizing: border-box; - - &:focus { - border-color:#c2e1ef; - } - } - } -} - -/** ISSUES LIST **/ -.issue .action-links { - display:none; - a { - margin-left:10px; - } -} -.issue:hover .action-links { display:block; } -.issue-show-holder { - width:100%; - .data p { font-size:16px } -} - #issue_assignee_id { width:300px; } - -.issue-form-holder .ui-box .data { - margin: 0; - 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 { - border-top: 1px solid $lite_border_color; - &:first-child { - border:none; - } - } - -} diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss new file mode 100644 index 00000000000..73ba27ee2d1 --- /dev/null +++ b/app/assets/stylesheets/login.scss @@ -0,0 +1,41 @@ +/* Login Page */ +body.login-page{ padding-top: 10%} + +.login-box{ + width: 304px; + position: relative; + border-radius: 5px; + margin: auto; + padding: 20px; + background: white; +} + +.login-box .login-logo{ + margin: 10px 0 30px 0; + display: block; +} + +.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px} + +.login-box input.text.top{ + -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; +} + +.login-box input.text.bottom{ + -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-top: 0; + margin-bottom: 20px; +} + +.login-box a.forgot{float: right; padding-top: 6px} + diff --git a/app/assets/stylesheets/merge_requests.css.scss b/app/assets/stylesheets/merge_requests.css.scss index 2b60605b255..9f608c6bfcd 100644 --- a/app/assets/stylesheets/merge_requests.css.scss +++ b/app/assets/stylesheets/merge_requests.css.scss @@ -1,8 +1,3 @@ -// Place all the styles related to the MergeRequests controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - - .merge-request-form-holder { select { width:300px; diff --git a/app/assets/stylesheets/notes.css.scss b/app/assets/stylesheets/notes.css.scss index 4aba53cfd5c..276fce180b0 100644 --- a/app/assets/stylesheets/notes.css.scss +++ b/app/assets/stylesheets/notes.css.scss @@ -32,13 +32,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 4e749ef9d52..ddc21bb9512 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -1,518 +1,193 @@ -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; +.git_url_wrapper { + margin-right:50px } - -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{ - display: block; - position: relative; - padding: 15px 10px; - margin: 10px 0 0 0; - - -} -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; } - - - - -/** File stat **/ .file_stats { span { img { width:14px; float:left; - margin-right: 6px; + margin-right:6px; padding:2px 0; } } } -.round-borders { - @include round-borders-all(4px); - padding: 4px 0px; +.handle:hover { + cursor:move; } -table.round-borders { +/* Project Dashboard Page */ +.news-feed h2 { float:left; - text-align: left; } - - - -/** PROJECTS **/ -input.ssh_project_url { - padding:5px; - margin:0px; - float:right; - width:400px; - text-align:center; +.news-feed .project-updates { + margin-bottom:20px; + display:block; + width:100%; } - -#projects-list .project { - height:50px; +.news-feed .project-updates .data { + padding:0 } - -#tree-slider .tree-item, -#projects-list .project, -#snippets-table .snippet, -#issues-table .issue{ - cursor:pointer; +.news-feed .project-updates a.project-update { + padding:10px; + border-bottom:1px solid #eee; + overflow:hidden; + display:block; } - -.clear { - clear: both; +.news-feed .project-updates a.project-update:last-child { + border-bottom:0 } - - -/** Buttons **/ -.lbutton, -.lite_button { - display:block; +.news-feed .project-updates a.project-update img { float:left; - margin: 0px 5px 0px 0px; - padding:5px 10px; - - font-family:"Helvetica Neue", Arial, Helvetica, sans-serif; - border:1px solid #D3D3D3; - background:white; - font-size:12px !important; - line-height:130%; - text-decoration:none; - font-weight:bold; - color:#565656; - cursor:pointer; - - &:hover { - border:1px solid #C2E1EF; - color: #0099FF; - } - - &.hm { - margin: 0px 0px; - } - - &.vm { - margin: 5px 0px; - } + margin-right:10px; } - -#user_projects_limit{ - width: 60px; +span.update-title, +span.update-author { + display:block; } - -.handle:hover{ - cursor: move; +span.update-title { + margin-bottom:10px } - -.project-refs-form { - span { - background: none !important; - position:static !important; - width:auto !important; - height: auto !important; - } +span.update-author { + color:#999; + font-weight:normal; + font-style:italic; } - -.project-refs-select { - width:200px; +span.update-author strong { + font-weight:bold; + font-style: normal; } - -.filter .left { margin-right:15px; } - -body.project-page table .commit { - a.tree-commit-link { - color:#444; - &:hover { - text-decoration:underline; - } - } +/** UPDATE ITEM **/ +.update-data { + padding:0 } - -/** NEW PROJECT **/ -.new-project-hodler { - .icon span { background-position: -31px -70px; } - td { border-bottom: 1px solid #DEE2E3; } +.update-data { + width:100%; } - -/** Feed entry **/ -.commit, -.snippet, -.message { - .title { - color:#666; - a { color:#666 !important; } - p { margin-top:0px; } - } - .author { color: #999 } +a.update-item { + padding:10px; + border-bottom:1px solid #eee; + overflow:hidden; + display:block; } - -/** JQuery UI **/ -.ui-autocomplete { @include round-borders-all(5px); } -.ui-menu-item { cursor: pointer } -.ui-selectmenu{ - @include round-borders-all(4px); +a.update-item:last-child { + border-bottom:0 +} +a.update-item img { + float:left; margin-right:10px; - font-size:1.5em; - height:auto; - font-weight:bold; - .ui-selectmenu-status { - padding:3px 10px; - } } - -/** Snippets **/ -.new_snippet textarea, -.edit_snippet textarea { - height:300px; - padding: 8px; - width: 95%; -} -.snippet .action-links { - display:none; - a { - margin-left:10px; - } +span.update-title, +span.update-author { + display:block; } -.snippet:hover .action-links { display:block; } - - -#holder { - background:#FAFAFA; - border: 1px solid #EEE; - cursor: move; - height: 70%; - overflow: hidden; +a.update-item span.update-title { + margin-bottom:10px } - -/* 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;} -/* 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%; } -.update-data.ui-box .data { padding:0; } -a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -a.update-item:last-child{border-bottom: 0} -a.update-item img{float: left; margin-right: 10px;} -a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} -a.update-item span.update-title{margin-bottom: 10px} -a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;} -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.projects-page input.text.git-url.project_list_url { width:165px; } - - -body.project-page table.no-borders th { - background:none; - border-bottom:1px solid #CCC; - color:#333; +a.update-item span.update-author { + color:#999; + font-weight:normal; + font-style:italic; } - -body.project-page table.no-borders tr, -body.project-page table.no-borders td{ - border:none; +a.update-item span.update-author strong { + font-weight:bold; + font-style:normal; } - +/** END UPDATE ITEM **/ .ajax-tab-loading { padding:40px; display:none; } - -#tree-content-holder { float:left; width:100%; } - +#tree-content-holder { + float:left; + width:100%; +} #tree-readme-holder { float:left; width:100%; - .readme { @include round-borders-all(4px); - padding: 4px 15px; - background:#F7F7F7; + padding:4px 15px; + background: #F7F7F7; } } - - - -/* Commit Page */ -.entity-info {float: right;} -.entity-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: 4px 10px; - font-size: 11px; - padding-right: 20px; +.dashboard-loader { + float:left; + margin:10px; + display:none; } - -.entity-button i{ - background: url('images.png') no-repeat -138px -27px; - width: 6px; - height: 9px; - float: right; - position: absolute; - top: 6px; - right: 5px; -} -.box-arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999; margin: 1.5em 0;} - -h4.dash-tabs { - margin: 0; - border-bottom: 1px solid #ccc; - padding: 10px 10px; - font-size: 11px; - padding-left:20px; - font-weight: bold; text-transform: uppercase; - background: #F7F7F7; - margin-bottom:20px; - height:13px; - +.user-mention { + color:#2FA0BB; + font-weight:bold; } -.dash-button { - border-right: 1px solid #ddd; - background:none; - padding: 10px 15px; - float:left; +a.project-update.titled { position:relative; - top:-10px; - left:0px; - height:13px; - - &:first-child { - border-left: 1px solid #ddd; - } - &.active { - background: #eaeaea; + padding-left:35% !important; + .title-block { + padding:10px; + width:35%; + position:absolute; + left:0; + top:0; } } - - -.dashboard-loader { - float:right; - margin-right:30px; - display:none; +/** + * Project graph + */ +#holder { + cursor: move; + height: 70%; + overflow: hidden; } -.merge-tabs { - margin: 0; - border: 1px solid #ccc; - padding: 5px; - font-size: 12px; - background: #F7F7F7; - margin-bottom:20px; - height:26px; - - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - - .tab { - font-weight: bold; - border-right: 1px solid #ddd; - background:none; - padding: 10px; - min-width:60px; - float:left; - position:relative; - top:-5px; - left:-5px; - height:16px; - padding-left:34px; - - span { - width: 20px; - height: 20px; - display: inline-block; - position: absolute; - left: 8px; - top: 8px; - } - - &.active { - background: #eaeaea; - } +/** Branch/tag selector **/ +.project-refs-form { + margin:0; + span { + background:none !important; + position:static !important; + width:auto !important; + height:auto !important; } } -.merge-tabs.repository .tab span{ background: url("images.png") no-repeat -38px -77px; } -.activities-tab span { background: url("images.png") no-repeat -161px -1px; } -.stat-tab span, -.team-tab span, -.snippets-tab span { background: url("images.png") no-repeat -38px -77px; } -.files-tab span { background: url("images.png") no-repeat -112px -23px; } - -.merge-notes-tab span { background: url("images.png") no-repeat -161px -1px; } -.merge-commits-tab span { background: url("images.png") no-repeat -86px 1px; } -.merge-diffs-tab span { background: url("images.png") no-repeat -118px 1px; } -.merge-tabs .dashboard-loader { padding:8px; } - -.user-mention { - color: #2FA0BB; - font-weight: bold; -} - -.author { - color: #999; -} - - -.red-button{ - border-radius: 5px; - font-size: 12px; - font-weight: bold; - padding: 5px 17px; - border: 1px solid #999; - color: #666; - display: inline-block; - box-shadow: 0 1px 2px rgba(0,0,0,.3); - background: #D12F19; - color: white; -} - -.positive-button{ - border-radius: 5px; - font-size: 12px; - font-weight: bold; - padding: 5px 17px; - border: 1px solid #999; - color: #666; - display: inline-block; - box-shadow: 0 1px 2px rgba(0,0,0,.3); - background: #4A2; - color: white; +.project-refs-select { + width:120px; } +.project-refs-form .chzn-container { + position:relative; + top: -5px; + left: -11px; -.dark_scheme_box { - padding:20px 0; + .chzn-drop { + margin:7px 0; + border: 1px solid #CCC; + min-width: 300px; - label { - float:left; - box-shadow: 0 0px 5px rgba(0,0,0,.3); + .chzn-results { + max-height:300px; + } - img { + .chzn-search input { + min-width:200px; } } -} -a.project-update.titled { - position: relative; - padding-left: 235px !important; + .chzn-single { + background:#ddd; + //border:none; + //box-shadow:none; - .title-block { - padding: 10px; - width: 205px; - position: absolute; - left: 0; - top: 0; - } -} + div { + background:transparent; + border-left:none; + } -.add_new { - float: right; - background: #A6B807; - color: white; - padding: 4px 10px; - @include round-borders-all(4px); - font-size:11px; - margin: 10px 0; + span { + font-weight: normal; + } + } } - - -.new-project-hodler { - padding:20px; -} diff --git a/app/assets/stylesheets/projects.css.scss.bak b/app/assets/stylesheets/projects.css.scss.bak new file mode 100644 index 00000000000..ba69bf85570 --- /dev/null +++ b/app/assets/stylesheets/projects.css.scss.bak @@ -0,0 +1,384 @@ +.git_url_wrapper { margin-right:50px } + +.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 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 { + span { + img { + width:14px; + float:left; + margin-right: 6px; + padding:2px 0; + } + } +} + +.round-borders { + @include round-borders-all(4px); + padding: 4px 0px; +} + +table.round-borders { + float:left; + text-align: left; +} + + + +/** PROJECTS **/ +input.ssh_project_url { + padding:5px; + margin:0px; + float:right; + width:400px; + text-align:center; +} + +#projects-list .project { + height:50px; +} + +#tree-slider .tree-item, +#projects-list .project, +#snippets-table .snippet, +#issues-table .issue{ + cursor:pointer; +} + +.clear { + clear: both; +} + + + +#user_projects_limit{ + width: 60px; +} + +.handle:hover{ + cursor: move; +} + +.project-refs-form { + span { + background: none !important; + position:static !important; + width:auto !important; + height: auto !important; + } +} + +.project-refs-select { + width:200px; +} + +.filter .left { margin-right:15px; } + +body table .commit { + a.tree-commit-link { + color:#444; + &:hover { + text-decoration:underline; + } + } +} + +/** NEW PROJECT **/ +.new-project-hodler { + .icon span { background-position: -31px -70px; } + td { border-bottom: 1px solid #DEE2E3; } +} + +/** Feed entry **/ +.commit, +.snippet, +.message { + .title { + color:#666; + a { color:#666 !important; } + p { margin-top:0px; } + } + .author { color: #999 } +} + +/** JQuery UI **/ +.ui-autocomplete { @include round-borders-all(5px); } +.ui-menu-item { cursor: pointer } +.ui-selectmenu{ + @include round-borders-all(4px); + margin-right:10px; + font-size:1.5em; + height:auto; + font-weight:bold; + .ui-selectmenu-status { + padding:3px 10px; + } +} + +#holder { + background:#FAFAFA; + border: 1px solid #EEE; + cursor: move; + height: 70%; + overflow: hidden; +} + +/* Project Dashboard Page */ +html, body { height: 100%; } + +.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 */ + + +/** Update entry **/ +.update-data { padding: 0 } +.update-data { width:100%; } +.update-data.ui-box .data { padding:0; } +a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +a.update-item:last-child{border-bottom: 0} +a.update-item img{float: left; margin-right: 10px;} +a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} +a.update-item span.update-title{margin-bottom: 10px} +a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;} +a.update-item span.update-author strong{font-weight: bold; font-style: normal;} + + +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 table.no-borders th { + background:none; + border-bottom:1px solid #CCC; + color:#333; +} + +body table.no-borders tr, +body table.no-borders td{ + border:none; +} + +.ajax-tab-loading { + padding:40px; + display:none; +} + +#tree-content-holder { float:left; width:100%; } + +#tree-readme-holder { + float:left; + width:100%; + + .readme { + @include round-borders-all(4px); + padding: 4px 15px; + background:#F7F7F7; + } +} + + + +/* Commit Page */ +.entity-info {float: right;} +.entity-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: 4px 10px; + font-size: 11px; + padding-right: 20px; +} + +.entity-button i{ + background: url('images.png') no-repeat -138px -27px; + width: 6px; + height: 9px; + float: right; + position: absolute; + top: 6px; + right: 5px; +} +.box-arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999; margin: 1.5em 0;} + +h4.dash-tabs { + margin: 0; + border-bottom: 1px solid #ccc; + padding: 10px 10px; + font-size: 11px; + padding-left:20px; + font-weight: bold; text-transform: uppercase; + background: #F7F7F7; + margin-bottom:20px; + height:13px; + +} + +.dash-button { + border-right: 1px solid #ddd; + background:none; + padding: 10px 15px; + float:left; + position:relative; + top:-10px; + left:0px; + height:13px; + + &:first-child { + border-left: 1px solid #ddd; + } + &.active { + background: #eaeaea; + } +} + + +.dashboard-loader { + float:right; + margin-right:30px; + display:none; +} + + +.merge-tabs { + margin: 0; + border: 1px solid #ccc; + padding: 5px; + font-size: 12px; + background: #F7F7F7; + margin-bottom:20px; + height:26px; + + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + + .tab { + font-weight: bold; + border-right: 1px solid #ddd; + background:none; + padding: 10px; + min-width:60px; + float:left; + position:relative; + top:-5px; + left:-5px; + height:16px; + padding-left:34px; + + span { + width: 20px; + height: 20px; + display: inline-block; + position: absolute; + left: 8px; + top: 8px; + } + + &.active { + background: #eaeaea; + } + } +} +.merge-tabs.repository .tab span{ background: url("images.png") no-repeat -38px -77px; } +.activities-tab span { background: url("images.png") no-repeat -161px -1px; } +.stat-tab span, +.team-tab span, +.snippets-tab span { background: url("images.png") no-repeat -38px -77px; } +.files-tab span { background: url("images.png") no-repeat -112px -23px; } + +.merge-notes-tab span { background: url("images.png") no-repeat -161px -1px; } +.merge-commits-tab span { background: url("images.png") no-repeat -86px 1px; } +.merge-diffs-tab span { background: url("images.png") no-repeat -118px 1px; } +.merge-tabs .dashboard-loader { padding:8px; } + +.user-mention { + color: #2FA0BB; + font-weight: bold; +} + +.author { + color: #999; +} + + + + +.dark_scheme_box { + padding:20px 0; + + label { + float:left; + box-shadow: 0 0px 5px rgba(0,0,0,.3); + + img { + } + } +} + +a.project-update.titled { + position: relative; + padding-left: 235px !important; + + .title-block { + padding: 10px; + width: 205px; + position: absolute; + left: 0; + top: 0; + } +} + +.add_new { + float: right; + background: #A6B807; + color: white; + padding: 4px 10px; + @include round-borders-all(4px); + font-size:11px; + margin: 10px 0; +} diff --git a/app/assets/stylesheets/projects.css.scss~ b/app/assets/stylesheets/projects.css.scss~ new file mode 100644 index 00000000000..4bdf5dee2f5 --- /dev/null +++ b/app/assets/stylesheets/projects.css.scss~ @@ -0,0 +1,385 @@ +.git_url_wrapper { margin-right:50px } + +.sidebar aside a{ + display: block; + position: relative; + padding: 15px 10px; + margin: 10px 0 0 0; + + font-size:13px; + font-weight:bold; + color:#333; + + &.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 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 { + span { + img { + width:14px; + float:left; + margin-right: 6px; + padding:2px 0; + } + } +} + +.round-borders { + @include round-borders-all(4px); + padding: 4px 0px; +} + +table.round-borders { + float:left; + text-align: left; +} + + + +/** PROJECTS **/ +input.ssh_project_url { + padding:5px; + margin:0px; + float:right; + width:400px; + text-align:center; +} + +#projects-list .project { + height:50px; +} + +#tree-slider .tree-item, +#projects-list .project, +#snippets-table .snippet, +#issues-table .issue{ + cursor:pointer; +} + +.clear { + clear: both; +} + + + +#user_projects_limit{ + width: 60px; +} + +.handle:hover{ + cursor: move; +} + +.project-refs-form { + span { + background: none !important; + position:static !important; + width:auto !important; + height: auto !important; + } +} + +.project-refs-select { + width:200px; +} + +.filter .left { margin-right:15px; } + +body table .commit { + a.tree-commit-link { + color:#444; + &:hover { + text-decoration:underline; + } + } +} + +/** NEW PROJECT **/ +.new-project-hodler { + .icon span { background-position: -31px -70px; } + td { border-bottom: 1px solid #DEE2E3; } +} + +/** Feed entry **/ +.commit, +.snippet, +.message { + .title { + color:#666; + a { color:#666 !important; } + p { margin-top:0px; } + } + .author { color: #999 } +} + +/** JQuery UI **/ +.ui-autocomplete { @include round-borders-all(5px); } +.ui-menu-item { cursor: pointer } +.ui-selectmenu{ + @include round-borders-all(4px); + margin-right:10px; + font-size:1.5em; + height:auto; + font-weight:bold; + .ui-selectmenu-status { + padding:3px 10px; + } +} + +#holder { + background:#FAFAFA; + border: 1px solid #EEE; + cursor: move; + height: 70%; + overflow: hidden; +} + +/* Project Dashboard Page */ +html, body { height: 100%; } + +.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 */ + + +/** Update entry **/ +.update-data { padding: 0 } +.update-data { width:100%; } +.update-data.ui-box .data { padding:0; } +a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +a.update-item:last-child{border-bottom: 0} +a.update-item img{float: left; margin-right: 10px;} +a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;} +a.update-item span.update-title{margin-bottom: 10px} +a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;} +a.update-item span.update-author strong{font-weight: bold; font-style: normal;} + + +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 table.no-borders th { + background:none; + border-bottom:1px solid #CCC; + color:#333; +} + +body table.no-borders tr, +body table.no-borders td{ + border:none; +} + +.ajax-tab-loading { + padding:40px; + display:none; +} + +#tree-content-holder { float:left; width:100%; } + +#tree-readme-holder { + float:left; + width:100%; + + .readme { + @include round-borders-all(4px); + padding: 4px 15px; + background:#F7F7F7; + } +} + + + +/* Commit Page */ +.entity-info {float: right;} +.entity-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: 4px 10px; + font-size: 11px; + padding-right: 20px; +} + +.entity-button i{ + background: url('images.png') no-repeat -138px -27px; + width: 6px; + height: 9px; + float: right; + position: absolute; + top: 6px; + right: 5px; +} +.box-arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999; margin: 1.5em 0;} + +h4.dash-tabs { + margin: 0; + border-bottom: 1px solid #ccc; + padding: 10px 10px; + font-size: 11px; + padding-left:20px; + font-weight: bold; text-transform: uppercase; + background: #F7F7F7; + margin-bottom:20px; + height:13px; + +} + +.dash-button { + border-right: 1px solid #ddd; + background:none; + padding: 10px 15px; + float:left; + position:relative; + top:-10px; + left:0px; + height:13px; + + &:first-child { + border-left: 1px solid #ddd; + } + &.active { + background: #eaeaea; + } +} + + +.dashboard-loader { + float:right; + margin-right:30px; + display:none; +} + + +.merge-tabs { + margin: 0; + border: 1px solid #ccc; + padding: 5px; + font-size: 12px; + background: #F7F7F7; + margin-bottom:20px; + height:26px; + + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + + .tab { + font-weight: bold; + border-right: 1px solid #ddd; + background:none; + padding: 10px; + min-width:60px; + float:left; + position:relative; + top:-5px; + left:-5px; + height:16px; + padding-left:34px; + + span { + width: 20px; + height: 20px; + display: inline-block; + position: absolute; + left: 8px; + top: 8px; + } + + &.active { + background: #eaeaea; + } + } +} +.merge-tabs.repository .tab span{ background: url("images.png") no-repeat -38px -77px; } +.activities-tab span { background: url("images.png") no-repeat -161px -1px; } +.stat-tab span, +.team-tab span, +.snippets-tab span { background: url("images.png") no-repeat -38px -77px; } +.files-tab span { background: url("images.png") no-repeat -112px -23px; } + +.merge-notes-tab span { background: url("images.png") no-repeat -161px -1px; } +.merge-commits-tab span { background: url("images.png") no-repeat -86px 1px; } +.merge-diffs-tab span { background: url("images.png") no-repeat -118px 1px; } +.merge-tabs .dashboard-loader { padding:8px; } + +.user-mention { + color: #2FA0BB; + font-weight: bold; +} + +.author { + color: #999; +} + + + + +.dark_scheme_box { + padding:20px 0; + + label { + float:left; + box-shadow: 0 0px 5px rgba(0,0,0,.3); + + img { + } + } +} + +a.project-update.titled { + position: relative; + padding-left: 235px !important; + + .title-block { + padding: 10px; + width: 205px; + position: absolute; + left: 0; + top: 0; + } +} + +.add_new { + float: right; + background: #A6B807; + color: white; + padding: 4px 10px; + @include round-borders-all(4px); + font-size:11px; + margin: 10px 0; +} diff --git a/app/assets/stylesheets/reset_bootstrap.scss b/app/assets/stylesheets/reset_bootstrap.scss new file mode 100644 index 00000000000..a744040fb45 --- /dev/null +++ b/app/assets/stylesheets/reset_bootstrap.scss @@ -0,0 +1,38 @@ +a { + color: $link_color; + &:hover { + text-decoration:none; + color: $active_link_color; + } +} + +.entry { + position: relative; + padding: 7px 15px; + margin-bottom: 18px; + color: #404040; + background-color: #eedc94; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); + background-image: -moz-linear-gradient(top, #fceec1, #eedc94); + background-image: -ms-linear-gradient(top, #fceec1, #eedc94); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); + background-image: -webkit-linear-gradient(top, #fceec1, #eedc94); + background-image: -o-linear-gradient(top, #fceec1, #eedc94); + background-image: linear-gradient(top, #fceec1, #eedc94); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFCEEC1', endColorstr='#FFEEDC94', GradientType=0); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #eedc94 #eedc94 #e4c652; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%); + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + border-width: 1px; + border-style: solid; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + background:#F1F1F1; + border-color:#ccc; +} diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss deleted file mode 100644 index 4bb5fef9269..00000000000 --- a/app/assets/stylesheets/style.scss +++ /dev/null @@ -1,802 +0,0 @@ -/* HTML5 ✰ Boilerplate - * ==|== normalize ========================================================== - */ - -article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; } -audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; } -audio:not([controls]) { display: none; } -[hidden] { display: none; } - -html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } -body { margin: 0; font-size: 13px; line-height: 1.231; } -body, button, input, select, textarea { - font-family: "helvetica", "arial", "freesans", "clean", sans-serif; -color: #222; } - -::-moz-selection { background: #79c3e0; color: #fff; text-shadow: none; } -::selection { background: #79c3e0; color: #fff; text-shadow: none; } - -a { color: #00e; } -a:hover { color: #06e; } -a:focus { outline: thin dotted; } -a:hover, a:active { outline: 0; } - -abbr[title] { border-bottom: 1px dotted; } -b, strong { font-weight: bold; } -blockquote { margin: 1em 40px; } -dfn { font-style: italic; } -hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; } -ins { background: #ff9; color: #000; text-decoration: none; } -mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; } -pre, code, kbd, samp { font-family: monospace, monospace; _font-family: 'courier new', monospace; font-size: 1em; } -pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; } -q { quotes: none; } -q:before, q:after { content: ""; content: none; } -small { font-size: 85%; } -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } -sup { top: -0.5em; } -sub { bottom: -0.25em; } -ul, ol { margin: 1em 0; padding: 0 0 0 40px; } -dd { margin: 0 0 0 40px; } -nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; } -img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; } -svg:not(:root) { overflow: hidden; } -figure { margin: 0; } - -form { margin: 0; } -fieldset { border: 0; margin: 0; padding: 0; } -label { cursor: pointer; } -legend { border: 0; *margin-left: -7px; padding: 0; } -button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; } -button, input { line-height: normal; *overflow: visible; } -table button, table input { *overflow: auto; } -button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; } -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; } -input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; } -input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } -textarea { overflow: auto; vertical-align: top; resize: vertical; } -input:valid, textarea:valid { } -input:invalid, textarea:invalid { background-color: #f0dddd; } - -table { border-collapse: collapse; border-spacing: 0; } -td { vertical-align: top; } - -/* ==|== primary styles ===================================================== - Author: Ricardo Rauch - ========================================================================== */ - -/* 960gs */ -.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; } -body { - font-size: 12px; - background-color: #FFFFFF; -} -a{text-decoration: none; font-weight: bold; color: #444} -a:hover{color: #555} -/* Typography */ -h1,h2,h3,h4,h5{font-weight: normal; color: #666} -h2{margin: 1.5em 0} -/* eo Typography */ - -/* Forms */ -input[type="text"]:focus, input[type="password"]:focus { outline: none; } -input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px} - -.form-row{ - padding: 0px 0px 10px 0px; -} - -.form-row label{ - font-weight:bold; - display: inline-block; - padding: 0px 0px 5px 0px; -} - -/* eo Forms */ - -/* Tables */ -table {width:100%; border: 1px solid #DEE2E3; margin-bottom: 20px} -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} -.listed_items tr.odd:hover{background-color:#FFFFCF} -/* eo Tables */ - -/* Buttons */ -.grey-button{ - border-radius: 5px; - font-size: 12px; - font-weight: bold; - padding: 5px 17px; - border: 1px solid #999; - color: #666; - display: inline-block; - box-shadow: 0 1px 2px rgba(0,0,0,.3); - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #f7f7f7), to(#d5d5d5)); - background-image: -webkit-linear-gradient(#f7f7f7 7.6%, #d5d5d5); - background-image: -moz-linear-gradient(#f7f7f7 7.6%, #d5d5d5); - background-image: -o-linear-gradient(#f7f7f7 7.6%, #d5d5d5); -} - -a.button, input.button { - font-weight: bold; - padding: 10px 20px; - text-align: center; - display: inline-block; - border-radius: 5px; - color: #578E91; - font-size: 12px; - text-transform: uppercase; - border: 1px solid #8CE2E6; - background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0)); - background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0); - background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0); - background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0); -} - -input.button{margin-bottom: 1.5em} - -.button:hover {color: rgba(0,0,0,.8)} - -.button.green {margin-right: 0; } - -.button.yellow{ - color: #908054; - border-color: #DDCDA1; - background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7)); - background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7); - background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7); - 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 */ -//.ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px} -.ui-box{float: left;} -.ui-box h3{ - 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); - background:none; - margin: 0; - padding: 1em; - font-size: 12px; - font-weight: normal; - font-weight: bold; - font-size: 16px; - border-bottom: 1px solid #DEDFE1; - -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; -} - -.ui-box.ui-box-small h3{ - padding: 8px 10px; - font-size: 12px; -} - -.ui-box .data{padding: .5em 1em} - -.ui-box .buttons{ - padding: 1em; - border-top:1px solid $lite_border_color; -} - -.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); - -moz-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); - -o-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); - transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715); -} - -/* eo UI Box */ - -/* Login Page */ -body.login-page{background-color: #f1f1f1; padding-top: 10%} - -.login-box{ - width: 304px; - position: relative; - border-radius: 5px; - margin: auto; - padding: 20px; - background: white; - box-shadow: rgba(0, 0, 0, 0.07) 0 1px 0,white 0 2px 0,rgba(0, 0, 0, 0.07) 0 3px 0,white 0 4px 0, rgba(0, 0, 0, 0.07) 0 5px 0; -} - -.login-box .login-logo{ - margin: 10px 0 30px 0; - display: block; -} - -.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px} - -.login-box input.text.top{ - -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; -} - -.login-box input.text.bottom{ - -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-top: 0; - margin-bottom: 20px; -} - -.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*/ - -/* Errors */ -#error_explanation{background: #ffe5eb; padding: 20px; margin-bottom: 20px; border-radius: 5px} -#error_explanation h2{margin: 0; margin-bottom: 20px; color: red} -#error_explanation ul li{margin-bottom: 10px} -#error_explanation ul li:last-child{margin-bottom: 0} -.field_with_errors { - input[type="text"], - input[type="password"], - textarea - { - border: 1px solid #D30 !important; - } -} -/* eo Errors */ - -/* Notices */ -#notice{background: #dfffe1; padding: 20px; margin-bottom: 20px; border-radius: 5px; color: green; font-size: 1.3em;} -/* eo Notices */ - -/* InfoBlock */ -#infoblock{ - background: #eeeeee; - padding: 20px; - margin-bottom: 20px; - border-radius: 5px; -} -/* eo InfoBlock */ - -/* Header */ -header{ - background: #474D57 url('bg-header.png') repeat-x bottom; - z-index: 10000; - height: 44px; - padding: 10px 2% 6px 2%; -} -header a:hover{color: #f1f1f1} -header h1{ - width: 65px; -} -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); - background-image: -moz-linear-gradient(#595d63 6.6%, #31363e); - background-image: -o-linear-gradient(#595d63 6.6%, #31363e); - margin-top: 2px; - height:30px -} -header nav.shorter_nav{ - width: 207px; -} -header nav a{padding: 8px 12px 8px 34px; display: inline-block; color: #D6DADF; border-right: 1px solid #31363E; position: relative; box-shadow: 1px 0 0 rgba(255,255,255,.1); margin: 0} -header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;} -header nav a:last-child {border: 0; box-shadow: none} -header nav a:hover, header nav a.current{ - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#2c2f35)); - background-image: -webkit-linear-gradient(#595d63 6.6%, #2c2f35); - background-image: -moz-linear-gradient(#595d63 6.6%, #202227); - background-image: -o-linear-gradient(#595d63 6.6%, #202227); -} - -header nav a:active{ - box-shadow: 0 1px 4px rgba(0,0,0,.8) inset; -} - -header nav a.dashboard { - -webkit-border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-topleft: 4px; - -moz-border-radius-bottomleft: 4px; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; -} - -header nav a.last_elem{ - -webkit-border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} - -header .search{ display: inline-block; float: right; margin-right: 90px} - -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.issues span{background: url('images.png') no-repeat -209px -1px; top: 7px} - -header .login-top{float: right; width: 180px; - background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); - background-image: -webkit-linear-gradient(#464c56 3.2%, #363c45); - background-image: -moz-linear-gradient(#464c56 3.2%, #363c45); - background-image: -o-linear-gradient(#464c56 3.2%, #363c45); - padding: 0 10px; - height: 44px; -} -header .login-top a{display: block;} -header .login-top a.pic{float: left; margin-right: 10px; - img{ height: 36px; width: 36px; border: 1px solid black} -} -header .login-top a.username{margin-bottom: 5px} -header .login-top a.logout{color: #ccc} -header{margin-bottom: 0; clear: both; position:relative;} - -.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;} - -/* 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)); - background-image: -webkit-linear-gradient(90deg, #eccb40 4.1%, #ffee4d); - background-image: -moz-linear-gradient(90deg, #eccb40 4.1%, #ffee4d); - background-image: -o-linear-gradient(90deg, #eccb40 4.1%, #ffee4d); - text-align: center; - font-weight: bold; - padding: 10px 20px; - text-shadow: 0 1px 0 rgba(255,255,255,.3); - color: #333; - color: rgba(0,0,0,.7); - font-size: 14px; - box-shadow: 0 1px 2px rgba(0,0,0,.7); - z-index: 100000; - margin-bottom: 2px; -} - -.big-message a{color: #000; text-decoration: underline;} - -.big-message.error{ - background-color: #722523; - background-image: -webkit-gradient(linear, 0 49, 0 0, color-stop(0.04, #722523), to(#ad4846)); - background-image: -webkit-linear-gradient(90deg, #9b403f 4%, #c16765); - background-image: -moz-linear-gradient(90deg, #722523 4%, #ad4846); - background-image: -o-linear-gradient(90deg, #722523 4%, #ad4846); - color: #2E0D0C; -} - -.big-message.success{ - background-color: #7a9339; - background-image: -webkit-gradient(linear, 0 48, 0 0, color-stop(0.062, #7a9339), to(#93ae46)); - background-image: -webkit-linear-gradient(90deg, #7a9339 6.2%, #93ae46); - background-image: -moz-linear-gradient(90deg, #7a9339 6.2%, #93ae46); - background-image: -o-linear-gradient(90deg, #7a9339 6.2%, #93ae46) -} - -.big-message.success{ - background-color: #7a9339; - background-image: -webkit-gradient(linear, 0 48, 0 0, color-stop(0.062, #7a9339), to(#93ae46)); - background-image: -webkit-linear-gradient(90deg, #7a9339 6.2%, #93ae46); - background-image: -moz-linear-gradient(90deg, #7a9339 6.2%, #93ae46); - background-image: -o-linear-gradient(90deg, #7a9339 6.2%, #93ae46) -} - -.big-message.notice{ - background-image: -webkit-gradient(linear, 0 49, 0 0, color-stop(0.061, #447790), color-stop(0.897, #5da2bf)); - background-image: -webkit-linear-gradient(90deg, #447790 6.1%, #5da2bf 89.7%); - background-image: -moz-linear-gradient(90deg, #447790 6.1%, #5da2bf 89.7%); - 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: 4px; - border: 1px solid #AAA; - background-color: #FFF; - padding: 5px; - padding-left: 26px; - margin-top: 2px; - 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: 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 */ -html, body { height: 100%; } - - - - -.grey-button.right{margin-top: 20px} - -/* Project Page */ -/* eo New Project Page */ - - -/* eo Project Page */ - -/* Projects Page */ -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 */ - -/* ==|== non-semantic helper classes ======================================== */ -.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; } -.ir br { display: none; } -.hidden { display: none !important; visibility: hidden; } -.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; } -.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; } -.invisible { visibility: hidden; } -.clearfix:before, .clearfix:after { content: ""; display: table; } -.clearfix:after { clear: both; } -.clearfix { zoom: 1; } - -/* ==|== media queries ====================================================== */ - -@media only screen and (min-width: 480px) { - -} - -@media only screen and (min-width: 768px) { - -} - -/* ==|== print styles ======================================================= */ - -@media print { - * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } - a, a:visited { text-decoration: underline; } - a[href]:after { content: " (" attr(href) ")"; } - abbr[title]:after { content: " (" attr(title) ")"; } - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } - pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } - thead { display: table-header-group; } - tr, img { page-break-inside: avoid; } - img { max-width: 100% !important; } - @page { margin: 0.5cm; } - p, h2, h3 { orphans: 3; widows: 3; } - h2, h3 { page-break-after: avoid; } -} - -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; - padding:8px; - font-size:14px; - @include round-borders-all(4px); -} - -.input_button { - padding:8px; - font-size:14px; - cursor:pointer; - background-color: #F5F5F5; - border-color: #EEEEEE #DEDEDE #DEDEDE #EEEEEE; - border-right: 1px solid #DEDEDE; - border-style: solid; - border-width: 1px; -} - -/** FLASH **/ -#flash_container { - height:45px; - position:fixed; - z-index:10001; - top:0px; - width:100%; - margin-bottom:15px; - overflow:hidden; - background:white; - cursor:pointer; - border-bottom:1px solid #777; - - h4 { - color:#444; - font-size:22px; - padding-top:5px; - margin:2px; - } -} - - -.errors_holder { - background:#D30; - color:#fff; - @include round-borders-all(4px); - border:1px solid #a30; - padding:5px; - list-style:none; - font-weight: bold; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - - li { - padding:10px; - } -} - -.notice_holder { - background:#DDF4FB; - color:#444; - border:1px solid #C6EDF9; - @include round-borders-all(4px); - padding:5px; - list-style:none; - font-weight: bold; - text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25); - - li { - padding:10px; - } -} - -.alert_holder { - background:#FDF5D9; - color:#444; - border:1px solid #FCEEC1; - @include round-borders-all(4px); - padding:5px; - list-style:none; - font-weight: bold; - text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25); - - li { - padding:10px; - } -} - -.help_content { - margin:20px; - margin-top:71px; - - h2 { - margin:0; - padding:0; - } - - .menu { - float:left; - width:20%; - - .active { - color: $active_bd_color; - } - } - - .content { - float:right; - width:78%; - } - - .bash { - @include round-borders-all(4px); - background:#eee; - padding:5px; - //overflow-x:scroll; - pre{ - padding:0; - line-height:2.0; - margin:0; - font-family: 'Courier New', 'andale mono','lucida console',monospace; - color: #333; - text-align:left; - } - } -} diff --git a/app/assets/stylesheets/tags.scss b/app/assets/stylesheets/tags.scss deleted file mode 100644 index 7d40d396b9a..00000000000 --- a/app/assets/stylesheets/tags.scss +++ /dev/null @@ -1,55 +0,0 @@ -.tag { - @include round-borders-all(4px); - padding:2px 4px; - border:none; - text-shadow:none; - - &.inline { - display:inline; - } - - &.high, &.closed { - background: #D12F19; - color:white; - } - - &.today, &.open { - background: #44aa22; - color:white; - } - - &.yours { - background: #4466cc; - color:white; - } - &.normal { - background: #2c5ca6; - color:white; - } - &.notes { - background: #2c5c66; - color:white; - } - - &.note { - 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); - color: #777; - border: 1px solid #DEDFE1; - } - &.issue { - background: #D12F19; - color:white; - } - &.commit { - 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); - color: #777; - border: 1px solid #DEDFE1; - } -} - diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss index 57c1e07725e..61db2c311cf 100644 --- a/app/assets/stylesheets/top_panel.scss +++ b/app/assets/stylesheets/top_panel.scss @@ -1,52 +1,3 @@ -.main_links { - width:130px; - float:left; - - a { - float:left; - } -} - -.dashboard_links { - padding:7px; - float:left; - a { - margin: 0 14px; - float: left; - font-size: 14px; - - &.active { - color:$active_link_color; - } - &:hover { - color:$active_link_color; - } - } -} - -.top-tabs { - margin: 0; - padding: 5px; - font-size: 14px; - padding-bottom:10px; - margin-bottom:20px; - height:26px; - border-bottom:1px solid #ccc; - - .tab { - font-weight: bold; - background:none; - padding: 10px; - float:left; - padding-left:0px; - padding-right:40px; - - &.active { - color: $active_link_color; - } - } -} - body header { position:absolute; width:100%; @@ -54,23 +5,20 @@ body header { margin:0; top:0; left:0; - background: #999; /* for non-css3 browsers */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#EAEAEA'); /* for IE */ - background: -webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#EAEAEA)); /* for webkit browsers */ - background: -moz-linear-gradient(top, #FFFFFF, #EAEAEA); /* for firefox 3.6+ */ - background: -o-linear-gradient(top, #FFFFFF, #EAEAEA); /* for firefox 3.6+ */ + background: #F1F1F1; /* for non-css3 browsers */ border-bottom: 1px solid #ccc; + box-shadow: 0 -1px 0 white inset; + -moz-box-shadow: 0 -1px 0 white inset; + -webkit-box-shadow: 0 -1px 0 white inset; height:50px; .wrapper { margin:auto; - width:$app_width; + min-width:$min_app_width; + max-width:$max_app_width; position:relative; - - .top_panel_content { - padding:10px $app_padding; - } + padding:10px $app_padding; } .project_name { @@ -102,45 +50,157 @@ body header { border: 1px solid #AAA; padding: 0 10px 0 30px; background: transparent url('images.png') no-repeat 8px -42px; - width: 160px; + width: 260px; height:26px; } } } +.main_links { + width:155px; + float:left; -.top_panel_holder .chzn-container { - position:relative; + a { + float:left; + } +} - .chzn-drop { - margin:7px 0; - border: 1px solid #CCC; - min-width: 300px; +.dashboard_links { + padding:7px; + float:left; + a { + margin: 0 14px; + float: left; + font-size: 14px; - .chzn-results { - max-height:300px; + &.active { + color:$active_link_color; + } + &:hover { + color:$active_link_color; } } +} - .chzn-single { - background:transparent; - -moz-border-radius: 4px; - border-radius: 4px; +.top-tabs { + margin: 0; + padding: 5px; + font-size: 14px; + padding-bottom:10px; + margin-bottom:20px; + height:26px; + border-bottom:1px solid #ccc; - div { - background:transparent; - border-left:none; - } + .tab { + font-weight: bold; + background:none; + padding: 10px; + float:left; + padding-left:0px; + padding-right:40px; - span { - font-weight: normal; + &.active { + color: $active_link_color; } } } + .rss-icon { margin:0 15px; padding:3px; - border:1px solid #AAA; 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:#333; + text-indent:-9999px; + top:-10px; + line-height:0; + right:10px; + z-index:10; +} + +header .account-links{ + background: #333; + 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: #EEE; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #555} +header .account-links a:hover{ background: #444;} +.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/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss index 57070871680..322b3d7fba8 100644 --- a/app/assets/stylesheets/tree.scss +++ b/app/assets/stylesheets/tree.scss @@ -8,13 +8,10 @@ } .tree_progress { - float:left; - width:16px; - height:16px; - margin:2px 6px; + display:none; + margin:20px; &.loading { - background-position: 0px 0px; - background: url("ajax-loader-facebook.gif") no-repeat; + display:block; } } @@ -117,5 +114,15 @@ table.highlighttable .linenodiv pre { .tree-item { &:hover { background: #FFFFCF; + cursor:pointer; + } + + .tree-item-file-name { + font-weight:bold; + + img { + position: relative; + top: 2px; + } } } |