Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rendezvous
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VeNtura
rendezvous
Commits
adfebd5d
Commit
adfebd5d
authored
Sep 05, 2014
by
tady
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix design, hipchat notification on draft, user search link
parent
0f216c30
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
36 additions
and
41 deletions
+36
-41
app/assets/images/face.jpg
+0
-0
app/assets/stylesheets/app.css.scss
+1
-1
app/assets/stylesheets/basic.css.scss
+7
-7
app/assets/stylesheets/flow.css.scss
+11
-7
app/decorators/user_decorator.rb
+5
-0
app/models/concerns/hipchat_integration.rb
+2
-0
app/views/flow/show.html.slim
+1
-1
app/views/posts/_large_item.html.slim
+1
-1
app/views/posts/show.html.slim
+3
-3
config/aws-s3-bucket-policy.json
+5
-21
No files found.
app/assets/images/face.jpg
0 → 100644
View file @
adfebd5d
946 Bytes
app/assets/stylesheets/app.css.scss
View file @
adfebd5d
...
...
@@ -9,7 +9,7 @@
.navbar-default
.navbar-brand
,
.label
a
{
color
:
white
;
//
color: white;
}
#app-search-form
{
...
...
app/assets/stylesheets/basic.css.scss
View file @
adfebd5d
...
...
@@ -2,17 +2,17 @@
@import
url(http://fonts.googleapis.com/css?family=Flamenco:300,400)
;
@import
url(http://fonts.googleapis.com/css?family=Quicksand:300,400,700)
;
p
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
span
{
font-family
:
'メイリオ'
,
'meiryo'
,
hiragino
kaku
go
;
letter-spacing
:
2pt
;
line-height
:
150%
;
margin
:
0
;
padding
:
0
;
//
font-family: 'メイリオ', 'meiryo', hiragino kaku go;
//
letter-spacing: 2pt;
//
line-height: 150%;
//
margin: 0;
//
padding: 0;
}
.badge
{
.badge
.badge-transparent
{
background-color
:
transparent
;
color
:
$main-color
;
font-family
:
'Quicksand'
;
//
font-family: 'Quicksand';
letter-spacing
:
0
;
border
:
1
.5px
solid
$main-color
;
padding
:
4px
6px
;
...
...
app/assets/stylesheets/flow.css.scss
View file @
adfebd5d
...
...
@@ -60,9 +60,13 @@
}
.label-tag
{
background-color
:
#e67e22
;
//
background-color: #e67e22;
padding-top
:
4px
;
font-weight
:
300
;
// font-weight: 300;
background-color
:
transparent
;
color
:
#75b3c8
;
border
:
1
.5px
solid
#75b3c8
;
padding
:
4px
6px
;
@include
border_radius
(
20px
);
}
...
...
@@ -112,11 +116,11 @@
dd
{
margin-bottom
:
10px
;
}
.label-tag
{
background-color
:
#e67e22
;
padding-top
:
4px
;
font-weight
:
100
;
}
//
.label-tag {
//
background-color: #e67e22;
//
padding-top: 4px;
// //
font-weight: 100;
//
}
}
.comment-wrapper
{
...
...
app/decorators/user_decorator.rb
View file @
adfebd5d
...
...
@@ -4,4 +4,9 @@ class UserDecorator < Draper::Decorator
def
draft_count
model
.
posts
.
where
(
is_draft:
true
).
count
end
# URL for user thumbnail.
def
image_url
model
.
image_url
.
presence
||
h
.
asset_path
(
'face.jpg'
)
end
end
app/models/concerns/hipchat_integration.rb
View file @
adfebd5d
module
HipchatIntegration
# Call Hipchat API
def
notify_hipchat!
return
if
is_draft
client
=
HipChat
::
Client
.
new
(
Settings
.
hipchat
.
token
)
client
[
Settings
.
hipchat
.
room
].
send
(
'Rendezvous'
,
notify_hipchat_body
,
message_format
:'text'
,
notify:
1
)
end
...
...
app/views/flow/show.html.slim
View file @
adfebd5d
...
...
@@ -38,4 +38,4 @@
-
Tag
.
recent
(
10
).
each_with_index
do
|
tag
,
i
|
a
.list-group-item
data-tag-id
=
tag
.id
href
=
search_path
(
q:
"#
#{
tag
.
name
}
"
)
=
tag
.
name
span
.badge
=
tag
.
posts_count
span
.badge
.badge-transparent
=
tag
.
posts_count
app/views/posts/_large_item.html.slim
View file @
adfebd5d
...
...
@@ -16,7 +16,7 @@ a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path
abbr
.js-time-ago
data-time-ago-at
=
post
.updated_at
|
.
-
post
.
tags
.
each
do
|
tag
|
span
.label.label-
success.label-
tag
#{
tag
.
name
}
span
.label.label-tag
#{
tag
.
name
}
|
.col-xs-4
small
.pull-right
...
...
app/views/posts/show.html.slim
View file @
adfebd5d
...
...
@@ -40,7 +40,7 @@
dl
dt
作成者
dd
a
href
=
(
search_path
(
q:
"@
#{
@post
.
author
.
name
}
"
)
)
a
href
=
(
search_path
(
q:
"@
#{
@post
.
author
.
n
ickn
ame
}
"
)
)
|
@
#{
@post
.
author
.
name
}
dt
タグ
...
...
@@ -83,10 +83,10 @@
-
@post
.
comments
.
each
do
|
comment
|
li
.media
a
.pull-left
href
=
"#"
img
.media-object
src
=
comment
.author.image_url
/
img
.media-object
src
=
comment
.author.
decorate.
image_url
/
.media-body
h4
.media-heading
=
comment
.
author
.
name
=
comment
.
body
=
MarkdownRenderer
.
new
(
comment
.
body
).
render
=
form_tag
(
comment_post_path
,
method: :post
,
data:
{
'form-id'
=>
"comment_
#{
@post
.
id
}
"
})
do
li
.media
a
.pull-left
href
=
"#"
...
...
config/aws-s3-bucket-policy.json
View file @
adfebd5d
{
"Version"
:
"2012-10-17"
,
"Id"
:
"Rendezvous
http referer
policy"
,
"Id"
:
"Rendezvous
IP
policy"
,
"Statement"
:
[
{
"Sid"
:
"
Allow get requests referred by rendezvous
"
,
"Sid"
:
"
IPAllow
"
,
"Effect"
:
"Allow"
,
"Principal"
:
"*"
,
"Action"
:
"s3:GetObject"
,
"Resource"
:
"arn:aws:s3:::rendezvous-uploads/*"
,
"Condition"
:
{
"StringLike"
:
{
"aws:Referer"
:
[
"http://localhost:3000/*"
,
"http://rendezvous.*"
]
}
}
},
{
"Sid"
:
"Explicit deny to ensure requests are allowed only from specific referer."
,
"Effect"
:
"Deny"
,
"Principal"
:
"*"
,
"Action"
:
"s3:GetObject"
,
"Resource"
:
"arn:aws:s3:::rendezvous-uploads/*"
,
"Condition"
:
{
"StringNotLike"
:
{
"aws:Referer"
:
[
"http://localhost:3000/*"
,
"http://rendezvous.*"
"IpAddress"
:
{
"aws:SourceIp"
:
[
"111.111.111.111/32"
]
}
}
...
...
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