diff options
| author | rubenwardy <rw@rubenwardy.com> | 2018-05-18 00:16:10 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2018-05-18 00:16:10 +0100 |
| commit | fe53b6f3f3c49d4ad152516ed367c1005df0a50a (patch) | |
| tree | a4520b416c92b1755d1da3aa57ff8b3e830da6d4 /app/templates | |
| parent | 57c43e7994d1615d4d9d0d6c062239cd721f0b7b (diff) | |
| download | cheatdb-fe53b6f3f3c49d4ad152516ed367c1005df0a50a.tar.xz | |
Improve CSS and overall design
Diffstat (limited to 'app/templates')
| -rw-r--r-- | app/templates/base.html | 101 | ||||
| -rw-r--r-- | app/templates/index.html | 19 |
2 files changed, 66 insertions, 54 deletions
diff --git a/app/templates/base.html b/app/templates/base.html index 504563e..050448b 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -12,65 +12,66 @@ <body> <nav> - <ul class="nav navbar-nav navbar-left"> - <li><a href="/"><img src="/static/logo_dark.svg" /></a></li> - {% for item in current_menu.children recursive %} - {% if item.visible %} - <li{% if item.children %} class="dropdown"{% endif %}> - <a href="{{ item.url }}" + <div class="container"> + <ul class="nav navbar-nav navbar-left"> + <li><a href="/"><img src="/static/logo_dark.svg" /></a></li> + {% for item in current_menu.children recursive %} + {% if item.visible %} + <li{% if item.children %} class="dropdown"{% endif %}> + <a href="{{ item.url }}" + {% if item.children %} + class="dropdown-toggle" + data-toggle="dropdown" + role="button" + aria-expanded="false" + {% endif %}> + {{ item.text }} {% if item.children %} - class="dropdown-toggle" - data-toggle="dropdown" - role="button" - aria-expanded="false" - {% endif %}> - {{ item.text }} + <span class="caret"></span> + {% endif %} + </a> {% if item.children %} - <span class="caret"></span> + <ul class="dropdown-menu" role="menu"> + {{ loop(item.children) }} + </ul> {% endif %} - </a> - {% if item.children %} + </li> + {% endif %} + {% endfor %} + </ul> + <ul class="nav navbar-nav navbar-right"> + {% if current_user.is_authenticated %} + <li><a href="{{ url_for('notifications_page') }}">({{ current_user.notifications | length }})</a></li> + <li><a href="{{ url_for('create_edit_package_page') }}">+</a></li> + <li class="dropdown"> + <a href="{{ url_for('user_profile_page', username=current_user.username) }}" + class="dropdown-toggle" + data-toggle="dropdown" + role="button" + aria-expanded="false">{{ current_user.display_name }} + <span class="caret"></span></a> + <ul class="dropdown-menu" role="menu"> - {{ loop(item.children) }} + <li> + <a href="{{ url_for('user_profile_page', username=current_user.username) }}">Profile</a> + </li> + {% if current_user.canAccessTodoList() %} + <li><a href="{{ url_for('todo_page') }}">Work Queue</a></li> + {% endif %} + {% if current_user.rank == current_user.rank.ADMIN %} + <li><a href="{{ url_for('admin_page') }}">Admin</a></li> + {% endif %} + <li><a href="{{ url_for('user.logout') }}">Sign out</a></li> </ul> - {% endif %} </li> + {% else %} + <li><a href="{{ url_for('user.login') }}">Sign in</a></li> {% endif %} - {% endfor %} - </ul> - <ul class="nav navbar-nav navbar-right"> - {% if current_user.is_authenticated %} - <li><a href="{{ url_for('notifications_page') }}">({{ current_user.notifications | length }})</a></li> - <li><a href="{{ url_for('create_edit_package_page') }}">+</a></li> - <li class="dropdown"> - <a href="{{ url_for('user_profile_page', username=current_user.username) }}" - class="dropdown-toggle" - data-toggle="dropdown" - role="button" - aria-expanded="false">{{ current_user.display_name }} - <span class="caret"></span></a> - - <ul class="dropdown-menu" role="menu"> - <li> - <a href="{{ url_for('user_profile_page', username=current_user.username) }}">Profile</a> - </li> - {% if current_user.canAccessTodoList() %} - <li><a href="{{ url_for('todo_page') }}">Work Queue</a></li> - {% endif %} - {% if current_user.rank == current_user.rank.ADMIN %} - <li><a href="{{ url_for('admin_page') }}">Admin</a></li> - {% endif %} - <li><a href="{{ url_for('user.logout') }}">Sign out</a></li> - </ul> - </li> - {% else %} - <li><a href="{{ url_for('user.login') }}">Sign in</a></li> - {% endif %} - </ul> - <div style="clear:both;"></div> + </ul> + <div style="clear:both;"></div> + </div> </nav> - {% block flash_messages %} {%- with messages = get_flashed_messages(with_categories=true) -%} {% if messages %} diff --git a/app/templates/index.html b/app/templates/index.html index 43cd866..62bdb94 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -4,8 +4,9 @@ Dashboard {% endblock %} -{% block content %} - <header> +{% block container %} +<header> + <div class="container"> <h1>Content DB</h1> <p> @@ -19,16 +20,26 @@ Dashboard <input type="text" name="q" value="{{ query or ''}}" /> <input type="submit" value="Search" /> </form> - </header> + </div> +</header> +<main> <ul class="packagegrid"> {% for p in packages %} <li><a href="{{ p.getDetailsURL() }}" style="background-image: url({{ p.getMainScreenshotURL() or '/static/placeholder.png' }});"> - <span>{{ p.title }} by {{ p.author.display_name }}</span> + <div class="packagegridscrub"></div> + <div class="packagegridinfo"> + <h3>{{ p.title }} by {{ p.author.display_name }}</h3> + + <p> + {{ p.shortDesc }} + </p> + </div> </a></li> {% else %} <li><i>No packages available</i></ul> {% endfor %} </ul> +</main> {% endblock %} |