aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/templates/layout.html
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-04-06 10:37:13 +0200
committerFrançois Schmidts <francois.schmidts@gmail.com>2015-04-06 10:37:13 +0200
commit29bb2a36f0b5d1781ab05f1976aa0c5017351807 (patch)
tree52b2dd87f4d36f6a9c518cc14f96e523b1dea045 /pyaggr3g470r/templates/layout.html
parentmisc update (diff)
parentMinor changes to the CSS. (diff)
downloadnewspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.gz
newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.bz2
newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: pyaggr3g470r/controllers/feed.py pyaggr3g470r/templates/home.html
Diffstat (limited to 'pyaggr3g470r/templates/layout.html')
-rw-r--r--pyaggr3g470r/templates/layout.html71
1 files changed, 7 insertions, 64 deletions
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index 6b929bf3..60efa69e 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -11,71 +11,12 @@
<!-- Bootstrap core CSS -->
<link href="{{ url_for('static', filename = 'css/bootstrap.css') }}" rel="stylesheet" media="screen" />
<!-- Add custom CSS here -->
- <style>
- body {
- margin-top: 60px;
- }
- div.top {
- position: relative;
- top:-60px;
- display: block;
- height: 0;
- }
- ul.affix {
- position: fixed;
- top: 0px;
- }
- ul.affix-top {
- position: static;
- }
- ul.affix-bottom {
- position: absolute;
- }
- /* First level of nav */
- .sidenav {
- margin-top: 10px;
- 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: #716b7a;
- padding: 5px 20px;
- }
- .sidebar .nav > li > a:hover,
- .sidebar .nav > li > a:focus {
- text-decoration: none;
- background-color: #e5e3e9;
- }
- .sidebar .nav > .active > a,
- .sidebar .nav > .active:hover > a,
- .sidebar .nav > .active:focus > a {
- font-weight: bold;
- color: #563d7c;
- background-color: transparent;
- }
- /* Nav: second level */
- .sidebar .nav .nav {
- margin-bottom: 8px;
- }
- .sidebar .nav .nav > li > a {
- padding-top: 3px;
- padding-bottom: 3px;
- font-size: 80%;
- }
- </style>
+ <link href="{{ url_for('static', filename = 'css/customized-bootstrap.css') }}" rel="stylesheet" media="screen" />
+ <link href="{{ url_for('static', filename = 'css/side-nav.css') }}" rel="stylesheet" media="screen" />
{% endblock %}
</head>
- <body data-spy="scroll" data-target="#affix-nav">
- <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+ <body>
+ <nav class="navbar navbar-inverse navbar-fixed-top navbar-custom" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -118,7 +59,7 @@
<li><a href="{{ url_for('logout') }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <button class="btn btn-default btn-xs" type="submit"><span class="glyphicon glyphicon-search"></span></button> <b class="caret"></b>
+ <div><span class="glyphicon glyphicon-search"></span>&nbsp;<b class="caret"></b></div>
</a>
<ul class="dropdown-menu">
<li>
@@ -138,6 +79,8 @@
</div><!-- /.container -->
</nav>
+ <br />
+
<div class="container">
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
bgstack15