From a7d72388312f71a1a9edf454349633f0a7d98b36 Mon Sep 17 00:00:00 2001 From: Jona Azizaj Date: Jul 18 2018 20:56:38 +0000 Subject: Merge #26 `Add share buttons` --- diff --git a/assets/css/custom.css b/assets/css/custom.css index d564d63..c118c49 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -11,7 +11,7 @@ h1, h2, h3, h4, h5, h6 { } a, a:hover { - color: #F64747; + color: #294172; } aside { @@ -78,16 +78,16 @@ blockquote { .btn { background: white; - border: 1px solid #F64747; - color: #F64747; + border: 1px solid #294172; + color: #294172; text-transform: uppercase; padding: 0.9em 1.3em; } .btn:hover { - background: #F64747; + background: #294172; color: white; - border: 1px solid #F64747; + border: 1px solid #294172; } .row.content { @@ -115,9 +115,9 @@ blockquote { width: 25%; height: calc(100% + 20px); position: fixed; - background: -moz-linear-gradient(top, #F23030 0%, #f64747 27%, #f64747 27%, #F23030 100%); - background: -webkit-linear-gradient(top, #F23030 0%,#f64747 27%,#f64747 27%,#F23030 100%); - background: linear-gradient(to bottom, #F23030 0%,#f64747 27%,#f64747 27%,#F23030 100%); + background: -moz-linear-gradient(top, #3c6eb4 0%, #3c6eb4 27%, #3c6eb4 27%, #3c6eb4 100%); + background: -webkit-linear-gradient(top, #3c6eb4 0%, #3c6eb4 27%, #3c6eb4 27%, #3c6eb4 100%); + background: linear-gradient(to bottom, #3c6eb4 0%, #3c6eb4 27%, #3c6eb4 27%, #3c6eb4 100%); } aside .sidebar { @@ -169,3 +169,35 @@ blockquote { color: white; border: none; } + +.sharebutton { + position: relative; + height: 28px; + box-sizing: border-box; + background-color: #3B5998; + padding: 1px 10px 1px 9px; + color: #fff; + font-weight: 500; + cursor: pointer; + inherit: none; + display: inline-block; + vertical-align: top; + font: normal normal normal 11px/18px 'Helvetica Neue',Arial,sans-serif; + font-size: 13px; + line-height: 26px; + border-radius: 4px; +} + +.sharebutton:hover { + text-decoration: none; + color: #fff; + background-color: #2f4779; +} + +.google{ + background-color: #d34836; +} + +.google:hover{ + background-color: #b72213; +} diff --git a/happinesspackets/messaging/views.py b/happinesspackets/messaging/views.py index a86bfb7..704083d 100644 --- a/happinesspackets/messaging/views.py +++ b/happinesspackets/messaging/views.py @@ -21,6 +21,7 @@ logger = logging.getLogger(__name__) class ArchiveListView(ListView): model = Message + paginate_by = 5 def get_queryset(self): queryset = super(ArchiveListView, self).get_queryset() diff --git a/templates/base.html b/templates/base.html index 80a9498..8f9e496 100644 --- a/templates/base.html +++ b/templates/base.html @@ -12,6 +12,7 @@ +