FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make the notification center smaller and shorten content

This commit is contained in:
pixeldesu 2015-09-16 23:59:47 +02:00
parent 24f7ff98ec
commit 927d6632c1
5 changed files with 68 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/scss/notifications.scss
View File

@ -61,7 +61,7 @@
} }
.notification-center { .notification-center {
min-width: 500px; min-width: 400px;
margin-top: 0px !important; margin-top: 0px !important;
} }
@ -74,6 +74,10 @@
.notification--heading { .notification--heading {
margin-bottom: 4px; margin-bottom: 4px;
a {
border-bottom: 1px dotted $link-color;
}
} }
.notification--list-heading { .notification--list-heading {

18
app/views/layouts/_notifications.html.haml
View File

@ -39,12 +39,14 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading question %h6.notification--list-heading question
.notification--list-content= markdown notification.target.question.content .notification--list-content
= markdown notification.target.question.content[0..60] + "#{notification.target.question.content.length > 60 ? '[...]' : ''}"
.list-group-item .list-group-item
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading answer %h6.notification--list-heading answer
.notification--list-content= markdown notification.target.content .notification--list-content
= markdown notification.target.content[0..60] + "#{notification.target.content.length > 60 ? '[...]' : ''}"
- when "Relationship" - when "Relationship"
.pull-left .pull-left
%img.img-rounded.notification--dropdown-img{src: notification.target.source.profile_picture.url(:small)} %img.img-rounded.notification--dropdown-img{src: notification.target.source.profile_picture.url(:small)}
@ -69,7 +71,8 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading answer %h6.notification--list-heading answer
.notification--list-content= markdown notification.target.answer.content .notification--list-content
= markdown notification.target.answer.content[0..60] + "#{notification.target.answer.content.length > 60 ? '[...]' : ''}"
- when "CommentSmile" - when "CommentSmile"
.pull-left .pull-left
%i.fa.fa-2x.fa-fw.fa-smile-o %i.fa.fa-2x.fa-fw.fa-smile-o
@ -86,7 +89,8 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading comment %h6.notification--list-heading comment
.notification--list-content= markdown notification.target.comment.content .notification--list-content
= markdown notification.target.comment.content[0..60] + "#{notification.target.comment.content.length > 60 ? '[...]' : ''}"
- when "Comment" - when "Comment"
.pull-left .pull-left
%i.fa.fa-2x.fa-fw.fa-comments %i.fa.fa-2x.fa-fw.fa-comments
@ -108,12 +112,14 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading answer %h6.notification--list-heading answer
.notification--list-content= markdown notification.target.answer.content .notification--list-content
= markdown notification.target.answer.content[0..60] + "#{notification.target.answer.content.length > 60 ? '[...]' : ''}"
.list-group-item .list-group-item
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading comment %h6.notification--list-heading comment
.notification--list-content= markdown notification.target.content .notification--list-content
= markdown notification.target.content[0..60] + "#{notification.target.content.length > 60 ? '[...]' : ''}"
%li.text-center %li.text-center
%a{href: notifications_path} %a{href: notifications_path}
%i.fa.fa-fw.fa-chevron-right %i.fa.fa-fw.fa-chevron-right

18
app/views/notifications/_notification.html.haml
View File

@ -17,12 +17,14 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading question %h6.notification--list-heading question
.notification--list-content= markdown notification.target.question.content .notification--list-content
= markdown notification.target.question.content
.list-group-item .list-group-item
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading answer %h6.notification--list-heading answer
.notification--list-content= markdown notification.target.content .notification--list-content
= markdown notification.target.content[0..255] + "#{notification.target.content.length > 255 ? '[...]' : ''}"
- when "Relationship" - when "Relationship"
.pull-left .pull-left
%img.img-rounded.notification--dropdown-img{src: notification.target.source.profile_picture.url(:small)} %img.img-rounded.notification--dropdown-img{src: notification.target.source.profile_picture.url(:small)}
@ -47,7 +49,8 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading answer %h6.notification--list-heading answer
.notification--list-content= markdown notification.target.answer.content .notification--list-content
= markdown notification.target.answer.content[0..255] + "#{notification.target.answer.content.length > 255 ? '[...]' : ''}"
- when "CommentSmile" - when "CommentSmile"
.pull-left .pull-left
%i.fa.fa-2x.fa-fw.fa-smile-o %i.fa.fa-2x.fa-fw.fa-smile-o
@ -64,7 +67,8 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading comment %h6.notification--list-heading comment
.notification--list-content= markdown notification.target.comment.content .notification--list-content
= markdown notification.target.comment.content
- when "Comment" - when "Comment"
.pull-left .pull-left
%i.fa.fa-2x.fa-fw.fa-comments %i.fa.fa-2x.fa-fw.fa-comments
@ -86,9 +90,11 @@
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading answer %h6.notification--list-heading answer
.notification--list-content= markdown notification.target.answer.content .notification--list-content
= markdown notification.target.answer.content[0..255] + "#{notification.target.answer.content.length > 255 ? '[...]' : ''}"
.list-group-item .list-group-item
.media.question-media .media.question-media
.media-body .media-body
%h6.notification--list-heading comment %h6.notification--list-heading comment
.notification--list-content= markdown notification.target.content .notification--list-content
= markdown notification.target.content

4
app/views/user/theme.css.scss.erb
View File

@ -138,6 +138,10 @@ body#version1 {
} }
} }
.notification--heading a {
border-color: $primary_text;
}
> li.divider { > li.divider {
background-color: $primary_border; background-color: $primary_border;
} }

36
db/schema.rb
View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150721154255) do ActiveRecord::Schema.define(version: 20150826224857) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -177,6 +177,39 @@ ActiveRecord::Schema.define(version: 20150721154255) do
t.boolean "is_active", default: true t.boolean "is_active", default: true
end end
create_table "themes", force: :cascade do |t|
t.integer "user_id", null: false
t.integer "primary_color", default: 6174129
t.integer "primary_text", default: 16777215
t.integer "danger_color", default: 16711737
t.integer "danger_text", default: 16777215
t.integer "success_color", default: 4175384
t.integer "success_text", default: 16777215
t.integer "warning_color", default: 16741656
t.integer "warning_text", default: 16777215
t.integer "info_color", default: 10048699
t.integer "info_text", default: 16777215
t.integer "default_color", default: 2236962
t.integer "default_text", default: 15658734
t.integer "panel_color", default: 16382457
t.integer "panel_text", default: 1381653
t.integer "link_color", default: 6174129
t.integer "background_color", default: 16777215
t.integer "background_text", default: 2236962
t.integer "background_muted", default: 12303291
t.string "css_file_name"
t.string "css_content_type"
t.integer "css_file_size"
t.datetime "css_updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "input_color", default: 16777215, null: false
t.integer "input_text", default: 0, null: false
t.integer "outline_color", default: 6174129, null: false
end
add_index "themes", ["user_id", "created_at"], name: "index_themes_on_user_id_and_created_at", using: :btree
create_table "users", force: :cascade do |t| create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false t.string "encrypted_password", default: "", null: false
@ -239,6 +272,7 @@ ActiveRecord::Schema.define(version: 20150721154255) do
t.datetime "confirmed_at" t.datetime "confirmed_at"
t.datetime "confirmation_sent_at" t.datetime "confirmation_sent_at"
t.string "unconfirmed_email" t.string "unconfirmed_email"
t.boolean "show_foreign_themes", default: true, null: false
end end
add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree