summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-01-21 15:22:42 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-01-21 15:22:42 +0200
commitf6f72d4b22ceeddaaf06666e132e06b2bc6b3c22 (patch)
treedcc44c45bb89ab2ff60bb9880c6df4ebacbde98c
parentf4e3ec29c46752c68b99fa2eb37cfb12463de9f2 (diff)
downloadgitlab-ce-f6f72d4b22ceeddaaf06666e132e06b2bc6b3c22.tar.gz
per line comment improved
-rw-r--r--app/assets/stylesheets/commits.css.scss36
-rw-r--r--app/assets/stylesheets/projects.css.scss27
-rw-r--r--app/views/notes/_form.html.haml2
-rw-r--r--app/views/notes/_per_line_form.html.haml4
4 files changed, 35 insertions, 34 deletions
diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss
index b78088f7b25..b1fa9c1827c 100644
--- a/app/assets/stylesheets/commits.css.scss
+++ b/app/assets/stylesheets/commits.css.scss
@@ -148,16 +148,44 @@ ul.bordered-list li:last-child { border:none }
}
.per_line_form {
- background: #79C3E0;
+ font-family: "Helvetica", sans-serif;
+ background: #2FA0BB;
+
+ td {
+ padding:0;
+ }
form {
- width: 743px;
+ margin:5px;
+ width: 756px;
border: 1px solid #CCC;
padding: 20px;
background: white;
}
+}
+
+
+tr.line_notes_row {
+ font-family: "Helvetica", sans-serif;
+ &:hover {
+ background:none;
+ }
+ td {
+ margin:0px;
+ padding:0px;
+ border-bottom:1px solid #DEE2E3;
+
- .hide-button {
- color:#c33;
+ ul {
+ display:block;
+ list-style:none;
+ margin:0px;
+ padding:0px;
+
+ li {
+ border-top:1px solid #DEE2E3;
+ padding:10px;
+ }
+ }
}
}
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index eae9383a02e..c9bba0c1f69 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -566,33 +566,6 @@ a.project-update.titled {
}
-tr.line_notes_row {
- &:hover {
- background:none;
- }
- td {
- margin:0px;
- padding:0px;
- border-bottom:1px solid #DEE2E3;
-
-
- ul {
- display:block;
- list-style:none;
- margin:0px;
- padding:0px;
-
- li {
- border-top:1px solid #DEE2E3;
- padding:10px;
-
- .delete-note {
- display:none;
- }
- }
- }
- }
-}
.new-project-hodler {
padding:20px;
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 65af82b35c5..95a3b01acfe 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -34,4 +34,4 @@
.clear
%br
- = f.submit 'Add note', :class => "grey-button", :id => "submit_note"
+ = f.submit 'Add note', :class => "positive-button", :id => "submit_note"
diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml
index 02bbecd0637..72989320226 100644
--- a/app/views/notes/_per_line_form.html.haml
+++ b/app/views/notes/_per_line_form.html.haml
@@ -21,9 +21,9 @@
.clear
%br
- = f.submit 'Add note', :class => "grey-button", :id => "submit_note"
+ = f.submit 'Add note', :class => "positive-button", :id => "submit_note"
.right
- = link_to "remove", "#", :class => "hide-button"
+ = link_to "Close", "#", :class => "grey-button hide-button"
:javascript
$(function(){