Commit 4c1267e0 authored by randx's avatar randx

CSS refactoring. Notes better styled

parent e1344a08
...@@ -335,6 +335,9 @@ img.avatar { ...@@ -335,6 +335,9 @@ img.avatar {
&.s24 { &.s24 {
width:24px; width:24px;
} }
&.s32 {
width:32px;
}
} }
img.lil_av { img.lil_av {
......
...@@ -76,13 +76,13 @@ $hover: #FDF5D9; ...@@ -76,13 +76,13 @@ $hover: #FDF5D9;
* Header of application. * Header of application.
* Contain application logo, search panel, profile icon * Contain application logo, search panel, profile icon
*/ */
@import "header.scss"; @import "sections/header.scss";
/** /**
* Navigation menu of application. * Navigation menu of application.
* Panel with links to pages depends on project, profile or admin area * Panel with links to pages depends on project, profile or admin area
*/ */
@import "nav.scss"; @import "sections/nav.scss";
/** /**
* This file represent some UI that can be changed * This file represent some UI that can be changed
...@@ -147,12 +147,12 @@ $hover: #FDF5D9; ...@@ -147,12 +147,12 @@ $hover: #FDF5D9;
/** /**
* This file represent notes(comments) styles * This file represent notes(comments) styles
*/ */
@import "notes.scss"; @import "sections/notes.scss";
/** /**
* Devise styles * Devise styles
*/ */
@import "login.scss"; @import "sections/login.scss";
/** /**
* CODE HIGHTLIGHT BASE * CODE HIGHTLIGHT BASE
......
...@@ -41,4 +41,3 @@ body.login-page{ ...@@ -41,4 +41,3 @@ body.login-page{
} }
.login-box a.forgot{float: right; padding-top: 6px} .login-box a.forgot{float: right; padding-top: 6px}
...@@ -38,21 +38,31 @@ ...@@ -38,21 +38,31 @@
} }
} }
.note .delete-note { .note {
padding: 8px 0;
border-bottom: 1px solid #eee;
overflow: hidden;
display: block;
img {float: left; margin-right: 10px;}
.note-author cite{font-style: italic;}
p { color:$style_color; }
.note-author { color: $style_color;}
.note-title { margin-left:50px; padding-top: 5px;}
.avatar {
margin-top:3px;
}
.delete-note {
display:none; display:none;
float:right; float:right;
}
&:hover {
.delete-note { display:block; }
}
} }
.note:hover .delete-note { display:block; }
.note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
.note img{float: left; margin-right: 10px;}
.note span.note-title{display: block;}
.note span.note-title{margin-bottom: 10px}
.note span.note-author{color: #999; font-weight: normal; font-style: italic;}
.note span.note-author strong{font-weight: bold; font-style: normal;}
.note p { color:$style_color; }
.note .note-author { color: $style_color;}
.note .note-title { margin-left:55px; }
p.notify_controls input{ p.notify_controls input{
margin: 5px; margin: 5px;
......
%li{:id => dom_id(note), :class => "note"} %li{:id => dom_id(note), :class => "note"}
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" = image_tag gravatar_icon(note.author.email), :class => "avatar"
%div.note-author %div.note-author
%strong= note.author_name %strong= note.author_name
= link_to "##{dom_id(note)}", name: dom_id(note) do = link_to "##{dom_id(note)}", name: dom_id(note) do
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
= time_ago_in_words(note.updated_at) = time_ago_in_words(note.updated_at)
ago ago
- if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project) - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
%strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small" = link_to [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn very_small" do
%i.icon-trash
Remove
%div.note-title %div.note-title
= preserve do = preserve do
......
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