diff options
| author | Gustav Eek <gustav.eek@fripost.org> | 2018-12-30 10:26:10 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@fripost.org> | 2018-12-30 10:26:10 +0100 |
| commit | 151ef6437bc2194252f53713f6567e02963c1f7a (patch) | |
| tree | a57f41c33f1403b1d50449221751302ad867bfce /templates | |
| parent | 25395abcb95f1c75950b9f28e68ef2b10d32dba3 (diff) | |
| parent | f7e3f97b71fa71b5880f31f1ea66e35e181a9711 (diff) | |
Merge branch 'master' into contact-procedure-update
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/comment.tmpl | 9 | ||||
| -rw-r--r-- | templates/page.tmpl | 25 |
2 files changed, 6 insertions, 28 deletions
diff --git a/templates/comment.tmpl b/templates/comment.tmpl index 30602eb..f203fa8 100644 --- a/templates/comment.tmpl +++ b/templates/comment.tmpl @@ -1,15 +1,6 @@ <TMPL_IF HTML5><article class="comment row" id="<TMPL_VAR COMMENTID>"> <TMPL_ELSE><div class="comment row" id="<TMPL_VAR COMMENTID>"></TMPL_IF> -<!-- User avatar in a small column on the left --> -<div class="col-md-1 col-sm-1 col-xs-1"> - <TMPL_IF COMMENTAUTHORAVATAR> - <div class="comment-avatar"> - <img src="<TMPL_VAR COMMENTAUTHORAVATAR>" alt="Avatar" class="img-responsive img-circle" /> - </div> - </TMPL_IF> -</div> - <div class="col-md-11 col-sm-11 col-xs-11"> <!-- HEADER: Print the name of the comment poster and the date --> <header class="comment-subject text-muted row" style="margin-bottom:1em;"> diff --git a/templates/page.tmpl b/templates/page.tmpl index 38b4d2c..e8fb12b 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,11 +5,12 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta charset="utf-8" /> <!-- Bootstrap --> - <link rel="stylesheet" href="<TMPL_VAR BASEURL>static/css/bootstrap.min.css"> + <link rel="stylesheet" href="/static/css/bootstrap.min.css"> + <link rel="stylesheet" href="/static/css/fripost.css"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> - <script src="/static/js/html5shiv.min.js"></script> + <script src="/static/js/html5shiv.min.js"></script> <script src="/static/js/respond.min.js"></script> <![endif]--> <TMPL_IF FAVICON> @@ -22,20 +23,6 @@ <TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF> <TMPL_IF META><TMPL_VAR META></TMPL_IF> </head> - <style> - .navbar-fripost { - background-color: inherit; - border-bottom: black thin solid; - border-radius: 0; - margin-top: 1em - } - .navbar-fripost a { - color: black; - } - .navbar-fripost .navbar-toggle .icon-bar { - background-color: black; - } - </style> <body> <div class="container"> <nav class="navbar navbar-fripost" role="navigation"> @@ -135,10 +122,10 @@ <TMPL_IF HISTORYURL> | <span class="glyphicon glyphicon-time"></span> <a href="<TMPL_VAR HISTORYURL>">History</a> </TMPL_IF> - <TMPL_IF GETSOURCEURL> - | <span class="glyphicon glyphicon-file"></span> <a href="<TMPL_VAR GETSOURCEURL>">Source</a> - </TMPL_IF> <TMPL_UNLESS ISWEBSITE> + <TMPL_IF GETSOURCEURL> + | <span class="glyphicon glyphicon-file"></span> <a href="<TMPL_VAR GETSOURCEURL>">Source</a> + </TMPL_IF> <TMPL_IF DISCUSSIONURL> | <span class="glyphicon glyphicon-comment"></span> <a href="<TMPL_VAR DISCUSSIONURL>">Discussion</a> </TMPL_IF> |