Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyaggr3g470r/controllers/feed.py
	pyaggr3g470r/templates/home.html

2 files changed, 94 insertions, 0 deletions

diff --git a/pyaggr3g470r/static/css/customized-bootstrap.css b/pyaggr3g470r/static/css/customized-bootstrap.css
new file mode 100644
index 00000000..58a9d182
--- /dev/null
+++ b/pyaggr3g470r/static/css/customized-bootstrap.css
@@ -0,0 +1,44 @@
+body {
+    margin-top: 50px;
+}
+div.top {
+    position: relative;
+    top: -50px;
+    display: block;
+    height: 0;
+}
+
+.navbar-custom {
+    background-color: #205081;
+    border: #205081;
+    color: #FFFFFF;
+    border-radius: 0;
+}
+
+.navbar-custom .navbar-nav > li > a {
+    color: #FFFFFF;
+}
+
+.navbar-custom .navbar-nav > li > a:hover {
+    background-color: #3572B0;
+}
+
+.navbar-custom .navbar-nav > .active > a,
+.navbar-nav > .active > a:hover,
+.navbar-nav > .active > a:focus {
+    color: #FFFFFF;
+    background-color: #3572B0;
+}
+.navbar-custom .navbar-brand {
+    color: #FFFFFF;
+}
+
+.navbar-custom .navbar-nav > .open > a,
+.navbar-custom .navbar-nav > .open > a:hover,
+.navbar-custom .navbar-nav > .open > a:focus {
+    color: #FFFFFF;
+    background-color: #3572B0;
+}
+a {
+    color: #3572B0;
+}
diff --git a/pyaggr3g470r/static/css/side-nav.css b/pyaggr3g470r/static/css/side-nav.css
new file mode 100644
index 00000000..5786bffa
--- /dev/null
+++ b/pyaggr3g470r/static/css/side-nav.css
@@ -0,0 +1,50 @@
+/* First level of nav */
+.sidenav {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding-top:    10px;
+    padding-bottom: 0px;
+    overflow-y: auto;
+    height: 90%;
+    z-index: 1000;
+    background-color: #FFFFFF;
+    border-radius: 2px;
+    font-size: 100%;
+}
+/* All levels of nav */
+.sidebar .nav > li > a {
+    display: block;
+    color: #3572B0;
+    padding: 5px 20px;
+}
+.sidebar .nav > li > a:hover,
+.sidebar .nav > li > a:focus {
+    text-decoration: none;
+    background-color: #F0FFFF;
+}
+
+.sidebar .nav > .active > a,
+.sidebar .nav > .active:hover > a,
+.sidebar .nav > .active:focus > a {
+    font-weight: bold;
+    color: #3572B0;
+    background-color: transparent;
+}
+
+.badge {
+    background-color: #3572B0;
+}
+
+/* Nav: second level */
+.sidebar .nav .nav {
+    margin-bottom: 8px;
+}
+.sidebar .nav .nav > li > a {
+    padding-top:    3px;
+    padding-bottom: 3px;
+    font-size: 80%;
+}
+
+li.feed-commands {display: none; text-align: right;}
+li.feed-commands > span > a {margin-right: 10px;}
+li.feed-menu:hover + li.feed-commands, li.feed-commands:hover {display: block;}