diff options
Diffstat (limited to 'app/assets/stylesheets/projects.css.scss')
-rw-r--r-- | app/assets/stylesheets/projects.css.scss | 575 |
1 files changed, 125 insertions, 450 deletions
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; -} |