Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
4c1267e0
Commit
4c1267e0
authored
Jul 29, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CSS refactoring. Notes better styled
parent
e1344a08
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
21 deletions
+35
-21
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+3
-0
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+4
-4
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+0
-0
app/assets/stylesheets/sections/login.scss
app/assets/stylesheets/sections/login.scss
+0
-1
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/nav.scss
+0
-0
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+24
-14
app/views/notes/_show.html.haml
app/views/notes/_show.html.haml
+4
-2
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
4c1267e0
...
...
@@ -335,6 +335,9 @@ img.avatar {
&
.s24
{
width
:
24px
;
}
&
.s32
{
width
:
32px
;
}
}
img
.lil_av
{
...
...
app/assets/stylesheets/main.scss
View file @
4c1267e0
...
...
@@ -76,13 +76,13 @@ $hover: #FDF5D9;
* Header of application.
* Contain application logo, search panel, profile icon
*/
@import
"header.scss"
;
@import
"
sections/
header.scss"
;
/**
* Navigation menu of application.
* 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
...
...
@@ -147,12 +147,12 @@ $hover: #FDF5D9;
/**
* This file represent notes(comments) styles
*/
@import
"notes.scss"
;
@import
"
sections/
notes.scss"
;
/**
* Devise styles
*/
@import
"login.scss"
;
@import
"
sections/
login.scss"
;
/**
* CODE HIGHTLIGHT BASE
...
...
app/assets/stylesheets/header.scss
→
app/assets/stylesheets/
sections/
header.scss
View file @
4c1267e0
File moved
app/assets/stylesheets/login.scss
→
app/assets/stylesheets/
sections/
login.scss
View file @
4c1267e0
...
...
@@ -41,4 +41,3 @@ body.login-page{
}
.login-box
a
.forgot
{
float
:
right
;
padding-top
:
6px
}
app/assets/stylesheets/nav.scss
→
app/assets/stylesheets/
sections/
nav.scss
View file @
4c1267e0
File moved
app/assets/stylesheets/notes.scss
→
app/assets/stylesheets/
sections/
notes.scss
View file @
4c1267e0
...
...
@@ -38,21 +38,31 @@
}
}
.note
.delete-note
{
display
:none
;
float
:right
;
.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
;
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
{
margin
:
5px
;
...
...
app/views/notes/_show.html.haml
View file @
4c1267e0
%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
%strong
=
note
.
author_name
=
link_to
"#
#{
dom_id
(
note
)
}
"
,
name:
dom_id
(
note
)
do
...
...
@@ -7,7 +7,9 @@
=
time_ago_in_words
(
note
.
updated_at
)
ago
-
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
=
preserve
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment