diff options
| -rw-r--r-- | pyaggr3g470r/static/css/customized-bootstrap.css | 20 | ||||
| -rw-r--r-- | pyaggr3g470r/static/css/side-nav.css | 40 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/layout.html | 68 |
3 files changed, 65 insertions, 63 deletions
diff --git a/pyaggr3g470r/static/css/customized-bootstrap.css b/pyaggr3g470r/static/css/customized-bootstrap.css index b8222548..9b3c4bec 100644 --- a/pyaggr3g470r/static/css/customized-bootstrap.css +++ b/pyaggr3g470r/static/css/customized-bootstrap.css @@ -1,3 +1,23 @@ +body { + margin-top: 50px; +} +div.top { + position: relative; + top: -50px; + display: block; + height: 0; +} +/*ul.affix { + position: fixed; + top: 0px; +} +ul.affix-top { + position: static; +} +ul.affix-bottom { + position: absolute; +}*/ + .navbar-custom { background-color: #205081; border: #205081; diff --git a/pyaggr3g470r/static/css/side-nav.css b/pyaggr3g470r/static/css/side-nav.css new file mode 100644 index 00000000..50560b3e --- /dev/null +++ b/pyaggr3g470r/static/css/side-nav.css @@ -0,0 +1,40 @@ +/* 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: #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%; +} diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index 12c02814..674c5110 100644 --- a/pyaggr3g470r/templates/layout.html +++ b/pyaggr3g470r/templates/layout.html @@ -10,69 +10,9 @@ <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" /> <!-- Bootstrap core CSS --> <link href="{{ url_for('static', filename = 'css/bootstrap.css') }}" rel="stylesheet" media="screen" /> - <link href="{{ url_for('static', filename = 'css/customized-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> @@ -119,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"> - <div><span class="glyphicon glyphicon-search"></span> <b class="caret"></b></div> + <div><span class="glyphicon glyphicon-search"></span> <b class="caret"></b></div> </a> <ul class="dropdown-menu"> <li> @@ -139,6 +79,8 @@ </div><!-- /.container --> </nav> + <br /> + <div class="container"> {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} |