Skip to content

G
gitlab-ce
Commit 301f5bfc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch '7-9-rc2' into '7-9-stable' 

Code for 7.9.0.rc2

cc @marin

See merge request !1719
parents 2fd9f1cc d71e2318
Expand all Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 821 deletions
app/assets/stylesheets/base/variables.scss
View file @ 301f5bfc
$style_color: #474D57; $style_color: #474D57;
$hover: #FFF3EB; $hover: #FFF3EB;
$gl-text-color: #222222;
$gl-link-color: #446e9b; $gl-link-color: #446e9b;
$nprogress-color: #c0392b; $nprogress-color: #c0392b;
$gl-font-size: 14px; $gl-font-size: 14px;
...@@ -8,23 +9,18 @@ $sidebar_width: 230px; ...@@ -8,23 +9,18 @@ $sidebar_width: 230px;
$avatar_radius: 50%; $avatar_radius: 50%;
$code_font_size: 13px; $code_font_size: 13px;
$code_line_height: 1.5; $code_line_height: 1.5;
$border-color: #dce4ec; $border-color: #E5E5E5;
$background-color: #ECF0F1; $background-color: #f5f5f5;
/* /*
* State colors: * State colors:
*/ */
$gl-success: #019875;
$gl-danger: #d9534f;
$gl-primary: #446e9b; $gl-primary: #446e9b;
$gl-success: #019875;
$gl-info: #029ACF; $gl-info: #029ACF;
$gl-warning: #EB9532; $gl-warning: #EB9532;
$gl-danger: #d9534f;
$gl-primary: #2C3E50;
$gl-success: #18BC9C;
$gl-info: #3498DB;
$gl-warning: #F39C12;
$gl-danger: #E74C3C;
/* /*
* Commit Diff Colors * Commit Diff Colors
*/ */
......
app/assets/stylesheets/generic/files.scss
View file @ 301f5bfc
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
} }
.author, .author,
.blame_commit { .blame_commit {
background: #f5f5f5; background: $background-color;
vertical-align: top; vertical-align: top;
} }
.lines { .lines {
......
app/assets/stylesheets/generic/forms.scss
View file @ 301f5bfc
...@@ -29,8 +29,8 @@ fieldset legend { ...@@ -29,8 +29,8 @@ fieldset legend {
padding: 17px 20px 18px; padding: 17px 20px 18px;
margin-top: 18px; margin-top: 18px;
margin-bottom: 18px; margin-bottom: 18px;
background-color: #ecf0f1; background-color: $background-color;
border-top: 1px solid #e5e5e5; border-top: 1px solid $border-color;
} }
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
......
app/assets/stylesheets/generic/lists.scss
View file @ 301f5bfc
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
color: #8a6d3b; color: #8a6d3b;
} }
&.smoke { background-color: #f5f5f5; } &.smoke { background-color: $background-color; }
&:hover { &:hover {
background: $hover; background: $hover;
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
border-bottom: none; border-bottom: none;
&.bottom { &.bottom {
background: #f5f5f5; background: $background-color;
} }
} }
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
p { p {
padding-top: 1px; padding-top: 1px;
margin: 0; margin: 0;
color: #222; color: $gray-dark;
img { img {
position: relative; position: relative;
top: 3px; top: 3px;
...@@ -74,9 +74,10 @@ ...@@ -74,9 +74,10 @@
} }
.row_title { .row_title {
color: #444; color: $gray-dark;
&:hover { &:hover {
color: #444; color: $text-color;
text-decoration: underline; text-decoration: underline;
} }
} }
......
app/assets/stylesheets/generic/nav_sidebar.scss
View file @ 301f5bfc
.page-with-sidebar { .page-with-sidebar {
background: #F5F5F5; background: $background-color;
.sidebar-wrapper { .sidebar-wrapper {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
height: 100%; height: 100%;
border-right: 1px solid #EAEAEA; border-right: 1px solid $border-color;
} }
} }
.sidebar-wrapper { .sidebar-wrapper {
z-index: 99; z-index: 99;
background: #F5F5F5; background: $background-color;
} }
.content-wrapper { .content-wrapper {
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.nav-sidebar li { .nav-sidebar li {
&.active a { &.active a {
color: #333; color: $text-color;
background: #FFF !important; background: #FFF !important;
font-weight: bold; font-weight: bold;
border: 1px solid #EEE; border: 1px solid #EEE;
...@@ -52,32 +52,31 @@ ...@@ -52,32 +52,31 @@
} }
i { i {
color: #444; color: $text-color;
} }
} }
} }
.nav-sidebar li { .nav-sidebar li {
&.separate-item { &.separate-item {
border-top: 1px solid #ddd; border-top: 1px solid $border-color;
padding-top: 10px; padding-top: 10px;
margin-top: 10px; margin-top: 10px;
} }
a { a {
color: #555; color: $gray;
display: block; display: block;
text-decoration: none; text-decoration: none;
padding: 8px 15px; padding: 8px 15px;
font-size: 13px; font-size: 13px;
line-height: 20px; line-height: 20px;
text-shadow: 0 1px 2px #FFF;
padding-left: 20px; padding-left: 20px;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: #333; color: $text-color;
background: #EEE; background: $border-color;
} }
&:active, &:focus { &:active, &:focus {
...@@ -86,7 +85,7 @@ ...@@ -86,7 +85,7 @@
i { i {
width: 20px; width: 20px;
color: #888; color: $gray-light;
margin-right: 23px; margin-right: 23px;
} }
} }
...@@ -156,18 +155,17 @@ ...@@ -156,18 +155,17 @@
position: fixed; position: fixed;
top: 46px; top: 46px;
padding: 5px 13px 5px 13px; padding: 5px 13px 5px 13px;
left: 197px; left: 198px;
font-size: 13px; font-size: 13px;
background: #EEE; background: transparent;
color: black; color: black;
border-left: 1px solid rgba(0,0,0,0.035); border-left: 1px solid $border-color;
border-right: 1px solid rgba(0,0,0,0.035); border-bottom: 1px solid $border-color;
} }
.collapse-nav a:hover { .collapse-nav a:hover {
text-decoration: none; text-decoration: none;
color: #333; background: #f2f6f7;
background: #eaeaea;
} }
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
......
app/assets/stylesheets/generic/timeline.scss
View file @ 301f5bfc
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
.timeline-content { .timeline-content {
position: relative; position: relative;
background: #f5f5f6; background: $background-color;
padding: 10px 15px; padding: 10px 15px;
margin-left: 60px; margin-left: 60px;
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
height: 0; height: 0;
border-style: solid; border-style: solid;
border-width: 9px 9px 9px 0; border-width: 9px 9px 9px 0;
border-color: transparent #f5f5f6 transparent transparent; border-color: transparent $background-color transparent transparent;
left: 0; left: 0;
top: 10px; top: 10px;
margin-left: -9px; margin-left: -9px;
......
app/assets/stylesheets/generic/typography.scss
View file @ 301f5bfc
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
*/ */
.page-title { .page-title {
margin-top: 0px; margin-top: 0px;
color: #333;
line-height: 1.5; line-height: 1.5;
font-weight: normal; font-weight: normal;
margin-bottom: 5px; margin-bottom: 5px;
...@@ -16,7 +15,7 @@ pre { ...@@ -16,7 +15,7 @@ pre {
&.dark { &.dark {
background: #333; background: #333;
color: #f5f5f5; color: $background-color;
} }
} }
......
app/assets/stylesheets/pages/diff.scss
View file @ 301f5bfc
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
border: none; border: none;
background: #F5F5F5; background: $background-color;
color: rgba(0,0,0,0.3); color: rgba(0,0,0,0.3);
padding: 0px 5px; padding: 0px 5px;
border-right: 1px solid $border-color; border-right: 1px solid $border-color;
......
app/assets/stylesheets/pages/editor.scss
View file @ 301f5bfc
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
} }
.editor-ref { .editor-ref {
background: #f5f5f5; background: $background-color;
padding: 11px 15px; padding: 11px 15px;
border-right: 1px solid #CCC; border-right: 1px solid #CCC;
display: inline-block; display: inline-block;
......
app/assets/stylesheets/pages/events.scss
View file @ 301f5bfc
...@@ -154,10 +154,12 @@ ...@@ -154,10 +154,12 @@
overflow: auto; overflow: auto;
.event-last-push-text { .event-last-push-text {
@include str-truncated(100%); @include str-truncated(100%);
padding: 5px 0;
font-size: 13px;
float:left; float:left;
margin-right: -150px; margin-right: -150px;
padding-right: 150px; padding-right: 150px;
line-height: 24px; line-height: 20px;
} }
} }
...@@ -188,7 +190,7 @@ ...@@ -188,7 +190,7 @@
li a { li a {
font-size: 13px; font-size: 13px;
padding: 5px 10px; padding: 5px 10px;
background: rgba(0,0,0,0.045); background: $background-color;
margin-left: 4px; margin-left: 4px;
} }
} }
app/assets/stylesheets/pages/merge_requests.scss
View file @ 301f5bfc
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
font-size: 15px; font-size: 15px;
border-bottom: 1px solid #BBB; border-bottom: 1px solid #BBB;
color: #777; color: #777;
background-color: #F5F5F5; background-color: $background-color;
&.ci-success { &.ci-success {
color: $gl-success; color: $gl-success;
......
app/assets/stylesheets/pages/tree.scss
View file @ 301f5bfc
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
} }
&.selected { &.selected {
td { td {
background: #f5f5f5; background: $background-color;
border-top: 1px solid #EEE; border-top: 1px solid #EEE;
border-bottom: 1px solid #EEE; border-bottom: 1px solid #EEE;
} }
......
app/views/notify/project_was_moved_email.html.haml
View file @ 301f5bfc
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
= @project.name_with_namespace = @project.name_with_namespace
%p %p
To update the remote url in your local repository run (for ssh): To update the remote url in your local repository run (for ssh):
%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" } %p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
git remote set-url origin #{@project.ssh_url_to_repo} git remote set-url origin #{@project.ssh_url_to_repo}
%p %p
or for http(s): or for http(s):
%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" } %p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
git remote set-url origin #{@project.http_url_to_repo} git remote set-url origin #{@project.http_url_to_repo}
%br %br
app/views/projects/issues/_issue_context.html.haml
View file @ 301f5bfc
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
= hidden_field_tag :issue_context = hidden_field_tag :issue_context
= f.submit class: 'btn' = f.submit class: 'btn'
- if current_user
%div.prepend-top-20.clearfix %div.prepend-top-20.clearfix
.issuable-context-title .issuable-context-title
%label %label
......
app/views/projects/merge_requests/show/_context.html.haml
View file @ 301f5bfc
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
= hidden_field_tag :merge_request_context = hidden_field_tag :merge_request_context
= f.submit class: 'btn' = f.submit class: 'btn'
- if current_user
%div.prepend-top-20.clearfix %div.prepend-top-20.clearfix
.issuable-context-title .issuable-context-title
%label %label
......
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