home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'highlighted-note' into 'master'

Browse Source 
Changed padding & background color for highlighted notes

Closes #12453

![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png)

See merge request !2937
This commit is contained in:
Jacob Schatz
2016-02-24 11:58:37 +00:00
parent 8089a77c4b 647eccd1fa
commit d22ebcf0c3
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/framework/files.scss
+1 -1
View File
@@ -158,7 +158,7 @@
}
&:hover {
background: $hover;
background: $row-hover;
}
}
}
app/assets/stylesheets/framework/jquery.scss
+2 -2
View File
@@ -48,8 +48,8 @@
.ui-state-hover,
.ui-state-focus {
border: 1px solid $hover;
background: $hover;
border: 1px solid $row-hover;
background: $row-hover;
color: #333;
}
}
app/assets/stylesheets/framework/lists.scss
+1 -1
View File
@@ -38,7 +38,7 @@
&.smoke { background-color: $background-color; }
&:hover {
background: $hover;
background: $row-hover;
}
&:last-child {
app/assets/stylesheets/framework/timeline.scss
+2 -2
View File
@@ -5,13 +5,13 @@
padding: 0;
.timeline-entry {
padding: $gl-padding 0;
padding: $gl-padding $gl-btn-padding;
border-color: $table-border-color;
color: $gl-gray;
border-bottom: 1px solid $border-white-light;
&:target {
background: $hover;
background: $row-hover;
}
&:last-child {
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+1 -1
View File
@@ -70,7 +70,7 @@ $pagination-bg: #fff;
$pagination-border: $border-color;
$pagination-hover-color: $gl-gray;
$pagination-hover-bg: $hover;
$pagination-hover-bg: $row-hover;
$pagination-hover-border: $border-color;
$pagination-active-color: $blue-dark;
app/assets/stylesheets/framework/variables.scss
+1 -1
View File
@@ -1,4 +1,4 @@
$hover: #faf9f9;
$row-hover: #f4f8fe;
$gl-text-color: #54565B;
$gl-text-green: #4A2;
$gl-text-red: #D12F19;
app/assets/stylesheets/pages/tree.scss
+1 -1
View File
@@ -21,7 +21,7 @@
&:hover {
td {
background: $hover;
background: $row-hover;
}
cursor: pointer;
}