Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-24 11:43:45 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-24 11:43:45 +0400
commit58634dfb6a5d8218ccf7f1680bac5c201f80ac9a (patch)
tree1b642344dff813ce963b28c634630ba537f4aa76 /app/assets/stylesheets
parent71d4474684bb9bf38908e1aea296264b15f9060e (diff)
New class names in notes css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/sections/notes.scss39
1 files changed, 21 insertions, 18 deletions
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 9f5f1579fbd..651b39753e3 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -47,13 +47,13 @@ ul.notes {
.discussion-body {
margin-left: 50px;
- .file,
+ .diff-file,
.discussion-hidden,
.notes {
@extend .borders;
background-color: #F9F9F9;
}
- .file .notes {
+ .diff-file .notes {
/* reset */
background: inherit;
border: none;
@@ -114,7 +114,7 @@ ul.notes {
}
}
-.file .notes_holder {
+.diff-file .notes_holder {
font-size: 13px;
line-height: 18px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -184,7 +184,7 @@ ul.notes {
}
}
}
-.file .note .note-actions {
+.diff-file .note .note-actions {
right: 0;
top: 0;
}
@@ -195,7 +195,7 @@ ul.notes {
* Line note button on the side of diffs
*/
-.file tr.line_holder {
+.diff-file tr.line_holder {
.add-diff-note {
background: url("diff_note_add.png") no-repeat left 0;
height: 22px;
@@ -235,22 +235,25 @@ ul.notes {
.reply-btn {
@extend .btn-primary;
}
-.file .content tr.line_holder:hover {
- &> td.line_content {
- background: $hover !important;
- border-color: darken($hover, 10%) !important;
+.diff-file .diff-content {
+ tr.line_holder:hover {
+ &> td.line_content {
+ background: $hover !important;
+ border-color: darken($hover, 10%) !important;
+ }
+ &> td.new_line,
+ &> td.old_line {
+ background: darken($hover, 4%) !important;
+ border-color: darken($hover, 10%) !important;
+ }
}
- &> td.new_line,
- &> td.old_line {
- background: darken($hover, 4%) !important;
- border-color: darken($hover, 10%) !important;
+
+ tr.line_holder:hover > td .line_note_link {
+ opacity: 1.0;
+ filter: alpha(opacity=100);
}
}
-.file .content tr.line_holder:hover > td .line_note_link {
- opacity: 1.0;
- filter: alpha(opacity=100);
-}
-.file,
+.diff-file,
.discussion {
.new_note {
margin: 0;