Skip to content

G
gitlab-ce
Commit 84de1b71 authored by Koen Punt's avatar Koen Punt
Browse files
Options

Added some uniformity, all css properties and values are separated by a colon and a space `: `

parent 755e4a47
Hide whitespace changes
Inline Side-by-side
Showing with 502 additions and 502 deletions
app/assets/stylesheets/common.scss
View file @ 84de1b71
/** LAYOUT **/ /** LAYOUT **/
body { body {
margin-bottom:20px; margin-bottom: 20px;
} }
.container { .container {
padding-top:0; padding-top: 0;
z-index:5; z-index: 5;
} }
.container .content { .container .content {
...@@ -15,9 +15,9 @@ body { ...@@ -15,9 +15,9 @@ body {
.container .sidebar { .container .sidebar {
width: 200px; width: 200px;
height:100%; height: 100%;
min-height:450px; min-height: 450px;
float:right; float: right;
} }
...@@ -29,25 +29,25 @@ body { ...@@ -29,25 +29,25 @@ body {
.help li { color:#111 } .help li { color:#111 }
.back_link { .back_link {
text-decoration:underline; text-decoration: underline;
font-size:14px; font-size: 14px;
font-weight:bold; font-weight: bold;
padding:10px 0; padding:10px 0;
padding-bottom:0; padding-bottom: 0;
} }
.info_link { .info_link {
margin-right:5px; margin-right: 5px;
float:left; float: left;
img { img {
width:20px; width: 20px;
} }
} }
.download_repo_link { .download_repo_link {
background: url("images.png") no-repeat 0 -48px; background: url("images.png") no-repeat 0 -48px;
padding-left:20px; padding-left: 20px;
} }
table a code { table a code {
...@@ -63,30 +63,30 @@ table a code { ...@@ -63,30 +63,30 @@ table a code {
.loading { .loading {
margin:20px auto; margin:20px auto;
background: url(ajax_loader.gif) no-repeat center center; background: url(ajax_loader.gif) no-repeat center center;
width:40px; width: 40px;
height:40px; height: 40px;
} }
/** FLASH message **/ /** FLASH message **/
#flash_container { #flash_container {
height:50px; height: 50px;
position:fixed; position: fixed;
z-index:10001; z-index: 10001;
top:0px; top: 0px;
width:100%; width: 100%;
margin-bottom:15px; margin-bottom: 15px;
overflow:hidden; overflow: hidden;
background:white; background: white;
cursor:pointer; cursor: pointer;
border-bottom:1px solid #ccc; border-bottom:1px solid #ccc;
h4 { h4 {
color:#666; color:#666;
font-size:18px; font-size: 18px;
line-height:38px; line-height: 38px;
padding-top:5px; padding-top: 5px;
margin:2px; margin: 2px;
font-weight:normal; font-weight: normal;
} }
} }
...@@ -95,39 +95,39 @@ table a code { ...@@ -95,39 +95,39 @@ table a code {
} }
.handle:hover { .handle:hover {
cursor:move; cursor: move;
} }
span.update-author { span.update-author {
display:block; display: block;
} }
span.update-author { span.update-author {
color:#999; color:#999;
font-weight:normal; font-weight: normal;
font-style:italic; font-style: italic;
} }
span.update-author strong { span.update-author strong {
font-weight:bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
/** UPDATE ITEM **/ /** UPDATE ITEM **/
span.update-author { span.update-author {
display:block; display: block;
} }
/** END UPDATE ITEM **/ /** END UPDATE ITEM **/
.dashboard-loader { .dashboard-loader {
float:left; float: left;
margin:10px; margin: 10px;
display:none; display: none;
} }
.user-mention { .user-mention {
color:#2FA0BB; color:#2FA0BB;
font-weight:bold; font-weight: bold;
} }
.neib { .neib {
margin-right:10px; margin-right: 10px;
} }
.label { .label {
...@@ -201,12 +201,12 @@ form { ...@@ -201,12 +201,12 @@ form {
.field_with_errors { .field_with_errors {
display:inline; display: inline;
} }
ul.breadcrumb { ul.breadcrumb {
background:white; background: white;
border:none; border: none;
li { li {
display: inline; display: inline;
text-shadow: 0 1px 0 white text-shadow: 0 1px 0 white
...@@ -214,8 +214,8 @@ ul.breadcrumb { ...@@ -214,8 +214,8 @@ ul.breadcrumb {
a { a {
color:#474D57; color:#474D57;
font-weight:bold; font-weight: bold;
font-size:14px; font-size: 14px;
} }
.arrow { .arrow {
...@@ -225,31 +225,31 @@ ul.breadcrumb { ...@@ -225,31 +225,31 @@ ul.breadcrumb {
float: left; float: left;
position: relative; position: relative;
left: -10px; left: -10px;
padding:0; padding: 0;
margin:0; margin: 0;
} }
} }
input[type=text] { input[type=text] {
&.large_text { &.large_text {
padding:6px; padding: 6px;
font-size:16px; font-size: 16px;
} }
} }
input.git_clone_url { input.git_clone_url {
width:325px; width: 325px;
} }
.merge-request-form-holder { .merge-request-form-holder {
select { select {
width:300px; width: 300px;
} }
} }
/** Issues **/ /** Issues **/
#issue_assignee_id { #issue_assignee_id {
width:300px; width: 300px;
} }
#new_issue_dialog textarea{ #new_issue_dialog textarea{
...@@ -257,7 +257,7 @@ input.git_clone_url { ...@@ -257,7 +257,7 @@ input.git_clone_url {
} }
.project_list_url { .project_list_url {
width:250px; width: 250px;
background:#fff !important; background:#fff !important;
} }
...@@ -265,13 +265,13 @@ input.git_clone_url { ...@@ -265,13 +265,13 @@ input.git_clone_url {
/** bordered list **/ /** bordered list **/
ul.bordered-list { ul.bordered-list {
margin:5px 0px; margin:5px 0px;
padding:0px; padding: 0px;
li { li {
padding: 5px 0; padding: 5px 0;
border-bottom: 1px solid #EEE; border-bottom: 1px solid #EEE;
overflow: hidden; overflow: hidden;
display: block; display: block;
margin:0px; margin: 0px;
} }
} }
...@@ -287,10 +287,10 @@ ul.bordered-list li:last-child { border:none } ...@@ -287,10 +287,10 @@ ul.bordered-list li:last-child { border:none }
li.commit { li.commit {
.avatar { .avatar {
width:24px; width: 24px;
top:-5px; top:-5px;
margin-right:10px; margin-right: 10px;
margin-left:10px; margin-left: 10px;
} }
code { code {
...@@ -341,17 +341,17 @@ p.time { ...@@ -341,17 +341,17 @@ p.time {
} }
h4 { h4 {
font-size:14px; font-size: 14px;
padding:2px 10px; padding:2px 10px;
color:#666; color:#666;
border-bottom:1px solid #f1f1f1; border-bottom:1px solid #f1f1f1;
} }
a:last-child h4 { border:none; } a:last-child h4 { border: none; }
a:hover { a:hover {
h4 { h4 {
color:#111; color:#111;
background:$hover; background: $hover;
border-color:#CCC; border-color:#CCC;
.ico.project { .ico.project {
background-position:-209px -21px; background-position:-209px -21px;
...@@ -359,7 +359,7 @@ p.time { ...@@ -359,7 +359,7 @@ p.time {
} }
} }
.bottom { .bottom {
padding:10px; padding: 10px;
} }
} }
...@@ -424,13 +424,13 @@ p.time { ...@@ -424,13 +424,13 @@ p.time {
} }
.status_info { .status_info {
font-size:14px; font-size: 14px;
padding:5px 15px; padding:5px 15px;
line-height:24px; line-height: 24px;
width:60px; width: 60px;
text-align:center; text-align: center;
float:left; float: left;
margin-right:20px; margin-right: 20px;
&.success { &.success {
background: #5BB75B; background: #5BB75B;
...@@ -449,12 +449,12 @@ p.time { ...@@ -449,12 +449,12 @@ p.time {
.arrow{ .arrow{
background: #E3E5EA; background: #E3E5EA;
padding: 5px; padding: 5px;
margin-top:5px; margin-top: 5px;
border-radius: 5px; border-radius: 5px;
text-shadow: none; text-shadow: none;
color: #999; color: #999;
line-height: 16px; line-height: 16px;
font-weight:bold; font-weight: bold;
} }
.thin_area{ .thin_area{
...@@ -462,9 +462,9 @@ p.time { ...@@ -462,9 +462,9 @@ p.time {
} }
.gitlab_pagination { .gitlab_pagination {
span a { color:$link_color; } span a { color: $link_color; }
.prev, .next, .current, .page a { .prev, .next, .current, .page a {
padding:10px; padding: 10px;
} }
.current { .current {
border-bottom:2px solid $style_color; border-bottom:2px solid $style_color;
...@@ -474,7 +474,7 @@ p.time { ...@@ -474,7 +474,7 @@ p.time {
// Fixes alignment on notes. // Fixes alignment on notes.
.new_note { .new_note {
label { label {
text-align:left; text-align: left;
} }
} }
...@@ -486,7 +486,7 @@ li.note { ...@@ -486,7 +486,7 @@ li.note {
border-bottom:none !important; border-bottom:none !important;
} }
.file { .file {
padding-left:20px; padding-left: 20px;
background:url("icon-attachment.png") no-repeat left center; background:url("icon-attachment.png") no-repeat left center;
} }
} }
...@@ -494,7 +494,7 @@ li.note { ...@@ -494,7 +494,7 @@ li.note {
.markdown { .markdown {
img { img {
max-width:100%; max-width: 100%;
} }
} }
...@@ -509,14 +509,14 @@ li.note { ...@@ -509,14 +509,14 @@ li.note {
} }
.remember_me { .remember_me {
text-align:left; text-align: left;
input { input {
margin:0; margin: 0;
} }
span { span {
padding-left:5px; padding-left: 5px;
} }
} }
...@@ -530,10 +530,10 @@ li.note { ...@@ -530,10 +530,10 @@ li.note {
.data { .data {
a { a {
h1 { h1 {
line-height:48px; line-height: 48px;
font-size:48px; font-size: 48px;
padding:20px; padding: 20px;
text-align:center; text-align: center;
} }
} }
} }
...@@ -541,12 +541,12 @@ li.note { ...@@ -541,12 +541,12 @@ li.note {
.rss-icon { .rss-icon {
img { img {
width:24px; width: 24px;
vertical-align:top; vertical-align: top;
} }
strong { strong {
line-height:24px; line-height: 24px;
} }
} }
...@@ -556,7 +556,7 @@ li.note { ...@@ -556,7 +556,7 @@ li.note {
.chzn-container-single .chzn-single { .chzn-container-single .chzn-single {
background:#FFF; background:#FFF;
border: 1px solid #bbb; border: 1px solid #bbb;
box-shadow:none; box-shadow: none;
} }
.chzn-container-active .chzn-single { .chzn-container-active .chzn-single {
background:#fff; background:#fff;
...@@ -565,7 +565,7 @@ li.note { ...@@ -565,7 +565,7 @@ li.note {
.supp_diff_link, .supp_diff_link,
.mr_show_all_commits { .mr_show_all_commits {
cursor:pointer; cursor: pointer;
} }
.merge_request, .merge_request,
...@@ -586,11 +586,11 @@ li.note { ...@@ -586,11 +586,11 @@ li.note {
.git_error_tips { .git_error_tips {
@extend .span6; @extend .span6;
text-align:left; text-align: left;
margin-top:40px; margin-top: 40px;
pre { pre {
background:white; background: white;
border:none; border: none;
font-size: 12px; font-size: 12px;
} }
} }
...@@ -605,15 +605,15 @@ li.note { ...@@ -605,15 +605,15 @@ li.note {
} }
.oauth_select_holder { .oauth_select_holder {
padding:20px; padding: 20px;
img { img {
padding:5px; padding: 5px;
margin-right:10px; margin-right: 10px;
} }
.active { .active {
img { img {
border:1px solid #ccc; border:1px solid #ccc;
background:$hover; background: $hover;
@include border-radius(5px); @include border-radius(5px);
} }
} }
...@@ -634,23 +634,23 @@ li.note { ...@@ -634,23 +634,23 @@ li.note {
pre { pre {
&.clean { &.clean {
background:none; background: none;
border:none; border: none;
margin:0; margin: 0;
padding:0; padding: 0;
} }
} }
.milestone .progress { .milestone .progress {
margin-bottom: 0; margin-bottom: 0;
margin-top:4px; margin-top: 4px;
} }
.float-link { .float-link {
float:left; float: left;
margin-right:15px; margin-right: 15px;
.s16 { .s16 {
margin-right:5px; margin-right: 5px;
} }
} }
......
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file @ 84de1b71
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
@extend .borders; @extend .borders;
@extend .prepend-top-20; @extend .prepend-top-20;
@extend .append-bottom-20; @extend .append-bottom-20;
border-width:1px; border-width: 1px;
@include solid_shade; @include solid_shade;
...@@ -30,22 +30,22 @@ ...@@ -30,22 +30,22 @@
.top_box_content, .top_box_content,
.middle_box_content, .middle_box_content,
.bottom_box_content { .bottom_box_content {
padding:15px; padding: 15px;
pre { pre {
background: none !important; background: none !important;
margin:0; margin: 0;
border:none; border: none;
padding:0; padding: 0;
} }
} }
.middle_box_content { .middle_box_content {
border-radius:0; border-radius: 0;
border:none; border: none;
font-size:12px; font-size: 12px;
background-color:#f5f5f5; background-color:#f5f5f5;
border:none; border: none;
border-top:1px solid #eee; border-top:1px solid #eee;
} }
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
} }
ul { ul {
margin:0; margin: 0;
} }
h5, .title { h5, .title {
...@@ -82,21 +82,21 @@ ...@@ -82,21 +82,21 @@
&.small { &.small {
line-height: 28px; line-height: 28px;
font-size: 14px; font-size: 14px;
line-height:28px; line-height: 28px;
text-shadow: 0 1px 1px white; text-shadow: 0 1px 1px white;
} }
form { form {
padding:9px 0; padding:9px 0;
margin:0px; margin: 0px;
} }
.nav-pills { .nav-pills {
li { li {
padding:3px 0; padding:3px 0;
&.active a { background-color:$style_color; } &.active a { background-color: $style_color; }
a { a {
border-radius:7px; border-radius: 7px;
} }
} }
} }
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
.bottom { .bottom {
@include bg-gray-gradient; @include bg-gray-gradient;
@include round-borders-bottom(4px); @include round-borders-bottom(4px);
border-bottom:none; border-bottom: none;
border-top: 1px solid #bbb; border-top: 1px solid #bbb;
} }
...@@ -121,33 +121,33 @@ ...@@ -121,33 +121,33 @@
padding: 0 20px; padding: 0 20px;
border-top:1px solid #eee; border-top:1px solid #eee;
border-bottom:1px solid #eee; border-bottom:1px solid #eee;
font-size:14px; font-size: 14px;
color:#777; color:#777;
} }
} }
.row_title { .row_title {
font-weight:bold; font-weight: bold;
color:#444; color:#444;
&:hover { &:hover {
color:#444; color:#444;
text-decoration:underline; text-decoration: underline;
} }
} }
li, .wll { li, .wll {
padding:10px; padding: 10px;
&:first-child { &:first-child {
@include round-borders-top(4px); @include round-borders-top(4px);
border-top:none; border-top: none;
} }
&:last-child { &:last-child {
@include round-borders-bottom(4px); @include round-borders-bottom(4px);
border:none; border: none;
} }
} }
.ui-box-body { .ui-box-body {
padding:10px; padding: 10px;
} }
} }
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
View file @ 84de1b71
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
color:#fff; color:#fff;
text-shadow: 0 1px 1px #268; text-shadow: 0 1px 1px #268;
&:hover { &:hover {
background:$blue_link; background: $blue_link;
color:#fff; color:#fff;
} }
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
color:#fff; color:#fff;
text-shadow: 0 1px 1px #268; text-shadow: 0 1px 1px #268;
&:hover { &:hover {
background:$blue_link; background: $blue_link;
color:#fff; color:#fff;
} }
...@@ -60,12 +60,12 @@ ...@@ -60,12 +60,12 @@
} }
&.cancel-btn { &.cancel-btn {
float:right; float: right;
} }
&.wide { &.wide {
padding-left:30px; padding-left: 30px;
padding-right:30px; padding-right: 30px;
} }
&.danger { &.danger {
...@@ -92,19 +92,19 @@ ...@@ -92,19 +92,19 @@
} }
&.very_small { &.very_small {
font-size:11px; font-size: 11px;
padding:2px 6px; padding:2px 6px;
line-height: 16px; line-height: 16px;
margin:2px; margin: 2px;
} }
&.grouped { &.grouped {
margin-right:7px; margin-right: 7px;
float:left; float: left;
} }
&.padded { &.padded {
margin-right:3px; margin-right: 3px;
padding:4px 10px 4px; padding:4px 10px 4px;
} }
} }
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @ 84de1b71
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.lborder { border-left:1px solid #eee } .lborder { border-left:1px solid #eee }
.no-padding { padding:0 !important; } .no-padding { padding:0 !important; }
.underlined { border-bottom: 1px solid #CCC; } .underlined { border-bottom: 1px solid #CCC; }
.no-borders { border:none; } .no-borders { border: none; }
.vlink { color: $link_color !important; } .vlink { color: $link_color !important; }
.underlined_link { text-decoration: underline; } .underlined_link { text-decoration: underline; }
.borders { border: 1px solid #ccc; @include shade; } .borders { border: 1px solid #ccc; @include shade; }
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
/** PILLS & TABS**/ /** PILLS & TABS**/
.nav-pills a:hover { background-color:#888; } .nav-pills a:hover { background-color:#888; }
.nav-pills .active a { background-color: $style_color; } .nav-pills .active a { background-color: $style_color; }
.nav-tabs > li > a, .nav-pills > li > a { color:$style_color; } .nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
.nav.nav-tabs { .nav.nav-tabs {
li { li {
> a { > a {
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
text-shadow:0 1px 1px #fff; text-shadow:0 1px 1px #fff;
} }
i[class^="icon-"] { i[class^="icon-"] {
line-height:14px; line-height: 14px;
} }
} }
&.active { &.active {
...@@ -69,23 +69,23 @@ ...@@ -69,23 +69,23 @@
.alert-message.error { @extend .alert-error; } .alert-message.error { @extend .alert-error; }
/** AVATARS **/ /** AVATARS **/
img.avatar { float:left; margin-right:12px; width:40px; border:1px solid #ddd; padding:1px; } img.avatar { float: left; margin-right: 12px; width: 40px; border:1px solid #ddd; padding: 1px; }
img.avatar.s16 { width:16px; height:16px; margin-right:6px; } img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
img.avatar.s24 { width:24px; height:24px; margin-right:8px; } img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
img.avatar.s32 { width:32px; height:32px; margin-right:10px; } img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
img.lil_av { padding-left: 4px; padding-right:3px; } img.lil_av { padding-left: 4px; padding-right: 3px; }
img.small { width: 80px; } img.small { width: 80px; }
/** HELPERS **/ /** HELPERS **/
.nothing_here_message { text-align:center; padding:20px; color:#777; } .nothing_here_message { text-align: center; padding: 20px; color:#777; }
p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; } p.slead { color:#456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
/** FORMS **/ /** FORMS **/
input[type='search'].search-text-input { input[type='search'].search-text-input {
background-image: url("icon-search.png"); background-image: url("icon-search.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 10px; background-position: 10px;
padding-left:25px; padding-left: 25px;
@include border-radius(4px); @include border-radius(4px);
border:1px solid #ccc; border:1px solid #ccc;
} }
......
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @ 84de1b71
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
.file_holder { .file_holder {
border:1px solid #BBB; border:1px solid #BBB;
margin-bottom:1em; margin-bottom: 1em;
@include solid_shade; @include solid_shade;
.file_title { .file_title {
...@@ -16,20 +16,20 @@ ...@@ -16,20 +16,20 @@
text-align: left; text-align: left;
color: #666; color: #666;
padding: 9px 10px; padding: 9px 10px;
height:18px; height: 18px;
.options { .options {
float:right; float: right;
margin-top: -5px; margin-top: -5px;
} }
.file_name { .file_name {
color:$style_color; color: $style_color;
font-size:14px; font-size: 14px;
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
small { small {
color:#999; color:#999;
font-size:13px; font-size: 13px;
} }
} }
} }
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
code { code {
padding:0 4px; padding:0 4px;
} }
padding:20px; padding: 20px;
h1, h2 { h1, h2 {
line-height: 46px; line-height: 46px;
} }
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
&.image_file { &.image_file {
background:#eee; background:#eee;
text-align:center; text-align: center;
img { img {
padding:100px; padding: 100px;
max-width:300px; max-width: 300px;
} }
} }
...@@ -69,34 +69,34 @@ ...@@ -69,34 +69,34 @@
*/ */
&.blame { &.blame {
table { table {
border:none; border: none;
box-shadow:none; box-shadow: none;
margin:0; margin: 0;
} }
tr { tr {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
td { td {
&:first-child { &:first-child {
border-left:none; border-left: none;
} }
&:last-child { &:last-child {
border-right:none; border-right: none;
} }
background:#fff; background:#fff;
padding:5px; padding: 5px;
} }
.author, .author,
.blame_commit { .blame_commit {
background:#f5f5f5; background:#f5f5f5;
vertical-align:top; vertical-align: top;
} }
.lines { .lines {
pre { pre {
padding:0; padding: 0;
margin:0; margin: 0;
border:none; background: none;
border-radius: 0; border: none;
} }
} }
} }
...@@ -107,22 +107,22 @@ ...@@ -107,22 +107,22 @@
overflow-y: auto; overflow-y: auto;
ol { ol {
margin-left:40px; margin-left: 40px;
padding: 10px 0; padding: 10px 0;
border-left: 1px solid #CCC; border-left: 1px solid #CCC;
margin-bottom:0; margin-bottom: 0;
background: white; background: white;
li { li {
color:#888; color:#888;
p { p {
margin:0; margin: 0;
color:#333; color:#333;
line-height:24px; line-height: 24px;
padding-left: 10px; padding-left: 10px;
} }
&:hover { &:hover {
background:$hover; background: $hover;
} }
} }
} }
......
app/assets/stylesheets/gitlab_bootstrap/lists.scss
View file @ 84de1b71
...@@ -14,7 +14,7 @@ ul { ...@@ -14,7 +14,7 @@ ul {
&.smoke { background-color:#f5f5f5; } &.smoke { background-color:#f5f5f5; }
&:hover { &:hover {
background:$hover; background: $hover;
border-bottom:1px solid #ADF; border-bottom:1px solid #ADF;
} }
&:last-child { border:none } &:last-child { border:none }
...@@ -22,11 +22,11 @@ ul { ...@@ -22,11 +22,11 @@ ul {
p { p {
padding-top: 1px; padding-top: 1px;
margin:0; margin: 0;
color:#222; color:#222;
img { img {
position:relative; position: relative;
top:3px; top: 3px;
} }
} }
} }
...@@ -35,7 +35,7 @@ ul { ...@@ -35,7 +35,7 @@ ul {
ol, ul { ol, ul {
&.styled { &.styled {
li { li {
padding:2px; padding: 2px;
} }
} }
} }
app/assets/stylesheets/gitlab_bootstrap/tables.scss
View file @ 84de1b71
...@@ -3,11 +3,11 @@ table { ...@@ -3,11 +3,11 @@ table {
@extend .table-striped; @extend .table-striped;
@include solid_shade; @include solid_shade;
border:1px solid #bbb; border:1px solid #bbb;
width:100%; width: 100%;
&.low { &.low {
td { td {
line-height:18px; line-height: 18px;
} }
} }
...@@ -32,7 +32,7 @@ table { ...@@ -32,7 +32,7 @@ table {
td { td {
border-color:#f1f1f1; border-color:#f1f1f1;
line-height:28px; line-height: 28px;
.s16 { .s16 {
margin-top: 5px; margin-top: 5px;
...@@ -53,10 +53,10 @@ table { ...@@ -53,10 +53,10 @@ table {
} }
&.lite { &.lite {
border:none; border: none;
box-shadow:none; box-shadow: none;
tr, td { tr, td {
border:none; border: none;
background:none !important; background:none !important;
} }
} }
......
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file @ 84de1b71
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
h1, h2, h3, h4, h5, h6 { margin: 0; } h1, h2, h3, h4, h5, h6 { margin: 0; }
h3, h4, h5, h6 { line-height: 36px; } h3, h4, h5, h6 { line-height: 36px; }
h5 { font-size:14px; } h5 { font-size: 14px; }
h3.page_title { h3.page_title {
color:#456; color:#456;
font-size:20px; font-size: 20px;
font-weight: normal; font-weight: normal;
line-height: 28px; line-height: 28px;
} }
...@@ -37,7 +37,7 @@ a { ...@@ -37,7 +37,7 @@ a {
outline: none; outline: none;
color: $link_color; color: $link_color;
&:hover { &:hover {
text-decoration:none; text-decoration: none;
color: $blue_link; color: $blue_link;
} }
...@@ -53,24 +53,24 @@ a { ...@@ -53,24 +53,24 @@ a {
} }
&.lined { &.lined {
text-decoration:underline; text-decoration: underline;
&:hover { text-decoration:underline; } &:hover { text-decoration: underline; }
} }
&.gray { &.gray {
color:gray; color: gray;
} }
&.supp_diff_link { &.supp_diff_link {
text-align:center; text-align: center;
padding:20px 0; padding:20px 0;
background:#f1f1f1; background:#f1f1f1;
width:100%; width: 100%;
float:left; float: left;
} }
&.neib { &.neib {
margin-right:15px; margin-right: 15px;
} }
} }
......
app/assets/stylesheets/highlight/dark.scss
View file @ 84de1b71
...@@ -23,23 +23,23 @@ ...@@ -23,23 +23,23 @@
.gs { font-weight: bold } /* Generic.Strong */ .gs { font-weight: bold } /* Generic.Strong */
.gu { color: #606060 } /* Generic.Subheading */ .gu { color: #606060 } /* Generic.Subheading */
.gt { color: #aa0000 } /* Generic.Traceback */ .gt { color: #aa0000 } /* Generic.Traceback */
.kc{font-weight:bold;} /* Keyword.Constant */ .kc{font-weight: bold;} /* Keyword.Constant */
.kd{font-weight:bold;} /* Keyword.Declaration */ .kd{font-weight: bold;} /* Keyword.Declaration */
.kn{font-weight:bold;} /* Keyword.Namespace */ .kn{font-weight: bold;} /* Keyword.Namespace */
.kp{font-weight:bold;} /* Keyword.Pseudo */ .kp{font-weight: bold;} /* Keyword.Pseudo */
.kr{font-weight:bold;} /* Keyword.Reserved */ .kr{font-weight: bold;} /* Keyword.Reserved */
.kt{color:#458;font-weight:bold;} /* Keyword.Type */ .kt{color:#458;font-weight: bold;} /* Keyword.Type */
.m { color: #0000DD; font-weight: bold } /* Literal.Number */ .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.p { color: #eee; } .p { color: #eee; }
.s { color: #0AD; background-color: transparent } /* Literal.String */ .s { color: #0AD; background-color: transparent } /* Literal.String */
.na{color:#008080;} /* Name.Attribute */ .na{color:#008080;} /* Name.Attribute */
.nb{color:#0086B3;} /* Name.Builtin */ .nb{color:#0086B3;} /* Name.Builtin */
.nc{color:#ccc;font-weight:bold;} /* Name.Class */ .nc{color:#ccc;font-weight: bold;} /* Name.Class */
.no{color:turquoise;} /* Name.Constant */ .no{color: turquoise;} /* Name.Constant */
.ni{color:#800080;} .ni{color:#800080;}
.ne{color:#900;font-weight:bold;} /* Name.Exception */ .ne{color:#900;font-weight: bold;} /* Name.Exception */
.nf{color:#ccc;font-weight:bold;} /* Name.Function */ .nf{color:#ccc;font-weight: bold;} /* Name.Function */
.nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */ .nn{color:#79C3E0;font-weight: bold;} /* Name.Namespace */
.nt{color:#fc5;} /* Name.Tag */ .nt{color:#fc5;} /* Name.Tag */
.nv{color:#FA4;} /* Name.Variable */ .nv{color:#FA4;} /* Name.Variable */
.py { color: #336699; font-weight: bold } /* Name.Property */ .py { color: #336699; font-weight: bold } /* Name.Property */
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
.sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */
.sc{color:#d14;} /* Literal.String.Char */ .sc{color:#d14;} /* Literal.String.Char */
.sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */
.s2{color:orange;} /* Literal.String.Double */ .s2{color: orange;} /* Literal.String.Double */
.se{color:orange;} /* Literal.String.Escape */ .se{color: orange;} /* Literal.String.Escape */
.sh{color:orange;} /* Literal.String.Heredoc */ .sh{color: orange;} /* Literal.String.Heredoc */
.si{color:orange;} /* Literal.String.Interpol */ .si{color: orange;} /* Literal.String.Interpol */
.sx{color:orange;} /* Literal.String.Other */ .sx{color: orange;} /* Literal.String.Other */
.sr{color:orange;} /* Literal.String.Regex */ .sr{color: orange;} /* Literal.String.Regex */
.s1{color:orange;} /* Literal.String.Single */ .s1{color: orange;} /* Literal.String.Single */
.ss{color:orange;} /* Literal.String.Symbol */ .ss{color: orange;} /* Literal.String.Symbol */
.bp { color: #D58 } /* Name.Builtin.Pseudo */ .bp { color: #D58 } /* Name.Builtin.Pseudo */
.vc { color: #336699 } /* Name.Variable.Class */ .vc { color: #336699 } /* Name.Variable.Class */
.vg { color: #dd7700 } /* Name.Variable.Global */ .vg { color: #dd7700 } /* Name.Variable.Global */
......
app/assets/stylesheets/highlight/white.scss
View file @ 84de1b71
...@@ -22,22 +22,22 @@ ...@@ -22,22 +22,22 @@
.gs { font-weight: bold } /* Generic.Strong */ .gs { font-weight: bold } /* Generic.Strong */
.gu { color: #606060 } /* Generic.Subheading */ .gu { color: #606060 } /* Generic.Subheading */
.gt { color: #aa0000 } /* Generic.Traceback */ .gt { color: #aa0000 } /* Generic.Traceback */
.kc{font-weight:bold;} /* Keyword.Constant */ .kc{font-weight: bold;} /* Keyword.Constant */
.kd{font-weight:bold;} /* Keyword.Declaration */ .kd{font-weight: bold;} /* Keyword.Declaration */
.kn{font-weight:bold;} /* Keyword.Namespace */ .kn{font-weight: bold;} /* Keyword.Namespace */
.kp{font-weight:bold;} /* Keyword.Pseudo */ .kp{font-weight: bold;} /* Keyword.Pseudo */
.kr{font-weight:bold;} /* Keyword.Reserved */ .kr{font-weight: bold;} /* Keyword.Reserved */
.kt{color:#458;font-weight:bold;} /* Keyword.Type */ .kt{color:#458;font-weight: bold;} /* Keyword.Type */
.m { color: #0000DD; font-weight: bold } /* Literal.Number */ .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.na{color:#008080;} /* Name.Attribute */ .na{color:#008080;} /* Name.Attribute */
.nb{color:#0086B3;} /* Name.Builtin */ .nb{color:#0086B3;} /* Name.Builtin */
.nc{color:#458;font-weight:bold;} /* Name.Class */ .nc{color:#458;font-weight: bold;} /* Name.Class */
.no{color:#008080;} /* Name.Constant */ .no{color:#008080;} /* Name.Constant */
.ni{color:#800080;} .ni{color:#800080;}
.ne{color:#900;font-weight:bold;} /* Name.Exception */ .ne{color:#900;font-weight: bold;} /* Name.Exception */
.nf{color:#900;font-weight:bold;} /* Name.Function */ .nf{color:#900;font-weight: bold;} /* Name.Function */
.nn{color:#005;font-weight:bold;} /* Name.Namespace */ .nn{color:#005;font-weight: bold;} /* Name.Namespace */
.nt{color:#000080;} /* Name.Tag */ .nt{color:#000080;} /* Name.Tag */
.nv{color:#008080;} /* Name.Variable */ .nv{color:#008080;} /* Name.Variable */
.py { color: #336699; font-weight: bold } /* Name.Property */ .py { color: #336699; font-weight: bold } /* Name.Property */
......
app/assets/stylesheets/ref_select.scss
View file @ 84de1b71
/** Branch/tag selector **/ /** Branch/tag selector **/
.project-refs-form { .project-refs-form {
margin:0; margin: 0;
span { span {
background:none !important; background:none !important;
position:static !important; position:static !important;
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
} }
} }
.project-refs-select { .project-refs-select {
width:120px; width: 120px;
} }
.project-refs-form .chzn-container { .project-refs-form .chzn-container {
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
.chzn-drop { .chzn-drop {
min-width: 400px; min-width: 400px;
.chzn-results { .chzn-results {
max-height:300px; max-height: 300px;
} }
.chzn-search input { .chzn-search input {
min-width:365px; min-width: 365px;
} }
} }
} }
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
margin:7px 0; margin:7px 0;
min-width: 200px; min-width: 200px;
border: 1px solid #bbb; border: 1px solid #bbb;
border-radius:0; border-radius: 0;
.chzn-results { .chzn-results {
margin-top: 5px; margin-top: 5px;
max-height:300px; max-height: 300px;
.group-result { .group-result {
color: $style_color; color: $style_color;
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
.chzn-search { .chzn-search {
@include bg-gray-gradient; @include bg-gray-gradient;
input { input {
min-width:165px; min-width: 165px;
border-color: #CCC; border-color: #CCC;
} }
} }
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
@include bg-light-gray-gradient; @include bg-light-gray-gradient;
div { div {
background:transparent; background: transparent;
border-left:none; border-left: none;
} }
span { span {
......
app/assets/stylesheets/sections/commits.scss
View file @ 84de1b71
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
.commit-title { .commit-title {
line-height: 26px; line-height: 26px;
margin:0; margin: 0;
} }
.commit-description { .commit-description {
font-size: 14px; font-size: 14px;
border: none; border: none;
background-color: white; background-color: white;
padding-top:10px; padding-top: 10px;
} }
.browse-button { .browse-button {
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
@extend .clearfix; @extend .clearfix;
.sha-block { .sha-block {
text-align:right; text-align: right;
&:first-child { &:first-child {
padding-bottom:6px; padding-bottom: 6px;
} }
a { a {
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
.author a, .author a,
.committer a { .committer a {
font-size:14px; font-size: 14px;
line-height:22px; line-height: 22px;
text-shadow:0 1px 1px #fff; text-shadow:0 1px 1px #fff;
color:#777; color:#777;
&:hover { &:hover {
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
*/ */
.diff_file { .diff_file {
border:1px solid #CCC; border:1px solid #CCC;
margin-bottom:1em; margin-bottom: 1em;
.diff_file_header { .diff_file_header {
@extend .clearfix; @extend .clearfix;
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
> span { > span {
font-family: $monospace; font-family: $monospace;
font-size:14px; font-size: 14px;
line-height: 30px; line-height: 30px;
} }
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,8 @@
} }
} }
.diff_file_content { .diff_file_content {
overflow:auto; overflow: auto;
overflow-y:hidden; overflow-y: hidden;
background:#fff; background:#fff;
color:#333; color:#333;
font-size: 12px; font-size: 12px;
...@@ -123,17 +123,17 @@ ...@@ -123,17 +123,17 @@
table { table {
td { td {
line-height:18px; line-height: 18px;
} }
} }
} }
.diff_file_content_image { .diff_file_content_image {
background:#eee; background:#eee;
text-align:center; text-align: center;
.image { .image {
display: inline-block; display: inline-block;
margin:50px; margin: 50px;
max-width:400px; max-width: 400px;
img{ img{
background: url('trans_bg.gif'); background: url('trans_bg.gif');
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
&.img_compared { &.img_compared {
.image { .image {
max-width:300px; max-width: 300px;
} }
} }
} }
...@@ -166,46 +166,46 @@ ...@@ -166,46 +166,46 @@
.diff_file_content{ .diff_file_content{
table { table {
border:none; border: none;
margin:0px; margin: 0px;
padding:0px; padding: 0px;
tr { tr {
td { td {
font-size:12px; font-size: 12px;
} }
} }
} }
.old_line, .new_line { .old_line, .new_line {
margin:0px; margin: 0px;
padding:0px; padding: 0px;
border:none; border: none;
background:#EEE; background:#EEE;
color:#666; color:#666;
padding: 0px 5px; padding: 0px 5px;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
text-align:right; text-align: right;
min-width:35px; min-width: 35px;
max-width:35px; max-width: 35px;
width:35px; width: 35px;
moz-user-select: none; moz-user-select: none;
-khtml-user-select: none; -khtml-user-select: none;
user-select: none; user-select: none;
a { a {
float:left; float: left;
width:35px; width: 35px;
font-weight:normal; font-weight: normal;
color:#666; color:#666;
&:hover { &:hover {
text-decoration:underline; text-decoration: underline;
} }
} }
} }
.line_content { .line_content {
white-space:pre; white-space: pre;
height:14px; height: 14px;
margin:0px; margin: 0px;
padding:0px; padding: 0px;
border:none; border: none;
&.new { &.new {
background: #CFD; background: #CFD;
} }
...@@ -232,28 +232,28 @@ ...@@ -232,28 +232,28 @@
.browse_code_link_holder { .browse_code_link_holder {
@extend .span2; @extend .span2;
float:right; float: right;
} }
.committed_ago { .committed_ago {
float:right; float: right;
@extend .cgray; @extend .cgray;
} }
.notes_count { .notes_count {
float:right; float: right;
margin: -6px 8px 6px; margin: -6px 8px 6px;
} }
code { code {
background:#FCEEC1; background:#FCEEC1;
color:$style_color; color: $style_color;
} }
.commit_short_id { .commit_short_id {
float:left; float: left;
@extend .lined; @extend .lined;
min-width:65px; min-width: 65px;
font-family: $monospace; font-family: $monospace;
} }
...@@ -296,8 +296,8 @@ ...@@ -296,8 +296,8 @@
.label_commit { .label_commit {
@include round-borders-all(4px); @include round-borders-all(4px);
padding:2px 4px; padding:2px 4px;
border:none; border: none;
font-size:13px; font-size: 13px;
background: #474D57; background: #474D57;
color:#fff; color:#fff;
font-family: $monospace; font-family: $monospace;
......
app/assets/stylesheets/sections/events.scss
View file @ 84de1b71
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
&.left, &.left,
&.joined { &.joined {
padding:0 2px; padding:0 2px;
float:none; float: none;
} }
} }
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
* *
*/ */
.event-item { .event-item {
min-height:40px; min-height: 40px;
border-bottom:1px solid #eee; border-bottom:1px solid #eee;
.event-title { .event-title {
color:#333; color:#333;
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
} }
} }
.avatar { .avatar {
width:32px; width: 32px;
} }
.event_icon { .event_icon {
float: right; float: right;
...@@ -59,15 +59,15 @@ ...@@ -59,15 +59,15 @@
@include border-radius(5px); @include border-radius(5px);
background: #F9F9F9; background: #F9F9F9;
img { img {
width:20px; width: 20px;
} }
} }
ul { ul {
margin-left:50px; margin-left: 50px;
margin-bottom:5px; margin-bottom: 5px;
.avatar { .avatar {
width:18px; width: 18px;
margin-top:3px; margin-top: 3px;
} }
} }
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
li { li {
&.commit { &.commit {
background: transparent; background: transparent;
padding:3px; padding: 3px;
border:none; border: none;
font-size:12px; font-size: 12px;
} }
&.commits-stat { &.commits-stat {
display: block; display: block;
...@@ -99,14 +99,14 @@ ...@@ -99,14 +99,14 @@
*/ */
.event_lp { .event_lp {
color:#777; color:#777;
padding:10px; padding: 10px;
min-height:22px; min-height: 22px;
border-left: 5px solid #5AB9C3; border-left: 5px solid #5AB9C3;
margin-bottom:20px; margin-bottom: 20px;
background:#f9f9f9; background:#f9f9f9;
.avatar { .avatar {
width:24px; width: 24px;
} }
.btn-new-mr { .btn-new-mr {
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
background: #f9f9f9; background: #f9f9f9;
margin-bottom: 10px; margin-bottom: 10px;
img { img {
width:20px; width: 20px;
} }
&.inactive { &.inactive {
......
app/assets/stylesheets/sections/graph.scss
View file @ 84de1b71
.graph_holder { .graph_holder {
border: 1px solid #aaa; border: 1px solid #aaa;
padding:1px; padding: 1px;
h4 { h4 {
......
app/assets/stylesheets/sections/header.scss
View file @ 84de1b71
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
header { header {
&.navbar-gitlab { &.navbar-gitlab {
.navbar-inner { .navbar-inner {
height:45px; height: 45px;
padding: 5px; padding: 5px;
background: #F1F1F1; background: #F1F1F1;
...@@ -24,8 +24,8 @@ header { ...@@ -24,8 +24,8 @@ header {
} }
} }
z-index:10; z-index: 10;
/*height:60px;*/ /*height: 60px;*/
/** /**
* *
...@@ -33,24 +33,24 @@ header { ...@@ -33,24 +33,24 @@ header {
* *
*/ */
.app_logo { .app_logo {
width:170px; width: 170px;
float:left; float: left;
a { a {
float:left; float: left;
padding: 0px; padding: 0px;
h1 { h1 {
width:90px; width: 90px;
background: url('logo_dark.png') no-repeat 0px 2px; background: url('logo_dark.png') no-repeat 0px 2px;
float:left; float: left;
margin-left:2px; margin-left: 2px;
font-size:30px; font-size: 30px;
line-height:48px; line-height: 48px;
font-weight:normal; font-weight: normal;
color:$style_color; color: $style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
padding-left:45px; padding-left: 45px;
height:40px; height: 40px;
font-family: 'Korolev', sans-serif; font-family: 'Korolev', sans-serif;
} }
} }
...@@ -62,14 +62,14 @@ header { ...@@ -62,14 +62,14 @@ header {
* *
*/ */
.project_name { .project_name {
position:relative; position: relative;
float:left; float: left;
margin:0; margin: 0;
margin-right:30px; margin-right: 30px;
font-size:30px; font-size: 30px;
line-height:48px; line-height: 48px;
font-weight:normal; font-weight: normal;
color:$style_color; color: $style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
font-family: 'Korolev', sans-serif; font-family: 'Korolev', sans-serif;
} }
...@@ -81,7 +81,7 @@ header { ...@@ -81,7 +81,7 @@ header {
*/ */
.search { .search {
margin-right: 45px; margin-right: 45px;
margin-left:10px; margin-left: 10px;
margin-top: 2px; margin-top: 2px;
.search-input { .search-input {
...@@ -89,11 +89,11 @@ header { ...@@ -89,11 +89,11 @@ header {
background-image: url("icon-search.png"); background-image: url("icon-search.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 10px; background-position: 10px;
padding-left:25px; padding-left: 25px;
font-size: 13px; font-size: 13px;
@include border-radius(3px); @include border-radius(3px);
border:1px solid #c6c6c6; border:1px solid #c6c6c6;
box-shadow:none; box-shadow: none;
&:focus { &:focus {
@extend .span3; @extend .span3;
} }
...@@ -122,7 +122,7 @@ header { ...@@ -122,7 +122,7 @@ header {
width: 28px; width: 28px;
height: 28px; height: 28px;
display: block; display: block;
top:1px; top: 1px;
&:after { &:after {
content: " "; content: " ";
display: block; display: block;
......
app/assets/stylesheets/sections/issues.scss
View file @ 84de1b71
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.issue_title { .issue_title {
@extend .top_box_content; @extend .top_box_content;
.clearfix { .clearfix {
margin-bottom:0px; margin-bottom: 0px;
input { input {
@extend .span8; @extend .span8;
} }
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
} }
.issue_middle_block { .issue_middle_block {
@extend .middle_box_content; @extend .middle_box_content;
height:30px; height: 30px;
.issue_assignee { .issue_assignee {
@extend .span6; @extend .span6;
float:left; float: left;
} }
.issue_milestone { .issue_milestone {
@extend .span4; @extend .span4;
float:left; float: left;
} }
} }
.issue_description { .issue_description {
...@@ -31,28 +31,28 @@ ...@@ -31,28 +31,28 @@
padding:7px 10px; padding:7px 10px;
.issue_check { .issue_check {
float:left; float: left;
padding: 8px 0; padding: 8px 0;
padding-right: 8px; padding-right: 8px;
min-width: 15px; min-width: 15px;
} }
p { p {
padding-top:0; padding-top: 0;
padding-bottom:2px; padding-bottom: 2px;
} }
img.avatar { img.avatar {
width:32px; width: 32px;
margin-top:1px; margin-top: 1px;
} }
} }
} }
input.check_all_issues { input.check_all_issues {
float:left; float: left;
padding: 0; padding: 0;
margin:0; margin: 0;
margin-right: 10px; margin-right: 10px;
position: relative; position: relative;
top: 8px; top: 8px;
...@@ -82,16 +82,16 @@ input.check_all_issues { ...@@ -82,16 +82,16 @@ input.check_all_issues {
} }
} }
@media (min-width: 800px) { .issues_filters select { width:160px; } } @media (min-width: 800px) { .issues_filters select { width: 160px; } }
@media (min-width: 1000px) { .issues_filters select { width:200px; } } @media (min-width: 1000px) { .issues_filters select { width: 200px; } }
@media (min-width: 1200px) { .issues_filters select { width:220px; } } @media (min-width: 1200px) { .issues_filters select { width: 220px; } }
#issues-table-holder { #issues-table-holder {
.issues_filters { .issues_filters {
form { form {
padding:0; padding: 0;
margin:0; margin: 0;
margin-top:7px margin-top:7px
} }
} }
...@@ -99,27 +99,27 @@ input.check_all_issues { ...@@ -99,27 +99,27 @@ input.check_all_issues {
.issues_bulk_update { .issues_bulk_update {
margin: 0; margin: 0;
form { form {
padding:0; padding: 0;
margin:0; margin: 0;
margin-top:7px margin-top:7px
} }
.update_selected_issues { .update_selected_issues {
position:relative; position: relative;
top:-2px; top:-2px;
margin-left:4px; margin-left: 4px;
float:left; float: left;
} }
.update_issues_text { .update_issues_text {
padding:3px; padding: 3px;
line-height: 18px; line-height: 18px;
float:left; float: left;
} }
} }
} }
#update_status { #update_status {
width:100px; width: 100px;
} }
...@@ -136,11 +136,11 @@ input.check_all_issues { ...@@ -136,11 +136,11 @@ input.check_all_issues {
*/ */
.ui-datepicker { .ui-datepicker {
border:none; border: none;
box-shadow:none; box-shadow: none;
.ui-datepicker-header { .ui-datepicker-header {
@include solid_shade; @include solid_shade;
margin-bottom:10px; margin-bottom: 10px;
border:1px solid #bbb; border:1px solid #bbb;
} }
} }
app/assets/stylesheets/sections/login.scss
View file @ 84de1b71
...@@ -27,7 +27,7 @@ body.login-page{ ...@@ -27,7 +27,7 @@ body.login-page{
-moz-border-radius-topright: 5px; -moz-border-radius-topright: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
margin-bottom:0px; margin-bottom: 0px;
} }
.login-box input.text.bottom{ .login-box input.text.bottom{
......
app/assets/stylesheets/sections/merge_requests.scss
View file @ 84de1b71
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.mr_branch_box { .mr_branch_box {
@extend .ui-box; @extend .ui-box;
margin-bottom:20px; margin-bottom: 20px;
.body { .body {
background:#f1f1f1; background:#f1f1f1;
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
} }
form { form {
margin-bottom:0; margin-bottom: 0;
.clearfix { .clearfix {
margin-bottom:0; margin-bottom: 0;
} }
} }
.accept_group { .accept_group {
float:left; float: left;
border: 1px solid #ADA; border: 1px solid #ADA;
padding: 2px; padding: 2px;
@include border-radius(5px); @include border-radius(5px);
...@@ -38,13 +38,13 @@ ...@@ -38,13 +38,13 @@
background: #CEB; background: #CEB;
.accept_merge_request { .accept_merge_request {
font-size:13px; font-size: 13px;
float:left; float: left;
} }
.remove_branch_holder { .remove_branch_holder {
margin-left:20px; margin-left: 20px;
margin-right:10px; margin-right: 10px;
float:left; float: left;
} }
label { label {
color:#444; color:#444;
...@@ -60,9 +60,9 @@ ...@@ -60,9 +60,9 @@
.mr_nav_tabs { .mr_nav_tabs {
li { li {
a { a {
font-weight:bold; font-weight: bold;
padding:8px 20px; padding:8px 20px;
text-align:center; text-align: center;
} }
} }
} }
...@@ -87,8 +87,8 @@ li.merge_request { ...@@ -87,8 +87,8 @@ li.merge_request {
.label_branch { .label_branch {
@include round-borders-all(4px); @include round-borders-all(4px);
padding:2px 4px; padding:2px 4px;
border:none; border: none;
font-size:14px; font-size: 14px;
background: #474D57; background: #474D57;
color:#fff; color:#fff;
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
...@@ -97,8 +97,8 @@ li.merge_request { ...@@ -97,8 +97,8 @@ li.merge_request {
.mr_source_commit, .mr_source_commit,
.mr_target_commit { .mr_target_commit {
.commit { .commit {
margin:0; margin: 0;
padding:0; padding: 0;
padding: 5px; padding: 5px;
margin-bottom: 5px; margin-bottom: 5px;
.avatar { position:relative } .avatar { position:relative }
...@@ -109,11 +109,11 @@ li.merge_request { ...@@ -109,11 +109,11 @@ li.merge_request {
.dash, .dash,
.committed_ago, .committed_ago,
.browse_code_link_holder { .browse_code_link_holder {
display:none; display: none;
} }
list-style:none; list-style: none;
&:hover { &:hover {
background:none; background: none;
} }
} }
} }
...@@ -126,14 +126,14 @@ li.merge_request { ...@@ -126,14 +126,14 @@ li.merge_request {
@extend .main_box; @extend .main_box;
.merge_requests_middle_box { .merge_requests_middle_box {
@extend .middle_box_content; @extend .middle_box_content;
height:30px; height: 30px;
.merge_requests_assignee { .merge_requests_assignee {
@extend .span6; @extend .span6;
float:left; float: left;
} }
.merge_requests_milestone { .merge_requests_milestone {
@extend .span4; @extend .span4;
float:left; float: left;
} }
} }
} }
......
app/assets/stylesheets/sections/nav.scss
View file @ 84de1b71
...@@ -5,34 +5,34 @@ ...@@ -5,34 +5,34 @@
ul.main_menu { ul.main_menu {
border-radius: 4px; border-radius: 4px;
margin: auto; margin: auto;
margin:30px 0; margin: 30px 0;
border:1px solid #BBB; border: 1px solid #BBB;
height:37px; height: 37px;
@include bg-gray-gradient; @include bg-gray-gradient;
position:relative; position: relative;
overflow:hidden; overflow: hidden;
@include shade; @include shade;
.count { .count {
position: relative; position: relative;
top: -1px; top: -1px;
display: inline-block; display: inline-block;
height: 15px; height: 15px;
margin: 0 0 0 5px; margin: 0 0 0 5px;
padding: 0 8px 1px 8px; padding: 0 8px 1px 8px;
height: auto; height: auto;
font-size: 0.82em; font-size: 0.82em;
line-height: 14px; line-height: 14px;
text-align: center; text-align: center;
color: #777; color: #777;
background: #f2f2f2; background: #f2f2f2;
border-top: 1px solid #CCC; border-top: 1px solid #CCC;
border-radius: 8px; border-radius: 8px;
-moz-border-radius: 8px; -moz-border-radius: 8px;
} }
.label { .label {
background:$hover; background: $hover;
text-shadow:none; text-shadow: none;
color:$style_color; color: $style_color;
} }
li { li {
list-style-type: none; list-style-type: none;
...@@ -59,8 +59,8 @@ ul.main_menu { ...@@ -59,8 +59,8 @@ ul.main_menu {
border-left: 1px solid #BBB; border-left: 1px solid #BBB;
border-radius: 0 0 1px 1px; border-radius: 0 0 1px 1px;
&:first-child{ &:first-child{
border-bottom:none; border-bottom: none;
border-left:none; border-left: none;
} }
} }
...@@ -68,10 +68,10 @@ ul.main_menu { ...@@ -68,10 +68,10 @@ ul.main_menu {
a { a {
background: url(home_icon.PNG) no-repeat center center; background: url(home_icon.PNG) no-repeat center center;
text-indent:-9999px; text-indent:-9999px;
min-width:20px; min-width: 20px;
img { img {
position:relative; position: relative;
top:4px; top: 4px;
} }
} }
} }
...@@ -79,9 +79,9 @@ ul.main_menu { ...@@ -79,9 +79,9 @@ ul.main_menu {
a { a {
display: block; display: block;
text-align: center; text-align: center;
font-weight:bold; font-weight: bold;
height:35px; height: 35px;
line-height:36px; line-height: 36px;
color: $style_color; color: $style_color;
text-shadow:0 1px 1px white; text-shadow:0 1px 1px white;
padding:0 10px; padding:0 10px;
......
app/assets/stylesheets/sections/notes.scss
View file @ 84de1b71
...@@ -4,30 +4,30 @@ ...@@ -4,30 +4,30 @@
*/ */
#notes-list, #notes-list,
#new-notes-list { #new-notes-list {
display:block; display: block;
list-style:none; list-style: none;
margin:0px; margin: 0px;
padding:0px; padding: 0px;
} }
.issue_notes, .issue_notes,
.wiki_notes { .wiki_notes {
.note_content { .note_content {
float:left; float: left;
width:400px; width: 400px;
} }
} }
/* Note textare */ /* Note textare */
#note_note { #note_note {
height:80px; height: 80px;
width:99%; width: 99%;
font-size:14px; font-size: 14px;
} }
#new_note { #new_note {
.attach_holder { .attach_holder {
display:none; display: none;
} }
} }
...@@ -43,27 +43,27 @@ ...@@ -43,27 +43,27 @@
padding: 8px 0; padding: 8px 0;
overflow: hidden; overflow: hidden;
display: block; display: block;
position:relative; position: relative;
img {float: left; margin-right: 10px;} img {float: left; margin-right: 10px;}
img.emoji {float:none;margin:0;} img.emoji {float: none;margin: 0;}
.note-author cite{font-style: italic;} .note-author cite{font-style: italic;}
p { color:$style_color; } p { color: $style_color; }
.note-author { color: $style_color;} .note-author { color: $style_color;}
.note-title { margin-left:45px; padding-top: 5px;} .note-title { margin-left: 45px; padding-top: 5px;}
.avatar { .avatar {
margin-top:3px; margin-top: 3px;
} }
.delete-note { .delete-note {
display:none; display: none;
position:absolute; position: absolute;
right:0; right: 0;
top:0; top: 0;
} }
&:hover { &:hover {
.delete-note { display:block; } .delete-note { display: block; }
} }
} }
#notes-list:not(.reversed) .note, #notes-list:not(.reversed) .note,
...@@ -107,17 +107,17 @@ tr.line_notes_row { ...@@ -107,17 +107,17 @@ tr.line_notes_row {
a.line_note_reply_link { a.line_note_reply_link {
@include round-borders-all(4px); @include round-borders-all(4px);
padding: 3px 10px; padding: 3px 10px;
margin-left:5px; margin-left: 5px;
color: white; color: white;
background: #2A79A3; background: #2A79A3;
border-color: #2A79A3; border-color: #2A79A3;
} }
} }
ul { ul {
margin:0; margin: 0;
li { li {
padding:0; padding: 0;
border:none; border: none;
} }
} }
} }
...@@ -132,21 +132,21 @@ tr.line_notes_row { ...@@ -132,21 +132,21 @@ tr.line_notes_row {
border-bottom:1px solid #ddd; border-bottom:1px solid #ddd;
} }
.note_actions { .note_actions {
margin:0; margin: 0;
padding-top: 10px; padding-top: 10px;
.buttons { .buttons {
float:left; float: left;
width:300px; width: 300px;
} }
.options { .options {
.labels { .labels {
float:left; float: left;
padding-left:10px; padding-left: 10px;
label { label {
padding: 6px 0; padding: 6px 0;
margin: 0; margin: 0;
width:120px; width: 120px;
} }
} }
} }
...@@ -154,13 +154,13 @@ tr.line_notes_row { ...@@ -154,13 +154,13 @@ tr.line_notes_row {
} }
td .line_note_link { td .line_note_link {
position:absolute; position: absolute;
margin-left:-70px; margin-left:-70px;
margin-top:-10px; margin-top:-10px;
z-index:10; z-index: 10;
background: url("comment_add.png") no-repeat left 0; background: url("comment_add.png") no-repeat left 0;
width:32px; width: 32px;
height:32px; height: 32px;
opacity: 0.0; opacity: 0.0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
...@@ -180,13 +180,13 @@ td .line_note_link { ...@@ -180,13 +180,13 @@ td .line_note_link {
.new_note { .new_note {
.input-file { .input-file {
font: 500px monospace; font: 500px monospace;
opacity:0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top:0; top: 0;
right:0; right: 0;
padding:0; padding: 0;
margin: 0; margin: 0;
} }
...@@ -198,24 +198,24 @@ td .line_note_link { ...@@ -198,24 +198,24 @@ td .line_note_link {
} }
.attachments { .attachments {
position:relative; position: relative;
width: 350px; width: 350px;
height: 50px; height: 50px;
overflow:hidden; overflow: hidden;
margin:0 0 5px !important; margin:0 0 5px !important;
.input_file { .input_file {
.file_upload { .file_upload {
position: absolute; position: absolute;
right:14px; right: 14px;
top:7px; top: 7px;
} }
.file_name { .file_name {
line-height:30px; line-height: 30px;
width:240px; width: 240px;
height:28px; height: 28px;
overflow:hidden; overflow: hidden;
} }
.input-file { .input-file {
width: 260px; width: 260px;
...@@ -228,5 +228,5 @@ td .line_note_link { ...@@ -228,5 +228,5 @@ td .line_note_link {
.note-text { .note-text {
border: 1px solid #aaa; border: 1px solid #aaa;
box-shadow:none; box-shadow: none;
} }
app/assets/stylesheets/sections/profile.scss
View file @ 84de1b71
.profile_history { .profile_history {
.event_feed { .event_feed {
min-height:20px; min-height: 20px;
.avatar { .avatar {
width:20px; width: 20px;
} }
} }
} }
.profile_avatar_holder { .profile_avatar_holder {
float:left; float: left;
width:60px; width: 60px;
height:60px; height: 60px;
margin-right:20px; margin-right: 20px;
img { img {
width:60px; width: 60px;
height:60px; height: 60px;
background:#fff; background:#fff;
padding: 1px; padding: 1px;
border: 1px solid #ddd; border: 1px solid #ddd;
......
app/assets/stylesheets/sections/projects.scss
View file @ 84de1b71
...@@ -10,37 +10,37 @@ ...@@ -10,37 +10,37 @@
.groups_box, .groups_box,
.projects_box { .projects_box {
h5 { h5 {
color:$style_color; color: $style_color;
font-size:16px; font-size: 16px;
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
padding: 2px 10px; padding: 2px 10px;
line-height:32px; line-height: 32px;
font-size:14px; font-size: 14px;
} }
ul { ul {
li { li {
padding:0; padding: 0;
a { a {
display:block; display: block;
.group_name { .group_name {
font-size:14px; font-size: 14px;
line-height:18px; line-height: 18px;
} }
.project_name { .project_name {
color:#4fa2bd; color:#4fa2bd;
font-size:14px; font-size: 14px;
line-height:18px; line-height: 18px;
} }
.arrow { .arrow {
float:right; float: right;
padding:10px; padding: 10px;
margin:0; margin: 0;
} }
.last_activity { .last_activity {
padding-top:5px; padding-top: 5px;
display:block; display: block;
span, strong { span, strong {
font-size:12px; font-size: 12px;
color:#666; color:#666;
} }
} }
...@@ -58,21 +58,21 @@ ...@@ -58,21 +58,21 @@
.project_name_holder { .project_name_holder {
input, input,
label { label {
font-size:16px; font-size: 16px;
line-height:20px; line-height: 20px;
padding:8px; padding: 8px;
} }
label { label {
color:#888; color:#888;
} }
.btn { .btn {
padding:6px 10px; padding:6px 10px;
margin-left:10px; margin-left: 10px;
margin-bottom:8px; margin-bottom: 8px;
} }
} }
.adv_settings { .adv_settings {
h6 { margin-left:40px; } h6 { margin-left: 40px; }
} }
} }
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
@include bg-gray-gradient; @include bg-gray-gradient;
padding: 4px 7px; padding: 4px 7px;
border: 1px solid #CCC; border: 1px solid #CCC;
margin-bottom:20px; margin-bottom: 20px;
} }
.project_clone_holder { .project_clone_holder {
input[type="text"], input[type="text"],
.btn { .btn {
font-size:12px; font-size: 12px;
line-height: 18px; line-height: 18px;
margin: 0; margin: 0;
padding: 3px 10px; padding: 3px 10px;
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
.save-project-loader { .save-project-loader {
img { img {
margin-top:50px; margin-top: 50px;
margin-bottom:50px; margin-bottom: 50px;
} }
h3 { h3 {
@extend .page_title; @extend .page_title;
......
app/assets/stylesheets/sections/themes.scss
View file @ 84de1b71
...@@ -6,17 +6,17 @@ ...@@ -6,17 +6,17 @@
} }
.themes_opts { .themes_opts {
padding-left:20px; padding-left: 20px;
label { label {
width:175px; width: 175px;
margin-right:40px; margin-right: 40px;
.prev { .prev {
@extend .thumbnail; @extend .thumbnail;
height:30px; height: 30px;
width:175px; width: 175px;
margin-bottom:10px; margin-bottom: 10px;
&.classic { &.classic {
background: #31363e; background: #31363e;
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
} }
.code_highlight_opts { .code_highlight_opts {
padding-left:20px; padding-left: 20px;
label { label {
width:220px; width: 220px;
margin-right:40px; margin-right: 40px;
.prev { .prev {
@extend .thumbnail; @extend .thumbnail;
height:151px; height: 151px;
width:220px; width: 220px;
margin-bottom:10px; margin-bottom: 10px;
} }
} }
} }
......
app/assets/stylesheets/sections/tree.scss
View file @ 84de1b71
.tree-holder { .tree-holder {
.tree-content-holder { .tree-content-holder {
float:left; float: left;
width:100%; width: 100%;
} }
.tree_progress { .tree_progress {
display:none; display: none;
margin:20px; margin: 20px;
&.loading { &.loading {
display:block; display: block;
} }
} }
...@@ -21,17 +21,17 @@ ...@@ -21,17 +21,17 @@
border-top:1px solid #ADF; border-top:1px solid #ADF;
border-bottom:1px solid #ADF; border-bottom:1px solid #ADF;
} }
cursor:pointer; cursor: pointer;
} }
} }
} }
.tree-item { .tree-item {
.tree-item-file-name { .tree-item-file-name {
vertical-align:middle; vertical-align: middle;
a { a {
&:hover { &:hover {
color:$blue_link; color: $blue_link;
} }
} }
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
padding: 2px 10px; padding: 2px 10px;
} }
td { td {
line-height:20px; line-height: 20px;
background:#fafafa; background:#fafafa;
} }
} }
......
app/assets/stylesheets/themes/ui_basic.scss
View file @ 84de1b71
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
a { a {
color: $link_color; color: $link_color;
&:hover { &:hover {
text-decoration:none; text-decoration: none;
color: $blue_link; color: $blue_link;
} }
} }
......
app/assets/stylesheets/themes/ui_mars.scss
View file @ 84de1b71
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
} }
} }
.separator { .separator {
display:none; display: none;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7