Merge commit '028bd6550e259e71277863f706a87fa696468f68'

README.md

@@ -92,6 +92,13 @@ Install python dependencies:
     pip install -r requirements.txt
     pip install -r requirements_dev.txt
 
+### Note for Ubunutu-based developers:
+If you're installing on an ubuntu linux machine, you may experience errors when pip encounters the psycopg2 and ldap packages.
+To prevent this, ensure you install the dev versions of python and libpq.
+```
+    sudo apt-get install -y python-dev libldap2-dev libsasl2-dev libssl-dev
+```
+
 Create the database:
 
     python manage.py migrate --settings=talks.settings_dev

static/css/custom.css

@@ -55,4 +55,105 @@ span.filter-active {
     font-size: smaller;
     font-style: italic;
     padding: 10px 0px 20px 30px;
+}
+
+/* Help text in form fields */
+.helptext {
+    display: block;
+    margin-bottom: 8px;
+}
+
+/* ICS/plain text links within a panel */
+.panel .formatting-links {
+    float: right;
+}
+/* ICS/plain text links within a list-group */
+.list-group-item .formatting-links-wrapper {
+    float: right;
+}
+.list-group-item .formatting-link .formatting-link-text,
+.list-unstyled .formatting-link .formatting-link-text {
+    display: none;
+}
+
+.event-teaser-wrapper {
+    display: -webkit-inline-flex;
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+    width: 100%;
+}
+
+.list-group-item .event-teaser-text-wrapper {
+    float: left;
+    width: 100%;
+}
+.formatting-link {
+    margin-left: 15px;
+    color: inherit;
+    text-decoration: none;
+}
+
+a.formatting-link:hover {
+    text-decoration: none;
+}
+
+.manage-lists-buttons {
+    float: right;
+    min-height: 40px;
+}
+
+/* Prevent target from being the font-awesome element for fa tags within an <a>.  eg. for add/remove event from list */
+.dropdown-menu li>a.js-toggle-collection-item .fa {
+    pointer-events: none;
+}
+
+.dropdown-menu>li {
+    margin-left: 10px;
+}
+
+.dropdown-menu {
+    min-width: 250px;
+    margin-left: -90px;
+}
+
+.contains-floating-buttons {
+    min-height: 40px;
+}
+.contains-floating-buttons.event {
+    min-height: 60px;
+}
+.nav-tabs {
+    border-bottom: 0;
+}
+div.add-to-collections,
+div.manage-lists-buttons {
+    display: inline-block;
+    margin-left: 15px;
+}
+
+.js-datetimepicker:hover,
+.js-datetimepicker input:hover {
+    cursor: pointer;
+}
+
+.pad-left {
+    margin-left: 25px;
+}
+
+div.share-this-links {
+    display: inline-block;
+}
+div.share-this-links span {
+    vertical-align: middle;
+}
+
+.event-title {
+    margin-bottom: 10px;
+}
+
+.fade-check {
+    color: #fff;
+}
+.active-collection {
+    background-color: #E4F0FC;
 }

static/font-awesome/HELP-US-OUT.txt

@@ -0,0 +1,7 @@
+I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
+Fonticons (https://fonticons.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
+comprehensive icon sets or copy and paste your own.
+
+Please. Check it out.
+
+-Dave Gandy