diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index b1a2342..aa87ea7 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -9,10 +9,26 @@ *= require_self */ +/** Override bootstrap variables **/ +$font-size-base: 13px !default; + /** - * GitLab bootstrap: + * Twitter bootstrap: */ -@import "gitlab_bootstrap.scss"; +@import 'bootstrap'; + +/** + * Font icons + * + */ +@import "font-awesome"; + +/** + * Generic css (forms, nav etc): + */ +@import "generic.scss"; + + @import "common.scss"; @import "selects.scss"; diff --git a/app/assets/stylesheets/generic.scss b/app/assets/stylesheets/generic.scss new file mode 100644 index 0000000..0ebbbf2 --- /dev/null +++ b/app/assets/stylesheets/generic.scss @@ -0,0 +1,14 @@ +@import "generic/variables.scss"; +@import "generic/fonts.scss"; +@import "generic/mixins.scss"; +@import "generic/avatar.scss"; +@import "generic/nav.scss"; +@import "generic/common.scss"; +@import "generic/typography.scss"; +@import "generic/buttons.scss"; +@import "generic/blocks.scss"; +@import "generic/ui_box.scss"; +@import "generic/issue_box.scss"; +@import "generic/files.scss"; +@import "generic/lists.scss"; +@import "generic/forms.scss"; diff --git a/app/assets/stylesheets/generic/avatar.scss b/app/assets/stylesheets/generic/avatar.scss new file mode 100644 index 0000000..4f038b9 --- /dev/null +++ b/app/assets/stylesheets/generic/avatar.scss @@ -0,0 +1,23 @@ +.avatar { + float: left; + margin-right: 12px; + width: 40px; + padding: 1px; + @include border-radius(4px); + + &.avatar-inline { + float: none; + margin-left: 3px; + + &.s16 { margin-right: 2px; } + &.s24 { margin-right: 2px; } + } + + &.s16 { width: 16px; height: 16px; margin-right: 6px; } + &.s24 { width: 24px; height: 24px; margin-right: 8px; } + &.s26 { width: 26px; height: 26px; margin-right: 8px; } + &.s32 { width: 32px; height: 32px; margin-right: 10px; } + &.s60 { width: 60px; height: 60px; margin-right: 12px; } + &.s90 { width: 90px; height: 90px; margin-right: 15px; } + &.s160 { width: 160px; height: 160px; margin-right: 20px; } +} diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss new file mode 100644 index 0000000..1cbd743 --- /dev/null +++ b/app/assets/stylesheets/generic/blocks.scss @@ -0,0 +1,4 @@ +.light-well { + background: #f9f9f9; + padding: 15px; +} diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss new file mode 100644 index 0000000..347da1a --- /dev/null +++ b/app/assets/stylesheets/generic/buttons.scss @@ -0,0 +1,158 @@ +.btn { + display: inline-block; + margin-bottom: 0; + font-weight: normal; + text-align: center; + vertical-align: middle; + cursor: pointer; + background-image: none; + border: 1px solid transparent; + white-space: nowrap; + padding: 6px 12px; + font-size: 13px; + line-height: 18px; + border-radius: 4px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; + color: #444444; + background-color: #fff; + border-color: #ccc; + text-shadow: none; + + &.hover, + &:hover { + color: #444444; + text-decoration: none; + background-color: #ebebeb; + border-color: #adadad; + } + + &.focus, + &:focus { + color: #444444; + text-decoration: none; + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + } + + &.active, + &:active { + outline: 0; + background-image: none; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + } + + &.disabled, + &[disabled] { + cursor: not-allowed; + pointer-events: none; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + box-shadow: none; + } + + &.btn-primary { + color: #ffffff; + background-color: #429bca; + border-color: #358ebd; + + &.hover, + &:hover, + &.disabled, + &[disabled] { + color: #ffffff; + background-color: #3286b1; + border-color: #286e8e; + } + } + + &.btn-success { + color: #ffffff; + background-color: #5cb85c; + border-color: #4cae4c; + + + &.hover, + &:hover, + &.disabled, + &[disabled] { + color: #ffffff; + background-color: #47a447; + border-color: #398439; + } + } + + &.btn-danger { + color: #ffffff; + background-color: #d9534f; + border-color: #d43f3a; + + + &.hover, + &:hover, + &.disabled, + &[disabled] { + color: #ffffff; + background-color: #d2322d; + border-color: #ac2925; + } + } + + &.btn-new { + @extend .btn-success; + } + + &.btn-create { + @extend .wide; + @extend .btn-success; + } + + &.btn-save { + @extend .wide; + @extend .btn-primary; + } + + &.btn-close, + &.btn-remove { + @extend .btn-danger; + } + + &.btn-cancel { + float: right; + } + + &.wide { + padding-left: 20px; + padding-right: 20px; + } + + &.btn-small { + padding: 2px 10px; + font-size: 12px; + } + + &.btn-tiny { + font-size: 11px; + padding: 2px 6px; + line-height: 16px; + margin: 2px; + } + + &.grouped { + margin-right: 7px; + float: left; + } + + &.btn-block { + width: 100%; + margin: 0; + padding: 6px 0; + margin-bottom: 15px; + } +} diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss new file mode 100644 index 0000000..f185bd7 --- /dev/null +++ b/app/assets/stylesheets/generic/common.scss @@ -0,0 +1,138 @@ +/** COLORS **/ +.cgray { color: gray } +.clgray { color: #BBB } +.cred { color: #D12F19 } +.cgreen { color: #4a2 } +.cblue { color: #29A } +.cblack { color: #111 } +.cdark { color: #444 } +.camber { color: #ffc000 } +.cwhite { color: #fff!important } +.bgred { background: #F2DEDE!important } + +/** COMMON CLASSES **/ +.left { float:left } + +.prepend-top-10 { margin-top:10px } +.prepend-top-20 { margin-top:20px } +.prepend-left-10 { margin-left:10px } +.prepend-left-20 { margin-left:20px } +.append-right-10 { margin-right:10px } +.append-right-20 { margin-right:20px } +.append-bottom-10 { margin-bottom:10px } +.append-bottom-15 { margin-bottom:15px } +.append-bottom-20 { margin-bottom:20px } +.inline { display: inline-block } + +.padded { padding:20px } +.ipadded { padding:20px!important } +.lborder { border-left:1px solid #eee } +.underlined_link { text-decoration: underline; } +.hint { font-style: italic; color: #999; } +.light { color: #888 } +.tiny { font-weight: normal } +.vtop { vertical-align: top !important; } + + +/** ALERT MESSAGES **/ +.alert.alert-disabled { + background: #EEE; + color: #777; + border-color: #DDD; +} + +/** HELPERS **/ +.nothing_here_message { + text-align: center; + padding: 20px; + color: #666; + font-weight: normal; + font-size: 16px; + line-height: 36px; +} + +.slead { + color: #666; + font-size: 14px; + margin-bottom: 12px; + font-weight: normal; + line-height: 24px; +} + + +.tab-content { + overflow: visible; +} + +@media (max-width: 1200px) { + .only-wide { + display: none; + } +} + +pre.well-pre { + border: 1px solid #EEE; + background: #f9f9f9; + border-radius: 0; + color: #555; +} + +.input-append .btn.active, .input-prepend .btn.active { + background: #CCC; + border-color: #BBB; + text-shadow: 0 1px 1px #fff; + font-weight: bold; + @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); +} + +.label { + padding: 2px 4px; + font-size: 12px; + font-style: normal; + font-weight: normal; + + &.label-gray { + background-color: #eee; + color: #999; + text-shadow: none; + } +} + +/** Big Labels **/ +.state-label { + font-size: 14px; + padding: 6px 25px; + text-align: center; + @include border-radius(4px); + text-shadow: none; + margin-left: 10px; + + &.state-label-green { + background: #4A4; + color: #FFF; + } + + &.state-label-red { + background: #DA4E49; + color: #FFF; + } +} + +.dropdown-menu > li > a { + text-shadow: none; +} + +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus { + background: #29b; +} + +.gl-hide { + display: none; +} + +.breadcrumb > li + li:before { + content: "/"; + padding: 0; + color: #666; +} diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss new file mode 100644 index 0000000..6607ae3 --- /dev/null +++ b/app/assets/stylesheets/generic/files.scss @@ -0,0 +1,218 @@ +/** + * File content holder + * + */ +.file-holder { + border: 1px solid #CCC; + margin-bottom: 1em; + + table { + @extend .table; + } + + .file-title { + background: #DDD; + border-bottom: 1px solid #CCC; + text-shadow: 0 1px 1px #fff; + margin: 0; + font-weight: normal; + font-weight: bold; + text-align: left; + color: $style_color; + padding: 9px 10px; + + .options { + float: right; + margin-top: -5px; + } + + .file_name { + color: $style_color; + font-size: 14px; + text-shadow: 0 1px 1px #fff; + small { + color: #999; + font-size: 13px; + } + } + } + .file-content { + background: #fff; + font-size: 11px; + + &.image_file { + background: #eee; + text-align: center; + img { + padding: 100px; + max-width: 300px; + } + } + + &.wiki { + padding: 20px; + font-size: 14px; + line-height: 1.6; + + .highlight { + margin-bottom: 9px; + @include border-radius(4px); + + > pre { + margin: 0; + } + } + } + + &.blob_file { + + } + + &.blob-no-preview { + background: #eee; + text-shadow: 0 1px 2px #FFF; + padding: 100px 0; + } + + /** + * Blame file + */ + &.blame { + table { + border: none; + box-shadow: none; + margin: 0; + } + tr { + border-bottom: 1px solid #eee; + } + td { + &:first-child { + border-left: none; + } + &:last-child { + border-right: none; + } + background: #fff; + padding: 5px; + } + .author, + .blame_commit { + background: #f5f5f5; + vertical-align: top; + } + .lines { + pre { + padding: 0; + margin: 0; + background: none; + border: none; + } + } + } + + &.logs { + background: #eee; + max-height: 700px; + overflow-y: auto; + + ol { + margin-left: 40px; + padding: 10px 0; + border-left: 1px solid #CCC; + margin-bottom: 0; + background: white; + li { + color: #888; + p { + margin: 0; + color: #333; + line-height: 24px; + padding-left: 10px; + } + + &:hover { + background: $hover; + } + } + } + } + + /** + * Code file + */ + &.code { + padding: 0; + + table.lines { + border: none; + box-shadow: none; + margin: 0px; + padding: 0px; + table-layout: fixed; + + pre { + border: none; + border-radius: 0; + font-family: $monospace_font; + font-size: 12px !important; + line-height: 16px !important; + margin: 0; + padding: 10px 0; + } + td { + border: none; + margin: 0; + padding: 0; + vertical-align: top; + + &:first-child { + background: #eee; + width: 50px; + } + &:last-child { + } + } + tr:hover { + background: none; + } + + pre.line_numbers { + color: #666; + padding: 10px 6px 10px 0; + text-align: right; + background: #EEE; + + a { + color: #666; + + i { + display: none; + font-size: 14px; + line-height: 14px; + } + &:hover i { + display: inherit; + } + } + } + + .highlight { + border-left: 1px solid #DEE2E3; + overflow: auto; + overflow-y: hidden; + + pre { + white-space: pre; + word-wrap: normal; + + .line { + padding: 0 10px; + } + } + } + } + } + } +} + diff --git a/app/assets/stylesheets/generic/fonts.scss b/app/assets/stylesheets/generic/fonts.scss new file mode 100644 index 0000000..8cc9986 --- /dev/null +++ b/app/assets/stylesheets/generic/fonts.scss @@ -0,0 +1,2 @@ +/** Typo **/ +$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss new file mode 100644 index 0000000..0cc14e4 --- /dev/null +++ b/app/assets/stylesheets/generic/forms.scss @@ -0,0 +1,35 @@ +input[type='search'].search-text-input { + background-image: url("icon-search.png"); + background-repeat: no-repeat; + background-position: 10px; + padding-left: 25px; +} + +input[type='text'].danger { + background: #F2DEDE!important; + border-color: #D66; + text-shadow: 0 1px 1px #fff +} + +fieldset legend { + font-size: 16px; +} + +.datetime-controls { + select { + width: 100px; + } +} + +.form-actions { + padding: 17px 20px 18px; + margin-top: 18px; + margin-bottom: 18px; + background-color: whitesmoke; + border-top: 1px solid #e5e5e5; + padding-left: 17%; +} + +label.control-label { + @extend .col-sm-2; +} diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss new file mode 100644 index 0000000..6330523 --- /dev/null +++ b/app/assets/stylesheets/generic/issue_box.scss @@ -0,0 +1,46 @@ +/** + * Issue box: + * Huge block (one per page) for storing title, descripion and other information. + * Used for Issue#show page, MergeRequest#show page etc + * + * CLasses: + * .issue-box - Regular box + */ + +.issue-box { + color: #666; + margin:20px 0; + background: #FAFAFA; + border: 1px solid #DDD; + + .control-group { + margin-bottom: 0; + } + + .title { + font-size: 20px; + font-weight: 500; + line-height: 28px; + margin: 0; + color: #444; + } + + .context { + border: none; + background-color: #f5f5f5; + border: none; + border-top: 1px solid #eee; + } + + .description { + border-top: 1px solid #eee; + } + + .title, .context, .description { + padding: 15px; + + .clearfix { + margin: 0; + } + } +} diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss new file mode 100644 index 0000000..245cccf --- /dev/null +++ b/app/assets/stylesheets/generic/lists.scss @@ -0,0 +1,97 @@ +/** + * Well styled list + * + */ +.well-list { + margin: 0; + padding: 0; + list-style: none; + + li { + padding: 10px; + min-height: 20px; + border-bottom: 1px solid #eee; + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + + &.disabled { + color: #888; + } + + &.unstyled { + &:hover { + background: none; + } + } + + &.smoke { background-color: #f5f5f5; } + + &:hover { + background: $hover; + border-bottom: 1px solid #ADF; + } + + &:last-child { + border-bottom: none; + + &.bottom { + background: #f5f5f5; + } + } + + .author { color: #999; } + + p { + padding-top: 1px; + margin: 0; + color: #222; + img { + position: relative; + top: 3px; + } + } + + .well-title { + font-size: 14px; + line-height: 18px; + } + } +} + +ol, ul { + &.styled { + li { + padding: 2px; + } + } +} + +/** light list with border-bottom between li **/ +ul.bordered-list { + margin: 5px 0px; + padding: 0px; + li { + padding: 5px 0; + border-bottom: 1px solid #EEE; + overflow: hidden; + display: block; + margin: 0px; + &:last-child { border:none } + &.active { + background: #f9f9f9; + a { font-weight: bold; } + } + + &.light { + a { color: #777; } + } + } + + &.top-list { + li:first-child { + padding-top: 0; + h4, h5 { + margin-top: 0; + } + } + } +} diff --git a/app/assets/stylesheets/generic/mixins.scss b/app/assets/stylesheets/generic/mixins.scss new file mode 100644 index 0000000..e637b64 --- /dev/null +++ b/app/assets/stylesheets/generic/mixins.scss @@ -0,0 +1,148 @@ +/** + * Generic mixins + */ + @mixin box-shadow($shadow) { + -webkit-box-shadow: $shadow; + -moz-box-shadow: $shadow; + -ms-box-shadow: $shadow; + -o-box-shadow: $shadow; + box-shadow: $shadow; +} + +@mixin border-radius($radius) { + -webkit-border-radius: $radius; + -moz-border-radius: $radius; + -ms-border-radius: $radius; + -o-border-radius: $radius; + border-radius: $radius; +} + +@mixin border-radius-left($radius) { + @include border-radius($radius 0 0 $radius) +} + +@mixin linear-gradient($from, $to) { + background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); + background-image: -webkit-linear-gradient($from, $to); + background-image: -moz-linear-gradient($from, $to); + background-image: -ms-linear-gradient($from, $to); + background-image: -o-linear-gradient($from, $to); +} + +@mixin transition($transition) { + -webkit-transition: $transition; + -moz-transition: $transition; + -ms-transition: $transition; + -o-transition: $transition; + transition: $transition; +} + +/** + * Prefilled mixins + * Mixins with fixed values + */ +@mixin bg-light-gray-gradient { + background: #f1f1f1; + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); + background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); + background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); + background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1); + background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1); +} + +@mixin bg-gray-gradient { + background: #eee; + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); + background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); + background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); + background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf); + background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); +} + +@mixin bg-dark-gray-gradient { + background: #eee; + background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); + background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); + background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7); + background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); +} + +@mixin shade { + @include box-shadow(0 0 3px #ddd); +} + +@mixin solid-shade { + @include box-shadow(0 0 0 3px #f1f1f1); +} + +@mixin header-font { + color: $style_color; + text-shadow: 0 1px 1px #FFF; + font-size: 16px; + line-height: 44px; + font-weight: normal; +} + +@mixin md-typography { + img { + max-width: 100%; + } + + *:first-child { + margin-top: 0; + } + + code { padding: 0 4px; } + + h1 { + margin-top: 45px; + font-size: 2.5em; + } + + h2 { + margin-top: 40px; + font-size: 2em; + } + + h3 { + margin-top: 35px; + font-size: 2em; + } + + h4 { + margin-top: 30px; + font-size: 1.5em; + } + + blockquote p { + color: #888; + font-size: 14px; + line-height: 1.5; + } + + table { + @extend .table; + @extend .table-bordered; + th { + background: #EEE; + } + } + + code { + font-size: inherit; + font-weight: inherit; + color: #555; + } + + li { + line-height: 1.5; + } +} + +@mixin page-title { + color: #333; + font-size: 20px; + line-height: 1.5; + margin-top: 0px; + margin-bottom: 15px; +} diff --git a/app/assets/stylesheets/generic/nav.scss b/app/assets/stylesheets/generic/nav.scss new file mode 100644 index 0000000..cc2bf0f --- /dev/null +++ b/app/assets/stylesheets/generic/nav.scss @@ -0,0 +1,91 @@ +/** + * nav-pills + * + */ +.nav-pills { + .active a { + background: $primary_color; + } + + > li > a { + @include border-radius(0); + } + + &.nav-stacked { + > li > a { + border-left: 4px solid #EEE; + padding: 12px; + color: #777; + } + > .active > a { + border-color: $primary_color; + background: none; + color: #333; + font-weight: bolder; + } + + &.nav-stacked-menu { + li > a { + padding: 16px; + } + } + } + + &.nav-pills-small { + > li > a { + padding: 8px 12px; + font-size: 12px; + } + } +} + +.nav-pills > .active > a > i[class^="icon-"] { background: inherit; } + + + +/** + * nav-tabs + * + */ +.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } +.nav.nav-tabs { + li { + > a { + padding: 8px 20px; + margin-right: 7px; + line-height: 20px; + border-color: #EEE; + color: #888; + border-bottom: 1px solid #ddd; + .badge { + background-color: #eee; + color: #888; + text-shadow: 0 1px 1px #fff; + } + i[class^="icon-"] { + line-height: 14px; + } + } + &.active { + > a { + border-color: #CCC; + border-bottom: 1px solid #fff; + color: #333; + font-weight: bold; + } + } + } + + &.nav-small-tabs > li > a { padding: 6px 9px; } +} + + + +/** + * fix to keep tooltips position in top navigation bar + * + */ +.navbar .nav > li { + position: relative; + white-space: nowrap; +} diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss new file mode 100644 index 0000000..4490566 --- /dev/null +++ b/app/assets/stylesheets/generic/typography.scss @@ -0,0 +1,104 @@ +/** + * Headers + * + */ +h1.page-title { + @include page-title; + font-size: 28px; +} + +h2.page-title { + @include page-title; + font-size: 24px; +} + +h3.page-title { + @include page-title; +} + +h6 { + color: #888; + text-transform: uppercase; +} + +/** CODE **/ +pre { + font-family: $monospace_font; + + &.dark { + background: #333; + color: #f5f5f5; + } +} + +/** + * Links + * + */ +a { + outline: none; + color: $link_color; + &:hover { + text-decoration: none; + color: $primary_color; + } + + &:focus { + text-decoration: underline; + } + + &.dark { + color: $style_color; + } + + &.lined { + text-decoration: underline; + &:hover { text-decoration: underline; } + } + + &.gray { + color: gray; + } + + &.supp_diff_link { + text-align: center; + padding: 20px 0; + background: #f1f1f1; + width: 100%; + float: left; + } + + &.neib { + margin-right: 15px; + } +} + +a:focus { + outline: none; +} + +.monospace { + font-family: $monospace_font; +} + +/** + * Wiki typography + * + */ +.wiki { + @include md-typography; + + font-size: 14px; + line-height: 1.6; + .white .highlight pre { + background: #f5f5f5; + } + ul { + padding: 0; + margin: 0 0 9px 25px !important; + } +} + +.md { + @include md-typography; +} diff --git a/app/assets/stylesheets/generic/ui_box.scss b/app/assets/stylesheets/generic/ui_box.scss new file mode 100644 index 0000000..e25d334 --- /dev/null +++ b/app/assets/stylesheets/generic/ui_box.scss @@ -0,0 +1,172 @@ +/** + * UI box: + * Block element for separating information on page. + * Used for storing issues lists, grouped data. + * You can have multiple ui boxes on one page + * + * Classes: + * .ui-box - for any block & widgets + * .ui-box.ui-box-small - same but with smaller title + * .ui-box.ui-box-danger - with red title + * + * Ex. 1: List + * .ui-box + * .title + * # title here + * %ul + * # content here + * + * Ex. 2: Block data + * .ui-box + * .title + * # title here + * .body + * # content here + * + */ + +.ui-box { + background: #FFF; + margin-bottom: 20px; + border: 1px solid #DDD; + word-wrap: break-word; + + img { + max-width: 100%; + } + + pre { + code { + background: none !important; + } + } + + ul { + margin: 0; + padding: 0; + } + + .title { + background-color: #EEE; + border-bottom: 1px solid #DDD; + color: #666; + font-size: 16px; + text-shadow: 0 1px 1px #fff; + padding: 0 10px; + font-size: 14px; + line-height: 40px; + font-weight: normal; + margin: 0; + + > a { + text-shadow: 0 1px 1px #fff; + } + + form { + margin-bottom: 0; + margin-top: 0; + } + + .btn { + vertical-align: middle; + padding: 4px 12px; + @include box-shadow(0 0px 1px 1px #f2f2f2); + } + + .nav-pills { + > li { + > a { + padding: 13px; + margin: 0; + font-size: 13px; + } + &.active { + > a { + background: #D5D5D5; + color: $style_color; + @include border-radius(0); + border-radius: 0; + border-left: 1px solid #CCC; + border-right: 1px solid #CCC; + } + } + } + } + } + + .body { + padding: 10px; + } + + &.padded { + h5, .title { + margin: -20px; + margin-bottom: 0; + padding: 5px 20px; + } + } + + .row_title { + font-weight: 500; + color: #444; + &:hover { + color: #444; + text-decoration: underline; + } + } + + .form-holder { + padding-top: 20px; + form { + margin-bottom: 0; + legend { + text-indent: 10px; + } + .form-actions { + margin-bottom: 0; + } + } + } +} + +/* + * Small box + */ +.ui-box.ui-box-small { + margin-bottom: 10px; + + .title { + font-size: 13px; + line-height: 30px; + + a { + color: #666; + &:hover { + text-decoration: underline; + } + } + } +} + +/* + * Danger box + */ +.ui-box.ui-box-danger { + background: #f7f7f7; + border: none; + + .title { + background: #D65; + color: #fff; + text-shadow: 0 1px 1px #900; + } +} + +/* + * Block under tw-bootstrap tabs + */ +.tab-pane { + .ui-box { + margin: 3px 3px 25px 3px; + } +} diff --git a/app/assets/stylesheets/generic/variables.scss b/app/assets/stylesheets/generic/variables.scss new file mode 100644 index 0000000..aeabe7a --- /dev/null +++ b/app/assets/stylesheets/generic/variables.scss @@ -0,0 +1,13 @@ +/** + * General Colors + */ +$primary_color: #2FA0BB; +$link_color: #3A89A3; +$style_color: #474D57; +$hover: #D9EDF7; + +/** + * Commit Diff Colors + */ +$added: #63c363; +$deleted: #f77; diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss deleted file mode 100644 index c851dd9..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ /dev/null @@ -1,68 +0,0 @@ -/** Override bootstrap variables **/ -$font-size-base: 13px !default; - -@import 'bootstrap'; -/** - * BOOTSTRAP - */ -/*@import "bootstrap/variables";*/ -/*@import "bootstrap/mixins";*/ -/*@import "bootstrap/reset";*/ -/*@import "bootstrap/scaffolding";*/ -/*@import "bootstrap/grid";*/ -/*@import "bootstrap/layouts";*/ -/*@import "bootstrap/type";*/ -/*@import "bootstrap/code";*/ -/*@import "bootstrap/forms";*/ -/*@import "bootstrap/tables";*/ -/*@import "bootstrap/sprites";*/ -/*@import "bootstrap/dropdowns";*/ -/*@import "bootstrap/wells";*/ -/*@import "bootstrap/component-animations";*/ -/*@import "bootstrap/close";*/ -/*@import "bootstrap/button-groups";*/ -/*@import "bootstrap/alerts";*/ -/*@import "bootstrap/navs";*/ -/*@import "bootstrap/navbar";*/ -/*@import "bootstrap/breadcrumbs";*/ -/*@import "bootstrap/pagination";*/ -/*@import "bootstrap/pager";*/ -/*@import "bootstrap/modals";*/ -/*@import "bootstrap/tooltip";*/ -/*@import "bootstrap/popovers";*/ -/*@import "bootstrap/thumbnails";*/ -/*@import "bootstrap/media";*/ -/*@import "bootstrap/labels-badges";*/ -/*@import "bootstrap/progress-bars";*/ -/*@import "bootstrap/accordion";*/ -/*@import "bootstrap/carousel";*/ -/*@import "bootstrap/hero-unit";*/ -/*@import "bootstrap/utilities";*/ -/*@import "bootstrap/responsive-utilities";*/ -/*@import "bootstrap/responsive-1200px-min";*/ - -/** - * Font icons - * - */ -@import "font-awesome"; - -/** - * GitLab bootstrap. - * Overrides some styles of twitter bootstrap. - * Also give some common classes for GitLab app - */ -@import "gitlab_bootstrap/variables.scss"; -@import "gitlab_bootstrap/fonts.scss"; -@import "gitlab_bootstrap/mixins.scss"; -@import "gitlab_bootstrap/avatar.scss"; -@import "gitlab_bootstrap/nav.scss"; -@import "gitlab_bootstrap/common.scss"; -@import "gitlab_bootstrap/typography.scss"; -@import "gitlab_bootstrap/buttons.scss"; -@import "gitlab_bootstrap/blocks.scss"; -@import "gitlab_bootstrap/ui_box.scss"; -@import "gitlab_bootstrap/issue_box.scss"; -@import "gitlab_bootstrap/files.scss"; -@import "gitlab_bootstrap/lists.scss"; -@import "gitlab_bootstrap/forms.scss"; diff --git a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss deleted file mode 100644 index 4f038b9..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss +++ /dev/null @@ -1,23 +0,0 @@ -.avatar { - float: left; - margin-right: 12px; - width: 40px; - padding: 1px; - @include border-radius(4px); - - &.avatar-inline { - float: none; - margin-left: 3px; - - &.s16 { margin-right: 2px; } - &.s24 { margin-right: 2px; } - } - - &.s16 { width: 16px; height: 16px; margin-right: 6px; } - &.s24 { width: 24px; height: 24px; margin-right: 8px; } - &.s26 { width: 26px; height: 26px; margin-right: 8px; } - &.s32 { width: 32px; height: 32px; margin-right: 10px; } - &.s60 { width: 60px; height: 60px; margin-right: 12px; } - &.s90 { width: 90px; height: 90px; margin-right: 15px; } - &.s160 { width: 160px; height: 160px; margin-right: 20px; } -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss deleted file mode 100644 index 1cbd743..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ /dev/null @@ -1,4 +0,0 @@ -.light-well { - background: #f9f9f9; - padding: 15px; -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss deleted file mode 100644 index 347da1a..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ /dev/null @@ -1,158 +0,0 @@ -.btn { - display: inline-block; - margin-bottom: 0; - font-weight: normal; - text-align: center; - vertical-align: middle; - cursor: pointer; - background-image: none; - border: 1px solid transparent; - white-space: nowrap; - padding: 6px 12px; - font-size: 13px; - line-height: 18px; - border-radius: 4px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none; - color: #444444; - background-color: #fff; - border-color: #ccc; - text-shadow: none; - - &.hover, - &:hover { - color: #444444; - text-decoration: none; - background-color: #ebebeb; - border-color: #adadad; - } - - &.focus, - &:focus { - color: #444444; - text-decoration: none; - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - } - - &.active, - &:active { - outline: 0; - background-image: none; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - } - - &.disabled, - &[disabled] { - cursor: not-allowed; - pointer-events: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - box-shadow: none; - } - - &.btn-primary { - color: #ffffff; - background-color: #429bca; - border-color: #358ebd; - - &.hover, - &:hover, - &.disabled, - &[disabled] { - color: #ffffff; - background-color: #3286b1; - border-color: #286e8e; - } - } - - &.btn-success { - color: #ffffff; - background-color: #5cb85c; - border-color: #4cae4c; - - - &.hover, - &:hover, - &.disabled, - &[disabled] { - color: #ffffff; - background-color: #47a447; - border-color: #398439; - } - } - - &.btn-danger { - color: #ffffff; - background-color: #d9534f; - border-color: #d43f3a; - - - &.hover, - &:hover, - &.disabled, - &[disabled] { - color: #ffffff; - background-color: #d2322d; - border-color: #ac2925; - } - } - - &.btn-new { - @extend .btn-success; - } - - &.btn-create { - @extend .wide; - @extend .btn-success; - } - - &.btn-save { - @extend .wide; - @extend .btn-primary; - } - - &.btn-close, - &.btn-remove { - @extend .btn-danger; - } - - &.btn-cancel { - float: right; - } - - &.wide { - padding-left: 20px; - padding-right: 20px; - } - - &.btn-small { - padding: 2px 10px; - font-size: 12px; - } - - &.btn-tiny { - font-size: 11px; - padding: 2px 6px; - line-height: 16px; - margin: 2px; - } - - &.grouped { - margin-right: 7px; - float: left; - } - - &.btn-block { - width: 100%; - margin: 0; - padding: 6px 0; - margin-bottom: 15px; - } -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss deleted file mode 100644 index f185bd7..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ /dev/null @@ -1,138 +0,0 @@ -/** COLORS **/ -.cgray { color: gray } -.clgray { color: #BBB } -.cred { color: #D12F19 } -.cgreen { color: #4a2 } -.cblue { color: #29A } -.cblack { color: #111 } -.cdark { color: #444 } -.camber { color: #ffc000 } -.cwhite { color: #fff!important } -.bgred { background: #F2DEDE!important } - -/** COMMON CLASSES **/ -.left { float:left } - -.prepend-top-10 { margin-top:10px } -.prepend-top-20 { margin-top:20px } -.prepend-left-10 { margin-left:10px } -.prepend-left-20 { margin-left:20px } -.append-right-10 { margin-right:10px } -.append-right-20 { margin-right:20px } -.append-bottom-10 { margin-bottom:10px } -.append-bottom-15 { margin-bottom:15px } -.append-bottom-20 { margin-bottom:20px } -.inline { display: inline-block } - -.padded { padding:20px } -.ipadded { padding:20px!important } -.lborder { border-left:1px solid #eee } -.underlined_link { text-decoration: underline; } -.hint { font-style: italic; color: #999; } -.light { color: #888 } -.tiny { font-weight: normal } -.vtop { vertical-align: top !important; } - - -/** ALERT MESSAGES **/ -.alert.alert-disabled { - background: #EEE; - color: #777; - border-color: #DDD; -} - -/** HELPERS **/ -.nothing_here_message { - text-align: center; - padding: 20px; - color: #666; - font-weight: normal; - font-size: 16px; - line-height: 36px; -} - -.slead { - color: #666; - font-size: 14px; - margin-bottom: 12px; - font-weight: normal; - line-height: 24px; -} - - -.tab-content { - overflow: visible; -} - -@media (max-width: 1200px) { - .only-wide { - display: none; - } -} - -pre.well-pre { - border: 1px solid #EEE; - background: #f9f9f9; - border-radius: 0; - color: #555; -} - -.input-append .btn.active, .input-prepend .btn.active { - background: #CCC; - border-color: #BBB; - text-shadow: 0 1px 1px #fff; - font-weight: bold; - @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); -} - -.label { - padding: 2px 4px; - font-size: 12px; - font-style: normal; - font-weight: normal; - - &.label-gray { - background-color: #eee; - color: #999; - text-shadow: none; - } -} - -/** Big Labels **/ -.state-label { - font-size: 14px; - padding: 6px 25px; - text-align: center; - @include border-radius(4px); - text-shadow: none; - margin-left: 10px; - - &.state-label-green { - background: #4A4; - color: #FFF; - } - - &.state-label-red { - background: #DA4E49; - color: #FFF; - } -} - -.dropdown-menu > li > a { - text-shadow: none; -} - -.dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus { - background: #29b; -} - -.gl-hide { - display: none; -} - -.breadcrumb > li + li:before { - content: "/"; - padding: 0; - color: #666; -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss deleted file mode 100644 index 6607ae3..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ /dev/null @@ -1,218 +0,0 @@ -/** - * File content holder - * - */ -.file-holder { - border: 1px solid #CCC; - margin-bottom: 1em; - - table { - @extend .table; - } - - .file-title { - background: #DDD; - border-bottom: 1px solid #CCC; - text-shadow: 0 1px 1px #fff; - margin: 0; - font-weight: normal; - font-weight: bold; - text-align: left; - color: $style_color; - padding: 9px 10px; - - .options { - float: right; - margin-top: -5px; - } - - .file_name { - color: $style_color; - font-size: 14px; - text-shadow: 0 1px 1px #fff; - small { - color: #999; - font-size: 13px; - } - } - } - .file-content { - background: #fff; - font-size: 11px; - - &.image_file { - background: #eee; - text-align: center; - img { - padding: 100px; - max-width: 300px; - } - } - - &.wiki { - padding: 20px; - font-size: 14px; - line-height: 1.6; - - .highlight { - margin-bottom: 9px; - @include border-radius(4px); - - > pre { - margin: 0; - } - } - } - - &.blob_file { - - } - - &.blob-no-preview { - background: #eee; - text-shadow: 0 1px 2px #FFF; - padding: 100px 0; - } - - /** - * Blame file - */ - &.blame { - table { - border: none; - box-shadow: none; - margin: 0; - } - tr { - border-bottom: 1px solid #eee; - } - td { - &:first-child { - border-left: none; - } - &:last-child { - border-right: none; - } - background: #fff; - padding: 5px; - } - .author, - .blame_commit { - background: #f5f5f5; - vertical-align: top; - } - .lines { - pre { - padding: 0; - margin: 0; - background: none; - border: none; - } - } - } - - &.logs { - background: #eee; - max-height: 700px; - overflow-y: auto; - - ol { - margin-left: 40px; - padding: 10px 0; - border-left: 1px solid #CCC; - margin-bottom: 0; - background: white; - li { - color: #888; - p { - margin: 0; - color: #333; - line-height: 24px; - padding-left: 10px; - } - - &:hover { - background: $hover; - } - } - } - } - - /** - * Code file - */ - &.code { - padding: 0; - - table.lines { - border: none; - box-shadow: none; - margin: 0px; - padding: 0px; - table-layout: fixed; - - pre { - border: none; - border-radius: 0; - font-family: $monospace_font; - font-size: 12px !important; - line-height: 16px !important; - margin: 0; - padding: 10px 0; - } - td { - border: none; - margin: 0; - padding: 0; - vertical-align: top; - - &:first-child { - background: #eee; - width: 50px; - } - &:last-child { - } - } - tr:hover { - background: none; - } - - pre.line_numbers { - color: #666; - padding: 10px 6px 10px 0; - text-align: right; - background: #EEE; - - a { - color: #666; - - i { - display: none; - font-size: 14px; - line-height: 14px; - } - &:hover i { - display: inherit; - } - } - } - - .highlight { - border-left: 1px solid #DEE2E3; - overflow: auto; - overflow-y: hidden; - - pre { - white-space: pre; - word-wrap: normal; - - .line { - padding: 0 10px; - } - } - } - } - } - } -} - diff --git a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss deleted file mode 100644 index 8cc9986..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss +++ /dev/null @@ -1,2 +0,0 @@ -/** Typo **/ -$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; diff --git a/app/assets/stylesheets/gitlab_bootstrap/forms.scss b/app/assets/stylesheets/gitlab_bootstrap/forms.scss deleted file mode 100644 index 0cc14e4..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/forms.scss +++ /dev/null @@ -1,35 +0,0 @@ -input[type='search'].search-text-input { - background-image: url("icon-search.png"); - background-repeat: no-repeat; - background-position: 10px; - padding-left: 25px; -} - -input[type='text'].danger { - background: #F2DEDE!important; - border-color: #D66; - text-shadow: 0 1px 1px #fff -} - -fieldset legend { - font-size: 16px; -} - -.datetime-controls { - select { - width: 100px; - } -} - -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: whitesmoke; - border-top: 1px solid #e5e5e5; - padding-left: 17%; -} - -label.control-label { - @extend .col-sm-2; -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/issue_box.scss b/app/assets/stylesheets/gitlab_bootstrap/issue_box.scss deleted file mode 100644 index 6330523..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/issue_box.scss +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Issue box: - * Huge block (one per page) for storing title, descripion and other information. - * Used for Issue#show page, MergeRequest#show page etc - * - * CLasses: - * .issue-box - Regular box - */ - -.issue-box { - color: #666; - margin:20px 0; - background: #FAFAFA; - border: 1px solid #DDD; - - .control-group { - margin-bottom: 0; - } - - .title { - font-size: 20px; - font-weight: 500; - line-height: 28px; - margin: 0; - color: #444; - } - - .context { - border: none; - background-color: #f5f5f5; - border: none; - border-top: 1px solid #eee; - } - - .description { - border-top: 1px solid #eee; - } - - .title, .context, .description { - padding: 15px; - - .clearfix { - margin: 0; - } - } -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss deleted file mode 100644 index 245cccf..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Well styled list - * - */ -.well-list { - margin: 0; - padding: 0; - list-style: none; - - li { - padding: 10px; - min-height: 20px; - border-bottom: 1px solid #eee; - border-bottom: 1px solid rgba(0, 0, 0, 0.05); - - &.disabled { - color: #888; - } - - &.unstyled { - &:hover { - background: none; - } - } - - &.smoke { background-color: #f5f5f5; } - - &:hover { - background: $hover; - border-bottom: 1px solid #ADF; - } - - &:last-child { - border-bottom: none; - - &.bottom { - background: #f5f5f5; - } - } - - .author { color: #999; } - - p { - padding-top: 1px; - margin: 0; - color: #222; - img { - position: relative; - top: 3px; - } - } - - .well-title { - font-size: 14px; - line-height: 18px; - } - } -} - -ol, ul { - &.styled { - li { - padding: 2px; - } - } -} - -/** light list with border-bottom between li **/ -ul.bordered-list { - margin: 5px 0px; - padding: 0px; - li { - padding: 5px 0; - border-bottom: 1px solid #EEE; - overflow: hidden; - display: block; - margin: 0px; - &:last-child { border:none } - &.active { - background: #f9f9f9; - a { font-weight: bold; } - } - - &.light { - a { color: #777; } - } - } - - &.top-list { - li:first-child { - padding-top: 0; - h4, h5 { - margin-top: 0; - } - } - } -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss deleted file mode 100644 index e637b64..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss +++ /dev/null @@ -1,148 +0,0 @@ -/** - * Generic mixins - */ - @mixin box-shadow($shadow) { - -webkit-box-shadow: $shadow; - -moz-box-shadow: $shadow; - -ms-box-shadow: $shadow; - -o-box-shadow: $shadow; - box-shadow: $shadow; -} - -@mixin border-radius($radius) { - -webkit-border-radius: $radius; - -moz-border-radius: $radius; - -ms-border-radius: $radius; - -o-border-radius: $radius; - border-radius: $radius; -} - -@mixin border-radius-left($radius) { - @include border-radius($radius 0 0 $radius) -} - -@mixin linear-gradient($from, $to) { - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); - background-image: -webkit-linear-gradient($from, $to); - background-image: -moz-linear-gradient($from, $to); - background-image: -ms-linear-gradient($from, $to); - background-image: -o-linear-gradient($from, $to); -} - -@mixin transition($transition) { - -webkit-transition: $transition; - -moz-transition: $transition; - -ms-transition: $transition; - -o-transition: $transition; - transition: $transition; -} - -/** - * Prefilled mixins - * Mixins with fixed values - */ -@mixin bg-light-gray-gradient { - background: #f1f1f1; - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); - background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); - background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); - background-image: -ms-linear-gradient(#f5f5f5 6.6%, #e1e1e1); - background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1); -} - -@mixin bg-gray-gradient { - background: #eee; - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); -} - -@mixin bg-dark-gray-gradient { - background: #eee; - background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); - background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); - background-image: -ms-linear-gradient(#e9e9e9, #d7d7d7); - background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); -} - -@mixin shade { - @include box-shadow(0 0 3px #ddd); -} - -@mixin solid-shade { - @include box-shadow(0 0 0 3px #f1f1f1); -} - -@mixin header-font { - color: $style_color; - text-shadow: 0 1px 1px #FFF; - font-size: 16px; - line-height: 44px; - font-weight: normal; -} - -@mixin md-typography { - img { - max-width: 100%; - } - - *:first-child { - margin-top: 0; - } - - code { padding: 0 4px; } - - h1 { - margin-top: 45px; - font-size: 2.5em; - } - - h2 { - margin-top: 40px; - font-size: 2em; - } - - h3 { - margin-top: 35px; - font-size: 2em; - } - - h4 { - margin-top: 30px; - font-size: 1.5em; - } - - blockquote p { - color: #888; - font-size: 14px; - line-height: 1.5; - } - - table { - @extend .table; - @extend .table-bordered; - th { - background: #EEE; - } - } - - code { - font-size: inherit; - font-weight: inherit; - color: #555; - } - - li { - line-height: 1.5; - } -} - -@mixin page-title { - color: #333; - font-size: 20px; - line-height: 1.5; - margin-top: 0px; - margin-bottom: 15px; -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/nav.scss b/app/assets/stylesheets/gitlab_bootstrap/nav.scss deleted file mode 100644 index cc2bf0f..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/nav.scss +++ /dev/null @@ -1,91 +0,0 @@ -/** - * nav-pills - * - */ -.nav-pills { - .active a { - background: $primary_color; - } - - > li > a { - @include border-radius(0); - } - - &.nav-stacked { - > li > a { - border-left: 4px solid #EEE; - padding: 12px; - color: #777; - } - > .active > a { - border-color: $primary_color; - background: none; - color: #333; - font-weight: bolder; - } - - &.nav-stacked-menu { - li > a { - padding: 16px; - } - } - } - - &.nav-pills-small { - > li > a { - padding: 8px 12px; - font-size: 12px; - } - } -} - -.nav-pills > .active > a > i[class^="icon-"] { background: inherit; } - - - -/** - * nav-tabs - * - */ -.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } -.nav.nav-tabs { - li { - > a { - padding: 8px 20px; - margin-right: 7px; - line-height: 20px; - border-color: #EEE; - color: #888; - border-bottom: 1px solid #ddd; - .badge { - background-color: #eee; - color: #888; - text-shadow: 0 1px 1px #fff; - } - i[class^="icon-"] { - line-height: 14px; - } - } - &.active { - > a { - border-color: #CCC; - border-bottom: 1px solid #fff; - color: #333; - font-weight: bold; - } - } - } - - &.nav-small-tabs > li > a { padding: 6px 9px; } -} - - - -/** - * fix to keep tooltips position in top navigation bar - * - */ -.navbar .nav > li { - position: relative; - white-space: nowrap; -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss deleted file mode 100644 index 4490566..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Headers - * - */ -h1.page-title { - @include page-title; - font-size: 28px; -} - -h2.page-title { - @include page-title; - font-size: 24px; -} - -h3.page-title { - @include page-title; -} - -h6 { - color: #888; - text-transform: uppercase; -} - -/** CODE **/ -pre { - font-family: $monospace_font; - - &.dark { - background: #333; - color: #f5f5f5; - } -} - -/** - * Links - * - */ -a { - outline: none; - color: $link_color; - &:hover { - text-decoration: none; - color: $primary_color; - } - - &:focus { - text-decoration: underline; - } - - &.dark { - color: $style_color; - } - - &.lined { - text-decoration: underline; - &:hover { text-decoration: underline; } - } - - &.gray { - color: gray; - } - - &.supp_diff_link { - text-align: center; - padding: 20px 0; - background: #f1f1f1; - width: 100%; - float: left; - } - - &.neib { - margin-right: 15px; - } -} - -a:focus { - outline: none; -} - -.monospace { - font-family: $monospace_font; -} - -/** - * Wiki typography - * - */ -.wiki { - @include md-typography; - - font-size: 14px; - line-height: 1.6; - .white .highlight pre { - background: #f5f5f5; - } - ul { - padding: 0; - margin: 0 0 9px 25px !important; - } -} - -.md { - @include md-typography; -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss b/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss deleted file mode 100644 index e25d334..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss +++ /dev/null @@ -1,172 +0,0 @@ -/** - * UI box: - * Block element for separating information on page. - * Used for storing issues lists, grouped data. - * You can have multiple ui boxes on one page - * - * Classes: - * .ui-box - for any block & widgets - * .ui-box.ui-box-small - same but with smaller title - * .ui-box.ui-box-danger - with red title - * - * Ex. 1: List - * .ui-box - * .title - * # title here - * %ul - * # content here - * - * Ex. 2: Block data - * .ui-box - * .title - * # title here - * .body - * # content here - * - */ - -.ui-box { - background: #FFF; - margin-bottom: 20px; - border: 1px solid #DDD; - word-wrap: break-word; - - img { - max-width: 100%; - } - - pre { - code { - background: none !important; - } - } - - ul { - margin: 0; - padding: 0; - } - - .title { - background-color: #EEE; - border-bottom: 1px solid #DDD; - color: #666; - font-size: 16px; - text-shadow: 0 1px 1px #fff; - padding: 0 10px; - font-size: 14px; - line-height: 40px; - font-weight: normal; - margin: 0; - - > a { - text-shadow: 0 1px 1px #fff; - } - - form { - margin-bottom: 0; - margin-top: 0; - } - - .btn { - vertical-align: middle; - padding: 4px 12px; - @include box-shadow(0 0px 1px 1px #f2f2f2); - } - - .nav-pills { - > li { - > a { - padding: 13px; - margin: 0; - font-size: 13px; - } - &.active { - > a { - background: #D5D5D5; - color: $style_color; - @include border-radius(0); - border-radius: 0; - border-left: 1px solid #CCC; - border-right: 1px solid #CCC; - } - } - } - } - } - - .body { - padding: 10px; - } - - &.padded { - h5, .title { - margin: -20px; - margin-bottom: 0; - padding: 5px 20px; - } - } - - .row_title { - font-weight: 500; - color: #444; - &:hover { - color: #444; - text-decoration: underline; - } - } - - .form-holder { - padding-top: 20px; - form { - margin-bottom: 0; - legend { - text-indent: 10px; - } - .form-actions { - margin-bottom: 0; - } - } - } -} - -/* - * Small box - */ -.ui-box.ui-box-small { - margin-bottom: 10px; - - .title { - font-size: 13px; - line-height: 30px; - - a { - color: #666; - &:hover { - text-decoration: underline; - } - } - } -} - -/* - * Danger box - */ -.ui-box.ui-box-danger { - background: #f7f7f7; - border: none; - - .title { - background: #D65; - color: #fff; - text-shadow: 0 1px 1px #900; - } -} - -/* - * Block under tw-bootstrap tabs - */ -.tab-pane { - .ui-box { - margin: 3px 3px 25px 3px; - } -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/variables.scss b/app/assets/stylesheets/gitlab_bootstrap/variables.scss deleted file mode 100644 index aeabe7a..0000000 --- a/app/assets/stylesheets/gitlab_bootstrap/variables.scss +++ /dev/null @@ -1,13 +0,0 @@ -/** - * General Colors - */ -$primary_color: #2FA0BB; -$link_color: #3A89A3; -$style_color: #474D57; -$hover: #D9EDF7; - -/** - * Commit Diff Colors - */ -$added: #63c363; -$deleted: #f77; -- libgit2 0.21.2