Skip to content

Commit

Permalink
Bootstrap 4 update
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
@Kwpolska
Kwpolska committed Apr 22, 2018
1 parent 788633f commit 21eb913
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 225 deletions.
40 changes: 8 additions & 32 deletions sites/static/users.css
View file
@@ -1,44 +1,20 @@
ul.pages-line {
list-style: none;
padding-left: 0;
h4.pagelink {
font-size: 1.25rem;
text-align: center;
}

.pages-line div.thumbnail {
height: 150px;
max-height: 150px;
.pages-line div.card {
height: 175px;
max-height: 175px;
overflow: auto;
line-height: 1.3;
background-color: #eff8fd;
border-color: #95c4e1;
}


@media (min-width: 992px) {
.pages-line div.thumbnail {
width: 24.25%;
margin-right: 1%;
}


.pages-line div.thumbnail:last-child {
margin-right: 0;
}
margin-bottom: 30px;
}

.thumbnail p {
div.card p {
margin: 0;
font-size: 10.5pt;
}

.pagelink {
margin-top: -10px;
}

.pages-line div.thumbnail.featured {
background-color: #fffbf0;
border-color: #ffe7a4;
}

.pagelang {
border-bottom: 1px dotted #999;
}
Expand Down
2 changes: 1 addition & 1 deletion sites/static/users.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions templates/add.html
View file
Expand Up @@ -5,15 +5,15 @@
{% csrf_token %}
<div class="form-group">
<label class="control-label col-lg-2" for="inputTitle">Title</label>
<div class="col-lg-5">
<div class="col-lg-10">
<input type="text" class="form-control" name="title" id="inputTitle" placeholder="Title"
required maxlength="100">
<span class="help-block">Should be the same as <tt>BLOG_TITLE</tt>.</span>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-2" for="inputAuthor">Author</label>
<div class="col-lg-5">
<div class="col-lg-10">
<input type="text" class="form-control" name="author" id="inputAuthor" placeholder="Author"
required maxlength="100">
<span class="help-block">Pseudonym, real name, what floats your
Expand All @@ -22,14 +22,14 @@
</div>
<div class="form-group">
<label class="control-label col-lg-2" for="inputURL">URL</label>
<div class="col-lg-5">
<div class="col-lg-10">
<input type="url" class="form-control" name="url" id="inputURL" placeholder="URL" required maxlength="512">
<span class="help-block">Should be the same as <tt>SITE_URL</tt>.</span>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-2" for="inputDescription">Description</label>
<div class="col-lg-5">
<div class="col-lg-10">
<textarea name="description" class="form-control" id="inputDescription" placeholder="Description"
maxlength="250" required rows="5"></textarea>
<span class="help-block">Up to 250 characters. (we’re quite
Expand All @@ -38,15 +38,15 @@
</div>
<div class="form-group">
<label class="control-label col-lg-2" for="inputSource">Site source</label>
<div class="col-lg-5">
<div class="col-lg-10">
<input type="url" class="form-control" name="sourcelink" id="inputSource"
placeholder="Site source" maxlength="512">
<span class="help-block">Link to your site source on GitHub (if any)</span>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-2" for="selectLanguages">Languages</label>
<div class="col-lg-5">
<div class="col-lg-10">
<select multiple name="languages" id="selectLanguages" class="form-control">
{% for l in langs %}
<option value="{{ l.code }}">{{ l }}</option>
Expand All @@ -61,7 +61,7 @@
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-5">
<div class="offset-lg-10 col-lg-10">
<label class="checkbox">
<input name="tos" type="checkbox" required> I agree to the <a href="/tos/">Terms of Service and Privacy Policy</a>.
</label>
Expand Down
198 changes: 72 additions & 126 deletions templates/base.html
View file
@@ -1,154 +1,98 @@
{% load staticfiles %}
<!DOCTYPE html>
<html lang="en">
<html prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article# " lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% block title1 %}{{ title }}{% endblock %} | Some Sites Using Nikola</title>
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">

<link href="https://getnikola.com/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
<link rel="canonical" href="https://users.getnikola.com/">
<link rel="shortcut icon" href="https://getnikola.com/favicon.ico">
<!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]-->

<link href="{% static "users.min.css" %}" rel="stylesheet" type="text/css">
<meta name="author" content="Roberto Alsina, Chris Warrick">
<meta name="theme-color" content="#f5ab14">
<!--[if lt IE 9]><script src="https://getnikola.com/assets/js/html5.js"></script><![endif]-->
</head>
<body><a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<link href="{% static "users.min.css" %}" rel="stylesheet" type="text/css">
<body>
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>

<nav class="navbar navbar-inverse navbar-static-top"><div class="container">
<!-- Menubar -->

<nav class="navbar navbar-expand-md navbar-dark bg-dark static-top mb-4"><div class="container">
<!-- This keeps the margins nice -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="https://getnikola.com/">
<img src="https://getnikola.com/assets/img/logo.svg" alt="Nikola" id="logo"></a>
</div>
<!-- /.navbar-header -->
<div class="collapse navbar-collapse" id="bs-navbar" aria-expanded="false">
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documentation <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="https://getnikola.com/documentation.html"><strong>Documentation Index</strong></a>
</li>
<li>
<a href="https://getnikola.com/getting-started.html"><strong>Getting Started</strong></a>
</li>
<li>
<a href="https://getnikola.com/handbook.html"><strong>Handbook</strong></a>
</li>
<li>
<a href="https://getnikola.com/features/index.html"><strong>Features</strong></a>
</li>
<li>
<a href="https://getnikola.com/conf.html">conf.py</a>
</li>
<li>
<a href="https://getnikola.com/changes.html">Changelog</a>
</li>
<li>
<a href="https://getnikola.com/creating-a-theme.html">Theming Tutorial</a>
</li>
<li>
<a href="https://getnikola.com/theming.html">Theming Reference</a>
</li>
<li>
<a href="https://getnikola.com/extending.html">Extending</a>
</li>
<li>
<a href="https://getnikola.com/internals.html">Internals</a>
</li>
<li>
<a href="https://getnikola.com/creating-a-site-not-a-blog-with-nikola.html">Creating a Site (Not a Blog)</a>
</li>
<li>
<a href="https://getnikola.com/license.html">License</a>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Support &amp; Contact <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="https://github.com/getnikola/nikola/issues">Issue Tracker</a>
</li>
<li>
<a href="https://groups.google.com/group/nikola-discuss">Mailing List</a>
</li>
<li>
<a href="https://twitter.com/GetNikola">Twitter</a>
</li>
<li>
<a href="https://irclogs.getnikola.com/">IRC logs (#nikola@freenode)</a>
</li>
<li>
<a href="https://getnikola.com/contact.html"><strong>All support options</strong></a>
<a class="navbar-brand" href="https://getnikola.com/">
<img src="https://getnikola.com/assets/img/logo.svg" alt="Nikola" id="logo" class="d-inline-block align-top"></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="bs-navbar">
<ul class="navbar-nav mr-auto">
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documentation</a>
<div class="dropdown-menu">
<a href="https://getnikola.com/documentation.html" class="dropdown-item"><strong>Documentation Index</strong></a>
<a href="https://getnikola.com/getting-started.html" class="dropdown-item"><strong>Getting Started</strong></a>
<a href="https://getnikola.com/handbook.html" class="dropdown-item"><strong>Handbook</strong></a>
<a href="https://getnikola.com/features/index.html" class="dropdown-item"><strong>Features</strong></a>
<a href="https://getnikola.com/conf.html" class="dropdown-item">conf.py</a>
<a href="https://getnikola.com/changes.html" class="dropdown-item">Changelog</a>
<a href="https://getnikola.com/creating-a-theme.html" class="dropdown-item">Theming Tutorial</a>
<a href="https://getnikola.com/theming.html" class="dropdown-item">Theming Reference</a>
<a href="https://getnikola.com/extending.html" class="dropdown-item">Extending</a>
<a href="https://getnikola.com/internals.html" class="dropdown-item">Internals</a>
<a href="https://getnikola.com/creating-a-site-not-a-blog-with-nikola.html" class="dropdown-item">Creating a Site (Not a Blog)</a>
<a href="https://getnikola.com/license.html" class="dropdown-item">License</a>
</div>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Add-ons <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="https://themes.getnikola.com">Themes</a>
</li>
<li>
<a href="https://plugins.getnikola.com">Plugins</a>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Support &amp; Contact</a>
<div class="dropdown-menu">
<a href="https://github.com/getnikola/nikola/issues" class="dropdown-item">Issue Tracker</a>
<a href="https://groups.google.com/group/nikola-discuss" class="dropdown-item">Mailing List</a>
<a href="https://twitter.com/GetNikola" class="dropdown-item">Twitter</a>
<a href="https://irclogs.getnikola.com/" class="dropdown-item">IRC logs (#nikola@freenode)</a>
<a href="https://getnikola.com/contact.html" class="dropdown-item"><strong>All support options</strong></a>
</div>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Development <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="https://github.com/getnikola/nikola"><strong>Source code (GitHub)</strong></a>
</li>
<li>
<a href="https://github.com/getnikola/nikola/issues">Issue Tracker</a>
</li>
<li>
<a href="https://getnikola.com/changes.html">Changelog</a>
</li>
<li>
<a href="https://getnikola.com/license.html">License</a>
</li>
<li>
<a href="https://getnikola.com/authors.html">Contributors</a>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Add-ons</a>
<div class="dropdown-menu">
<a href="https://themes.getnikola.com" class="dropdown-item">Themes</a>
<a href="https://plugins.getnikola.com" class="dropdown-item">Plugins</a>
<a href="https://github.com/getnikola/shortcodes" class="dropdown-item">Shortcodes</a>
</div>
</li>
</ul>
</li>
<li>
<a href="https://getnikola.com/blog/index.html">Blog</a>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Development</a>
<div class="dropdown-menu">
<a href="https://github.com/getnikola/nikola" class="dropdown-item"><strong>Source code (GitHub)</strong></a>
<a href="https://github.com/getnikola/nikola/issues" class="dropdown-item">Issue Tracker</a>
<a href="https://getnikola.com/changes.html" class="dropdown-item">Changelog</a>
<a href="https://getnikola.com/license.html" class="dropdown-item">License</a>
<a href="https://getnikola.com/authors.html" class="dropdown-item">Contributors</a>
</div>
</li>
<li class="nav-item">
<a href="blog/index.html" class="nav-link">Blog</a>
</li>
<li class="active">
<a href="/">Users<span class="sr-only"> (active)</span></a>
</li>
</li>
<li class="nav-item">
<a href="/" class="nav-link active">Users<span class="sr-only"> (active)</span></a>


</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav><!-- End of Menubar -->

<div class="container" id="content" role="main">
</nav><!-- End of Menubar --><div class="container" id="content" role="main">
<div class="body-content">
<!--Body content-->
<div class="row">
<ul class="nav nav-pills">
{% for mlink, mtitle, mpage in menu %}
<li role="presentation"{% if mpage == page %} class="active"{% endif %}><a href="{{ mlink }}">{{ mtitle }}</a></li>
<li class="nav-item"><a class="nav-link{% if mpage == page %} active{% endif %}" href="{{ mlink }}">{{ mtitle }}</a></li>
{% endfor %}
</ul>

<h1>{% block title2 %}{{ title }}{% endblock title2 %}</h1>
<h1 class="entry-title">{% block title2 %}{{ title }}{% endblock title2 %}</h1>
{% block subtitle %}{% endblock %}

{% block content %}
Expand All @@ -160,7 +104,9 @@ <h1>{% block title2 %}{{ title }}{% endblock title2 %}</h1>
<p>This site is using cookies for authentication and security purposes.</p>
</footer>
</div>
</div>
<script src="https://getnikola.com/assets/js/all-nocdn.js" type="text/javascript"></script>
{% block extra_js %}{% endblock %}
<script defer src="https://use.fontawesome.com/releases/v5.0.10/js/all.js" integrity="sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+" crossorigin="anonymous"></script>
</body>
</html>

0 comments on commit 21eb913

Please sign in to comment.