Skip to content

Commit 21eb913

Browse files
KwpolskaKwpolska
committed
Bootstrap 4 update
Signed-off-by: Chris Warrick <[email protected]>
1 parent 788633f commit 21eb913

File tree

5 files changed

+149
-225
lines changed

5 files changed

+149
-225
lines changed

‎sites/static/users.css

+8-32
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,20 @@
1-
ul.pages-line {
2-
list-style: none;
3-
padding-left: 0;
1+
h4.pagelink {
2+
font-size: 1.25rem;
3+
text-align: center;
44
}
55

6-
.pages-line div.thumbnail {
7-
height: 150px;
8-
max-height: 150px;
6+
.pages-line div.card {
7+
height: 175px;
8+
max-height: 175px;
99
overflow: auto;
10-
line-height: 1.3;
11-
background-color: #eff8fd;
12-
border-color: #95c4e1;
13-
}
14-
15-
16-
@media (min-width: 992px) {
17-
.pages-line div.thumbnail {
18-
width: 24.25%;
19-
margin-right: 1%;
20-
}
21-
22-
23-
.pages-line div.thumbnail:last-child {
24-
margin-right: 0;
25-
}
10+
margin-bottom: 30px;
2611
}
2712

28-
.thumbnail p {
13+
div.card p {
2914
margin: 0;
3015
font-size: 10.5pt;
3116
}
3217

33-
.pagelink {
34-
margin-top: -10px;
35-
}
36-
37-
.pages-line div.thumbnail.featured {
38-
background-color: #fffbf0;
39-
border-color: #ffe7a4;
40-
}
41-
4218
.pagelang {
4319
border-bottom: 1px dotted #999;
4420
}

‎sites/static/users.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/add.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
{% csrf_token %}
66
<div class="form-group">
77
<label class="control-label col-lg-2" for="inputTitle">Title</label>
8-
<div class="col-lg-5">
8+
<div class="col-lg-10">
99
<input type="text" class="form-control" name="title" id="inputTitle" placeholder="Title"
1010
required maxlength="100">
1111
<span class="help-block">Should be the same as <tt>BLOG_TITLE</tt>.</span>
1212
</div>
1313
</div>
1414
<div class="form-group">
1515
<label class="control-label col-lg-2" for="inputAuthor">Author</label>
16-
<div class="col-lg-5">
16+
<div class="col-lg-10">
1717
<input type="text" class="form-control" name="author" id="inputAuthor" placeholder="Author"
1818
required maxlength="100">
1919
<span class="help-block">Pseudonym, real name, what floats your
@@ -22,14 +22,14 @@
2222
</div>
2323
<div class="form-group">
2424
<label class="control-label col-lg-2" for="inputURL">URL</label>
25-
<div class="col-lg-5">
25+
<div class="col-lg-10">
2626
<input type="url" class="form-control" name="url" id="inputURL" placeholder="URL" required maxlength="512">
2727
<span class="help-block">Should be the same as <tt>SITE_URL</tt>.</span>
2828
</div>
2929
</div>
3030
<div class="form-group">
3131
<label class="control-label col-lg-2" for="inputDescription">Description</label>
32-
<div class="col-lg-5">
32+
<div class="col-lg-10">
3333
<textarea name="description" class="form-control" id="inputDescription" placeholder="Description"
3434
maxlength="250" required rows="5"></textarea>
3535
<span class="help-block">Up to 250 characters. (we’re quite
@@ -38,15 +38,15 @@
3838
</div>
3939
<div class="form-group">
4040
<label class="control-label col-lg-2" for="inputSource">Site source</label>
41-
<div class="col-lg-5">
41+
<div class="col-lg-10">
4242
<input type="url" class="form-control" name="sourcelink" id="inputSource"
4343
placeholder="Site source" maxlength="512">
4444
<span class="help-block">Link to your site source on GitHub (if any)</span>
4545
</div>
4646
</div>
4747
<div class="form-group">
4848
<label class="control-label col-lg-2" for="selectLanguages">Languages</label>
49-
<div class="col-lg-5">
49+
<div class="col-lg-10">
5050
<select multiple name="languages" id="selectLanguages" class="form-control">
5151
{% for l in langs %}
5252
<option value="{{ l.code }}">{{ l }}</option>
@@ -61,7 +61,7 @@
6161
</div>
6262
</div>
6363
<div class="form-group">
64-
<div class="col-lg-offset-2 col-lg-5">
64+
<div class="offset-lg-10 col-lg-10">
6565
<label class="checkbox">
6666
<input name="tos" type="checkbox" required> I agree to the <a href="/tos/">Terms of Service and Privacy Policy</a>.
6767
</label>

‎templates/base.html

+72-126
Original file line numberDiff line numberDiff line change
@@ -1,154 +1,98 @@
11
{% load staticfiles %}
22
<!DOCTYPE html>
3-
<html lang="en">
3+
<html prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article# " lang="en">
44
<head>
55
<meta charset="utf-8">
6-
<meta name="viewport" content="width=device-width">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>{% block title1 %}{{ title }}{% endblock %} | Some Sites Using Nikola</title>
8-
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">
9-
108
<link href="https://getnikola.com/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
11-
<link rel="canonical" href="https://users.getnikola.com/">
12-
<link rel="shortcut icon" href="https://getnikola.com/favicon.ico">
13-
<!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]-->
14-
15-
<link href="{% static "users.min.css" %}" rel="stylesheet" type="text/css">
16-
<meta name="author" content="Roberto Alsina, Chris Warrick">
9+
<meta name="theme-color" content="#f5ab14">
10+
<!--[if lt IE 9]><script src="https://getnikola.com/assets/js/html5.js"></script><![endif]-->
1711
</head>
18-
<body><a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
12+
<link href="{% static "users.min.css" %}" rel="stylesheet" type="text/css">
13+
<body>
14+
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
1915

20-
<nav class="navbar navbar-inverse navbar-static-top"><div class="container">
16+
<!-- Menubar -->
17+
18+
<nav class="navbar navbar-expand-md navbar-dark bg-dark static-top mb-4"><div class="container">
2119
<!-- This keeps the margins nice -->
22-
<div class="navbar-header">
23-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false">
24-
<span class="sr-only">Toggle navigation</span>
25-
<span class="icon-bar"></span>
26-
<span class="icon-bar"></span>
27-
<span class="icon-bar"></span>
28-
</button>
29-
<a class="navbar-brand" href="https://getnikola.com/">
30-
<img src="https://getnikola.com/assets/img/logo.svg" alt="Nikola" id="logo"></a>
31-
</div>
32-
<!-- /.navbar-header -->
33-
<div class="collapse navbar-collapse" id="bs-navbar" aria-expanded="false">
34-
<ul class="nav navbar-nav">
35-
<li class="dropdown">
36-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documentation <b class="caret"></b></a>
37-
<ul class="dropdown-menu">
38-
<li>
39-
<a href="https://getnikola.com/documentation.html"><strong>Documentation Index</strong></a>
40-
</li>
41-
<li>
42-
<a href="https://getnikola.com/getting-started.html"><strong>Getting Started</strong></a>
43-
</li>
44-
<li>
45-
<a href="https://getnikola.com/handbook.html"><strong>Handbook</strong></a>
46-
</li>
47-
<li>
48-
<a href="https://getnikola.com/features/index.html"><strong>Features</strong></a>
49-
</li>
50-
<li>
51-
<a href="https://getnikola.com/conf.html">conf.py</a>
52-
</li>
53-
<li>
54-
<a href="https://getnikola.com/changes.html">Changelog</a>
55-
</li>
56-
<li>
57-
<a href="https://getnikola.com/creating-a-theme.html">Theming Tutorial</a>
58-
</li>
59-
<li>
60-
<a href="https://getnikola.com/theming.html">Theming Reference</a>
61-
</li>
62-
<li>
63-
<a href="https://getnikola.com/extending.html">Extending</a>
64-
</li>
65-
<li>
66-
<a href="https://getnikola.com/internals.html">Internals</a>
67-
</li>
68-
<li>
69-
<a href="https://getnikola.com/creating-a-site-not-a-blog-with-nikola.html">Creating a Site (Not a Blog)</a>
70-
</li>
71-
<li>
72-
<a href="https://getnikola.com/license.html">License</a>
73-
</li>
74-
</ul>
75-
</li>
76-
<li class="dropdown">
77-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Support &amp; Contact <b class="caret"></b></a>
78-
<ul class="dropdown-menu">
79-
<li>
80-
<a href="https://github.com/getnikola/nikola/issues">Issue Tracker</a>
81-
</li>
82-
<li>
83-
<a href="https://groups.google.com/group/nikola-discuss">Mailing List</a>
84-
</li>
85-
<li>
86-
<a href="https://twitter.com/GetNikola">Twitter</a>
87-
</li>
88-
<li>
89-
<a href="https://irclogs.getnikola.com/">IRC logs (#nikola@freenode)</a>
90-
</li>
91-
<li>
92-
<a href="https://getnikola.com/contact.html"><strong>All support options</strong></a>
20+
<a class="navbar-brand" href="https://getnikola.com/">
21+
<img src="https://getnikola.com/assets/img/logo.svg" alt="Nikola" id="logo" class="d-inline-block align-top"></a>
22+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false" aria-label="Toggle navigation">
23+
<span class="navbar-toggler-icon"></span>
24+
</button>
25+
26+
<div class="collapse navbar-collapse" id="bs-navbar">
27+
<ul class="navbar-nav mr-auto">
28+
<li class="nav-item dropdown">
29+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documentation</a>
30+
<div class="dropdown-menu">
31+
<a href="https://getnikola.com/documentation.html" class="dropdown-item"><strong>Documentation Index</strong></a>
32+
<a href="https://getnikola.com/getting-started.html" class="dropdown-item"><strong>Getting Started</strong></a>
33+
<a href="https://getnikola.com/handbook.html" class="dropdown-item"><strong>Handbook</strong></a>
34+
<a href="https://getnikola.com/features/index.html" class="dropdown-item"><strong>Features</strong></a>
35+
<a href="https://getnikola.com/conf.html" class="dropdown-item">conf.py</a>
36+
<a href="https://getnikola.com/changes.html" class="dropdown-item">Changelog</a>
37+
<a href="https://getnikola.com/creating-a-theme.html" class="dropdown-item">Theming Tutorial</a>
38+
<a href="https://getnikola.com/theming.html" class="dropdown-item">Theming Reference</a>
39+
<a href="https://getnikola.com/extending.html" class="dropdown-item">Extending</a>
40+
<a href="https://getnikola.com/internals.html" class="dropdown-item">Internals</a>
41+
<a href="https://getnikola.com/creating-a-site-not-a-blog-with-nikola.html" class="dropdown-item">Creating a Site (Not a Blog)</a>
42+
<a href="https://getnikola.com/license.html" class="dropdown-item">License</a>
43+
</div>
9344
</li>
94-
</ul>
95-
</li>
96-
<li class="dropdown">
97-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Add-ons <b class="caret"></b></a>
98-
<ul class="dropdown-menu">
99-
<li>
100-
<a href="https://themes.getnikola.com">Themes</a>
101-
</li>
102-
<li>
103-
<a href="https://plugins.getnikola.com">Plugins</a>
45+
<li class="nav-item dropdown">
46+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Support &amp; Contact</a>
47+
<div class="dropdown-menu">
48+
<a href="https://github.com/getnikola/nikola/issues" class="dropdown-item">Issue Tracker</a>
49+
<a href="https://groups.google.com/group/nikola-discuss" class="dropdown-item">Mailing List</a>
50+
<a href="https://twitter.com/GetNikola" class="dropdown-item">Twitter</a>
51+
<a href="https://irclogs.getnikola.com/" class="dropdown-item">IRC logs (#nikola@freenode)</a>
52+
<a href="https://getnikola.com/contact.html" class="dropdown-item"><strong>All support options</strong></a>
53+
</div>
10454
</li>
105-
</ul>
106-
</li>
107-
<li class="dropdown">
108-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Development <b class="caret"></b></a>
109-
<ul class="dropdown-menu">
110-
<li>
111-
<a href="https://github.com/getnikola/nikola"><strong>Source code (GitHub)</strong></a>
112-
</li>
113-
<li>
114-
<a href="https://github.com/getnikola/nikola/issues">Issue Tracker</a>
115-
</li>
116-
<li>
117-
<a href="https://getnikola.com/changes.html">Changelog</a>
118-
</li>
119-
<li>
120-
<a href="https://getnikola.com/license.html">License</a>
121-
</li>
122-
<li>
123-
<a href="https://getnikola.com/authors.html">Contributors</a>
55+
<li class="nav-item dropdown">
56+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Add-ons</a>
57+
<div class="dropdown-menu">
58+
<a href="https://themes.getnikola.com" class="dropdown-item">Themes</a>
59+
<a href="https://plugins.getnikola.com" class="dropdown-item">Plugins</a>
60+
<a href="https://github.com/getnikola/shortcodes" class="dropdown-item">Shortcodes</a>
61+
</div>
12462
</li>
125-
</ul>
126-
</li>
127-
<li>
128-
<a href="https://getnikola.com/blog/index.html">Blog</a>
63+
<li class="nav-item dropdown">
64+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Development</a>
65+
<div class="dropdown-menu">
66+
<a href="https://github.com/getnikola/nikola" class="dropdown-item"><strong>Source code (GitHub)</strong></a>
67+
<a href="https://github.com/getnikola/nikola/issues" class="dropdown-item">Issue Tracker</a>
68+
<a href="https://getnikola.com/changes.html" class="dropdown-item">Changelog</a>
69+
<a href="https://getnikola.com/license.html" class="dropdown-item">License</a>
70+
<a href="https://getnikola.com/authors.html" class="dropdown-item">Contributors</a>
71+
</div>
72+
</li>
73+
<li class="nav-item">
74+
<a href="blog/index.html" class="nav-link">Blog</a>
12975
</li>
130-
<li class="active">
131-
<a href="/">Users<span class="sr-only"> (active)</span></a>
132-
</li>
133-
</li>
76+
<li class="nav-item">
77+
<a href="/" class="nav-link active">Users<span class="sr-only"> (active)</span></a>
78+
79+
80+
</li>
13481
</ul>
13582
</div>
13683
<!-- /.navbar-collapse -->
13784
</div>
13885
<!-- /.container -->
139-
</nav><!-- End of Menubar -->
140-
141-
<div class="container" id="content" role="main">
86+
</nav><!-- End of Menubar --><div class="container" id="content" role="main">
14287
<div class="body-content">
14388
<!--Body content-->
144-
<div class="row">
14589
<ul class="nav nav-pills">
14690
{% for mlink, mtitle, mpage in menu %}
147-
<li role="presentation"{% if mpage == page %} class="active"{% endif %}><a href="{{ mlink }}">{{ mtitle }}</a></li>
91+
<li class="nav-item"><a class="nav-link{% if mpage == page %} active{% endif %}" href="{{ mlink }}">{{ mtitle }}</a></li>
14892
{% endfor %}
14993
</ul>
15094

151-
<h1>{% block title2 %}{{ title }}{% endblock title2 %}</h1>
95+
<h1 class="entry-title">{% block title2 %}{{ title }}{% endblock title2 %}</h1>
15296
{% block subtitle %}{% endblock %}
15397

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

0 commit comments

Comments
 (0)