Commit 68cb6899 authored by Sofia Papagiannaki's avatar Sofia Papagiannaki
Browse files

merge with master: fix conflicts

parent 3597f9c9
docs/build
*.db
*.pyc
*.egg-info
.DS_Store
snf-astakos-app/astakos/version.py
......@@ -173,4 +173,4 @@ def report_user_event(user):
conn = exchange_connect(QUEUE_CONNECTION)
routing_key = QUEUE_CONNECTION.replace('*', 'user')
exchange_send(conn, routing_key, body)
exchange_close(conn)
\ No newline at end of file
exchange_close(conn)
......@@ -107,7 +107,6 @@
.servicesbar .profile .user.active {
background-color: #333;
}
.servicesbar .profile a {
float: none;
}
......
......@@ -51,6 +51,18 @@ a.button {
}
}
// specific styles for A buttons
a.button {
text-align: center !important;
color: #fff !important;
border: none !important;
display: block !important;
&:hover {
color: #fff !important;
}
}
.transit(@type:color, @time:.15s, @easing:linear) {
-webkit-transition: @type @time @easing;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment