voterunner

commit

1ee6c4f64142f220cf80bb71e945a18b4c1e9dcf

parent

35c7018b5ca2177114a2f420e0da8f1dc04f50e3

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2016-09-11 11:13

use the same css for markdown

Diffstat

8 files changed, 10 insertions, 59 deletions

diff --git a/static/markdown.css b/static/markdown.css

@@ -1,52 +0,0 @@
    1    -1 *{margin:0;padding:0;}
    2    -1 p {
    3    -1     margin:1em 0;
    4    -1     line-height:1.5em;
    5    -1 }
    6    -1 table {
    7    -1     font-size:inherit;
    8    -1     font:100%;
    9    -1     margin:1em;
   10    -1 }
   11    -1 table th{border-bottom:1px solid #bbb;padding:.2em 1em;}
   12    -1 table td{border-bottom:1px solid #ddd;padding:.2em 1em;}
   13    -1 input[type=text],input[type=password],input[type=image],textarea{font: inherit}
   14    -1 select,option{padding:0 .25em;}
   15    -1 optgroup{margin-top:.5em;}
   16    -1 
   17    -1 img{border:0;max-width:100%;}
   18    -1 abbr{border-bottom:none;}
   19    -1 h2,h3{margin:1em 0;}
   20    -1 h1,h2,h3,h4,h5,h6{border:0;}
   21    -1 h1{font-size:170%;border-bottom:4px solid #aaa;padding-bottom:.5em;margin-top:1.5em;}
   22    -1 h1:first-child{margin-top:0;padding-top:.25em;border-top:none;}
   23    -1 h2{font-size:150%;margin-top:1.5em;border-bottom:4px solid #e0e0e0;padding-bottom:.5em;}
   24    -1 h3{margin-top:1em;}
   25    -1 hr{border:1px solid #ddd;}
   26    -1 ul{margin:1em 0 1em 2em;}
   27    -1 ol{margin:1em 0 1em 2em;}
   28    -1 ul li,ol li{margin-top:.5em;margin-bottom:.5em;}
   29    -1 ul ul,ul ol,ol ol,ol ul{margin-top:0;margin-bottom:0;}
   30    -1 blockquote{margin:1em 0;border-left:5px solid #ddd;padding-left:.6em;color:#555;}
   31    -1 dt{font-weight:bold;margin-left:1em;}
   32    -1 dd{margin-left:2em;margin-bottom:1em;}
   33    -1 
   34    -1 body {
   35    -1 	width: 70%;
   36    -1 	min-width: 25em;
   37    -1 	max-width: 70em;
   38    -1 	margin: 2em auto;
   39    -1 	font-family: arial, sans-serif;
   40    -1 }
   41    -1 
   42    -1 code {
   43    -1 	padding: 0 0.2em;
   44    -1 	border-radius: 0.25em !important;
   45    -1 	-moz-border-radius: 0.25em !important;
   46    -1 }
   47    -1 pre code {
   48    -1 	padding: 0;
   49    -1 }
   50    -1 pre {
   51    -1 	overflow: auto;
   52    -1 }

diff --git a/static/markdown.js b/static/markdown.js

@@ -7720,6 +7720,6 @@ var MarkdownIt = require('markdown-it');
 7720  7720 
 7721  7721 var md = new MarkdownIt();
 7722  7722 var element = document.getElementById('markdown');
 7723    -1 element.innerHTML = md.render(element.textContent);
   -1  7723 element.outerHTML = md.render(element.textContent);
 7724  7724 
 7725  7725 },{"markdown-it":5}]},{},[68]);

diff --git a/static/scss/base.scss b/static/scss/base.scss

@@ -13,7 +13,8 @@ textarea {
   13    13 }
   14    14 
   15    15 @media screen {
   16    -1 	html {
   -1    16 	html.voterunner {
   17    17 		background: $color-bg-html;
   -1    18 		font-size: 80%;
   18    19 	}
   19    20 }

diff --git a/static/scss/layout.scss b/static/scss/layout.scss

@@ -4,7 +4,6 @@ html {
    4     4 }
    5     5 
    6     6 body {
    7    -1 	max-width: 90em;
    8     7 	margin: 0 auto;
    9     8 	position: relative;
   10     9 
@@ -21,6 +20,10 @@ body {
   21    20 	}
   22    21 }
   23    22 
   -1    23 .voterunner body {
   -1    24 	max-width: 90em;
   -1    25 }
   -1    26 
   24    27 body > header {
   25    28 	background: $color-link;
   26    29 	text-align: center;

diff --git a/static/scss/style.scss b/static/scss/style.scss

@@ -6,7 +6,6 @@ $color-bg-tint: #c2d5ee;
    6     6 $color-border: #c0c0c0;
    7     7 
    8     8 $padding: 0.4em;
    9    -1 $font-size-max: 80%;
   10     9 
   11    10 @import 'bower_components/mfbs/sass/variables';
   12    11 @import 'bower_components/mfbs/sass/base';

diff --git a/static/src/markdown.js b/static/src/markdown.js

@@ -2,4 +2,4 @@ var MarkdownIt = require('markdown-it');
    2     2 
    3     3 var md = new MarkdownIt();
    4     4 var element = document.getElementById('markdown');
    5    -1 element.innerHTML = md.render(element.textContent);
   -1     5 element.outerHTML = md.render(element.textContent);

diff --git a/tpl/app.html b/tpl/app.html

@@ -1,5 +1,5 @@
    1     1 <!DOCTYPE html>
    2    -1 <html xmlns="http://www.w3.org/1999/xhtml">
   -1     2 <html xmlns="http://www.w3.org/1999/xhtml" class="voterunner">
    3     3 
    4     4 <head>
    5     5 	<meta charset="utf-8">

diff --git a/tpl/markdown.html b/tpl/markdown.html

@@ -5,7 +5,7 @@
    5     5 	<meta charset="utf-8">
    6     6 	<title>voterunner</title>
    7     7 	<link rel="shortcut icon" href="/favicon.ico"/>
    8    -1 	<link rel="stylesheet" type="text/css" href="/markdown.css" />
   -1     8 	<link rel="stylesheet" type="text/css" href="/style.css" />
    9     9 
   10    10 	<meta name="description" content="quick and dirty votes and discussions" />
   11    11 	<meta name="keywords" content="liquid democracy vote discussion" />