Commit 45397999 authored by Sacha's avatar Sacha Committed by SXibolet@2PITAU
Browse files

design cleanup

parent 38db62f4
......@@ -99,10 +99,9 @@ def login(username):
session['user'] = db.dump_user(form.username)
return redirect('/')
return render_template('login.html',
title='Login',
title='login',
form=form,
css=digest('login.css'),
js=digest('login.js'),
username=username or '')
......@@ -114,7 +113,7 @@ def register():
flash("thanks, %s; please confirm your password" % first_name(form.name.data))
return redirect('login/%s' % form.username)
return render_template('register.html',
title='Register',
title='register',
form=form,
css=digest('login.css'),
logged_in = loggedin())
......
......@@ -111,7 +111,7 @@ class Article(object):
self.source = j['source']
self.byline = j['byline']['original'] if (j['byline']) else None
self.url = j['web_url']
self.xlarge = 'https://www.nytimes.com/%s' % j['multimedia'][1]['url'] if len(j['multimedia']) > 1 else None
self.xlarge = 'https://www.nytimes.com/%s' % j['multimedia'][0]['url'] if len(j['multimedia']) > 1 else None
self.published = j['pub_date'][:10]
self.full = self._full_text(training)
self.training = training
......
......@@ -37,21 +37,26 @@ ul#articles {
}
}
p.url {
padding: 7px 5px 0px 5px;
border-top: 1px solid #e5e5e5;
margin: 0;
border-top: 1px solid #ddd;
font-style: italic;
text-align: center;
text-align: right;
background: #eee;
a {
width: 100%;
border-bottom: none;
}
a:after {
content: '\20\2192'
content: 'read \20\2192'
}
}
img { width: 100%; }
}
div.most-controversial {
border: 2px solid $mad;
//border: 2px solid $mad;
}
div.least-controversial {
border: 2px solid $happy;
//border: 2px solid $happy;
}
}
}
......
@import 'reset';
@import 'vars';
body {
font-family: "Palatino LT", "Palatino Linotype", Palatino, Baskerville, "Bodoni MT", Garamond, Trebuchet, serif !important;
font-family: $serif;
font-variant-numeric: oldstyle-nums diagonal-fractions slashed-zero;
text-rendering: optimizeLegibility;
font-size: 1em;
font-size: 0.9em;
word-wrap: break-word;
}
h1, h2, h3, h4, h5 {
font-family: "Zapf Humanist 601", Optima, "Nunito Sans", "Optima Nova", "URW Imperial", Amira, "Chianti BT", sans-serif !important;
input, .sans, .logo, h1, h2, h3, h4, h5 {
font-family: $sans_serif;
}
.logo, h1, h2, h3, h4, h5 {
font-weight: 700 !important;
}
h1, h2, h3, h4, h5 {
......
$serif: 'Libre Baskerville', 'Palatino', 'Garamond', serif;
$sans_serif: 'Zapf Humanist 601', 'Optima', 'Nunito Sans', sans-serif;
$grey: #d9d9d9; // well, grey
$mad: #f90101; // red
$warn: #edb43a; // yellow
......
This diff is collapsed.
......@@ -9,7 +9,7 @@ ul {
float: right;
text-align: right; }
}
h3 {
h2 {
border-bottom: 1px dashed $grey;
padding: 5px;
font-variant: small-caps;
......
This diff is collapsed.
html,ul,body,header,input,span,form{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;-webkit-text-size-adjust:100%}body{font-family:"Palatino LT", "Palatino Linotype", Palatino, Baskerville, "Bodoni MT", Garamond, Trebuchet, serif !important;font-variant-numeric:oldstyle-nums diagonal-fractions slashed-zero;text-rendering:optimizeLegibility;font-size:1em;word-wrap:break-word}h1,h2,h3,h4,h5{font-family:"Zapf Humanist 601", Optima, "Nunito Sans", "Optima Nova", "URW Imperial", Amira, "Chianti BT", sans-serif !important;font-weight:700 !important}h1,h2,h3,h4,h5{text-transform:uppercase}h1{font-size:130%}h2{font-size:110%}h3{font-size:90%}h4{font-size:75%}h5{font-size:60%}input{outline:0;box-shadow:none;-webkit-tap-highlight-color:transparent}img{max-width:100%;height:auto;margin:auto}a{-webkit-tap-highlight-color:transparent;text-decoration:none;color:inherit;border-bottom:1px dotted;line-height:130%;word-wrap:break-word}a:hover,a:active{color:#ed0000;border-bottom:1px solid;text-decoration:none}input.field{padding:6px 12px;color:#555;border-bottom:1px dashed #d9d9d9;-webkit-border-radius:1px;-moz-border-radius:1px;-ms-border-radius:1px;border-radius:1px;margin:0 auto;margin-bottom:5px;height:20px;width:70%;text-align:center}input[type="submit"]{cursor:pointer;min-width:100px;height:40px;color:#333;padding:4px;outline:0;border-radius:0;-webkit-appearance:none;-webkit-transition:all 0.15s ease-in-out 0s;-moz-transition:all 0.15s ease-in-out 0s;-ms-transition:all 0.15s ease-in-out 0s;transition:all 0.15s ease-in-out 0s;background-color:#e9e9e9;border:1px solid #c3c3c3}input[type="submit"]:hover{border-color:#a3a3a3}input[type="submit"]:focus,input[type="submit"]:active{outline:0}input[type="submit"]:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}input::-moz-focus-inner{border:0}footer{margin:5em 0 0.5em 0;width:95%;color:#b0b0b0;font-size:12px;text-align:center}footer p{padding-top:10px;line-height:150%}div#message,div#error{position:fixed;font-size:90%;overflow:hidden;padding:3px;top:0;background-color:#a3a3a3;color:#fff;text-align:center;width:100%}div#message a,div#error a{color:#fff}div#error{background-color:#edb43a}@media (max-width: 400px){div#error,div#message,div#error{font-size:smaller;opacity:0.9}}ul#articles,ul#tweets{list-style:none}ul#articles li,ul#tweets li{page-break-inside:avoid;-webkit-column-break-inside:avoid;-moz-column-break-inside:avoid;-ms-column-break-inside:avoid;column-break-inside:avoid;break-inside:avoid-column}ul#articles li div.article,ul#tweets li div.tweet{background-color:#fff;border:2px solid #efefef;font-size:14px;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px}ul#articles{-webkit-column-gap:10px;-moz-column-gap:10px;column-gap:10px;-webkit-column-width:350px;-moz-column-width:350px;column-width:350px}ul#articles li{width:100%;margin-bottom:2em}ul#articles li div.article p{padding:5px}ul#articles li div.article a.title{padding:3px 5px 5px 5px;margin-top:5px;margin-bottom:2px;font-size:28px;display:block;border-bottom:none}ul#articles li div.article a.title:hover{color:#000}ul#articles li div.article p.url{padding:7px 5px 0px 5px;border-top:1px solid #e5e5e5;font-style:italic;text-align:center}ul#articles li div.article p.url a:after{content:" →"}ul#articles li div.article img{width:100%}ul#articles li div.most-controversial{border:2px solid #f90101}ul#articles li div.least-controversial{border:2px solid #00933b}ul#tweets{margin-top:2em;-webkit-column-width:150px;-moz-column-width:150px;column-width:150px;-webkit-column-gap:5px;-moz-column-gap:5px;column-gap:5px}ul#tweets li{width:100%;margin-bottom:5px}ul#tweets li div.tweet{padding:2px;overflow:hidden}ul#tweets li div.tweet a{color:inherit;text-decoration:none}ul#tweets li div.mad{border:2px solid #f90101}ul#tweets li div.happy{border:2px solid #00933b}footer{display:none}header{z-index:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;cursor:default;width:100%;height:55px;line-height:55px;background:#fff;border-bottom:1px solid #efefef;position:fixed}header a{-webkit-touch-callout:none}header>div{padding:0 15px 0 5px;display:inline}header>div>a.mini{display:none}header>div h1{text-align:left;display:inline;font-size:1.2em}header>div span#subtitle{opacity:0.4;padding-left:5px;font-size:smaller;font-style:italic}header>div span#right-header{float:right;padding-right:10px}header>div span#article_title{font-style:italic}header>div form{display:inline}header>div>form input{padding:6px 12px;line-height:1.5;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px;border-bottom:1px solid #d9d9d9;margin:0 auto;height:15px;width:30%}header input[type='text'].top_loading{background:url("img/loading.gif") no-repeat;background-position:98% 50%;background-size:20px 20px}header#sub{height:25px;line-height:25px;background:#f1f8fb;overflow:auto;white-space:nowrap;overflow-y:hidden;color:#2b6dad;border-bottom:1px solid #efefef;position:fixed;top:56px;min-width:100%;text-align:center;font-size:smaller;font-style:italic}main{padding:4em 1em}main input.loading{background:url("img/loading.gif") no-repeat;background-size:20px 20px;padding:10px 10px 10px 36px;background-position:10% 50%}main>form{margin-bottom:10px;text-align:center}main>form input[type="text"]{margin-bottom:10px;width:275px;border-bottom:1px solid #d9d9d9}main div.featured_keywords{display:table;padding-bottom:1em;margin:0 auto}main div.featured_keywords dl.left{float:left;width:50%}main div.featured_keywords dl.right{float:right;width:50%}main div.featured_keywords dt{float:left;width:7.5em;padding:1ex .5em 0 .5em;text-align:right;font-weight:bold}main div.featured_keywords dd{margin:0 0 0 8.5em;padding:1ex 0.5em;text-align:left;border-left:1px solid #888}main div.featured_keywords dd span{white-space:nowrap}main ul.details{-webkit-column-break-inside:avoid;-moz-column-break-inside:avoid;-ms-column-break-inside:avoid;column-break-inside:avoid;list-style:none;margin:0 0 10px 0;padding:0}main ul.details li{display:inline}main ul.details li>span{line-height:30px;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px;border:1px solid #d9d9d9;padding:2px}main article{text-align:justify;line-height:150%}main article a,main article a:hover,main article a:active{border-bottom:none;color:#fff;background-color:#337ab7}main article a{text-decoration:none;font-weight:700}main article a:hover,main article a:active{background-color:#2e6da4}main article+p{-webkit-transition:all 0.3s ease-in-out 0s;-moz-transition:all 0.3s ease-in-out 0s;-ms-transition:all 0.3s ease-in-out 0s;transition:all 0.3s ease-in-out 0s;opacity:0.6}main article+p:hover{opacity:1.0}main mark{line-height:25px;color:#2b6dad;background-color:#f1f8fb;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px;padding:2px}main .disabled{cursor:not-allowed;background-color:#f9f9f9}main .disabled:active{color:#fff;background-color:#edb43a}span.danger{color:#fff;background-color:#d43f3a;padding:2px;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px}figcaption{margin:10px 0 10px 0}@media (max-width: 700px){header>div span#right-header,header>div>a{font-size:12px}header#sub{font-size:12px;top:41px}.non-essentials{display:none}header{height:40px;line-height:40px}header h1{font-size:.7em}}@media (max-width: 620px){main div.featured_keywords dt{writing-mode:vertical-rl}}@media (max-width: 520px){main div.featured_keywords dl.left,main div.featured_keywords dl.right{float:none}span.danger{display:block}input[type='text'].top_loading{height:40px}}@media (max-width: 415px){header>div>a.mini{display:inline}header>div>a.lg{display:none}}
html,ul,body,header,input,span,form{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;-webkit-text-size-adjust:100%}body{font-family:"Libre Baskerville","Palatino","Garamond",serif;font-variant-numeric:oldstyle-nums diagonal-fractions slashed-zero;text-rendering:optimizeLegibility;font-size:0.9em;word-wrap:break-word}input,.sans,.logo,h1,h2,h3,h4,h5{font-family:"Zapf Humanist 601","Optima","Nunito Sans",sans-serif}.logo,h1,h2,h3,h4,h5{font-weight:700 !important}h1,h2,h3,h4,h5{text-transform:uppercase}h1{font-size:130%}h2{font-size:110%}h3{font-size:90%}h4{font-size:75%}h5{font-size:60%}input{outline:0;box-shadow:none;-webkit-tap-highlight-color:transparent}img{max-width:100%;height:auto;margin:auto}a{-webkit-tap-highlight-color:transparent;text-decoration:none;color:inherit;border-bottom:1px dotted;line-height:130%;word-wrap:break-word}a:hover,a:active{color:#ed0000;border-bottom:1px solid;text-decoration:none}input.field{padding:6px 12px;color:#555;border-bottom:1px dashed #d9d9d9;-webkit-border-radius:1px;-moz-border-radius:1px;-ms-border-radius:1px;border-radius:1px;margin:0 auto;margin-bottom:5px;height:20px;width:70%;text-align:center}input[type="submit"]{cursor:pointer;min-width:100px;height:40px;color:#333;padding:4px;outline:0;border-radius:0;-webkit-appearance:none;-webkit-transition:all 0.15s ease-in-out 0s;-moz-transition:all 0.15s ease-in-out 0s;-ms-transition:all 0.15s ease-in-out 0s;transition:all 0.15s ease-in-out 0s;background-color:#e9e9e9;border:1px solid #c3c3c3}input[type="submit"]:hover{border-color:#a3a3a3}input[type="submit"]:focus,input[type="submit"]:active{outline:0}input[type="submit"]:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}input::-moz-focus-inner{border:0}footer{margin:5em 0 0.5em 0;width:95%;color:#b0b0b0;font-size:12px;text-align:center}footer p{padding-top:10px;line-height:150%}div#message,div#error{position:fixed;font-size:90%;overflow:hidden;padding:3px;top:0;background-color:#a3a3a3;color:#fff;text-align:center;width:100%}div#message a,div#error a{color:#fff}div#error{background-color:#edb43a}@media (max-width: 400px){div#error,div#message,div#error{font-size:smaller;opacity:0.9}}ul#articles,ul#tweets{list-style:none}ul#articles li,ul#tweets li{page-break-inside:avoid;-webkit-column-break-inside:avoid;-moz-column-break-inside:avoid;-ms-column-break-inside:avoid;column-break-inside:avoid;break-inside:avoid-column}ul#articles li div.article,ul#tweets li div.tweet{background-color:#fff;border:2px solid #efefef;font-size:14px;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px}ul#articles{-webkit-column-gap:10px;-moz-column-gap:10px;column-gap:10px;-webkit-column-width:350px;-moz-column-width:350px;column-width:350px}ul#articles li{width:100%;margin-bottom:2em}ul#articles li div.article p{padding:5px}ul#articles li div.article a.title{padding:3px 5px 5px 5px;margin-top:5px;margin-bottom:2px;font-size:28px;display:block;border-bottom:none}ul#articles li div.article a.title:hover{color:#000}ul#articles li div.article p.url{margin:0;border-top:1px solid #ddd;font-style:italic;text-align:right;background:#eee}ul#articles li div.article p.url a{width:100%;border-bottom:none}ul#articles li div.article p.url a:after{content:"read →"}ul#articles li div.article img{width:100%}ul#tweets{margin-top:2em;-webkit-column-width:150px;-moz-column-width:150px;column-width:150px;-webkit-column-gap:5px;-moz-column-gap:5px;column-gap:5px}ul#tweets li{width:100%;margin-bottom:5px}ul#tweets li div.tweet{padding:2px;overflow:hidden}ul#tweets li div.tweet a{color:inherit;text-decoration:none}ul#tweets li div.mad{border:2px solid #f90101}ul#tweets li div.happy{border:2px solid #00933b}footer{display:none}header{z-index:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;cursor:default;width:100%;height:55px;line-height:55px;background:#fff;border-bottom:1px solid #efefef;position:fixed}header a{-webkit-touch-callout:none}header>div{padding:0 15px 0 5px;display:inline}header>div>a.mini{display:none}header>div h1{text-align:left;display:inline;font-size:1.2em}header>div span#subtitle{opacity:0.4;padding-left:5px;font-size:smaller;font-style:italic}header>div span#right-header{float:right;padding-right:10px}header>div span#article_title{font-style:italic}header>div form{display:inline}header>div>form input{padding:6px 12px;line-height:1.5;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px;border-bottom:1px solid #d9d9d9;margin:0 auto;height:20px;width:30%}header input[type='text'].top_loading{background:url("img/loading.gif") no-repeat;background-position:98% 50%;background-size:20px 20px}header#sub{height:25px;line-height:25px;background:#ffecec;overflow:auto;white-space:nowrap;overflow-y:hidden;color:#ed0000;border-bottom:1px solid #efefef;position:fixed;top:56px;min-width:100%;text-align:center;font-size:smaller;font-style:italic}main{padding:4em 1em}main input.loading{background:url("img/loading.gif") no-repeat;background-size:20px 20px;padding:10px 10px 10px 36px;background-position:10% 50%}main>form{margin-bottom:10px;text-align:center}main>form input[type="text"]{margin-bottom:10px;width:275px;border-bottom:1px solid #d9d9d9}main div.featured_keywords{display:table;padding-bottom:1em;margin:0 auto}main div.featured_keywords dl.left{float:left;width:50%}main div.featured_keywords dl.right{float:right;width:50%}main div.featured_keywords dt{float:left;width:7.5em;padding:1ex .5em 0 .5em;text-align:right;font-weight:bold}main div.featured_keywords dd{margin:0 0 0 8.5em;padding:1ex 0.5em;text-align:left;border-left:1px solid #888}main div.featured_keywords dd span{white-space:nowrap}main ul.details{-webkit-column-break-inside:avoid;-moz-column-break-inside:avoid;-ms-column-break-inside:avoid;column-break-inside:avoid;list-style:none;margin:0 0 10px 0;padding:0}main ul.details li{display:inline}main ul.details li>span{line-height:30px;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px;border:1px solid #d9d9d9;padding:2px}main article{text-align:justify;line-height:150%}main article a,main article a:hover,main article a:active{border-bottom:none;color:#fff;background-color:#d53f3f}main article a{text-decoration:none;font-weight:700}main article a:hover,main article a:active{background-color:#bf3636}main article+p{-webkit-transition:all 0.3s ease-in-out 0s;-moz-transition:all 0.3s ease-in-out 0s;-ms-transition:all 0.3s ease-in-out 0s;transition:all 0.3s ease-in-out 0s;opacity:0.6}main article+p:hover{opacity:1.0}main mark{line-height:25px;color:#ed0000;background:#ffecec;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px;padding:2px}main .disabled{cursor:not-allowed;background-color:#f9f9f9}main .disabled:active{color:#fff;background-color:#edb43a}span.danger{color:#fff;background-color:#d43f3a;padding:2px;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;border-radius:2px}figcaption{margin:10px 0 10px 0}@media (max-width: 700px){header>div span#right-header,header>div>a{font-size:12px}header#sub{font-size:12px;top:41px}.non-essentials{display:none}header{height:40px;line-height:40px}header h1{font-size:.7em}}@media (max-width: 620px){main div.featured_keywords dt{writing-mode:vertical-rl}}@media (max-width: 520px){main div.featured_keywords dl.left,main div.featured_keywords dl.right{float:none}span.danger{display:block}input[type='text'].top_loading{height:40px}}@media (max-width: 415px){header>div>a.mini{display:inline}header>div>a.lg{display:none}}
/*# sourceMappingURL=home.css.map */
@import 'style';
@import 'cards';
$mark_bg: #f1f8fb;
$mark_txt: #2b6dad;
$mark_bg: #ffecec;
$mark_txt: #ed0000;
$loading_src: 'img/loading.gif';
footer { display: none; }
header {
z-index: 1;
@include user-select(none);
cursor: default;
cursor: default;
width: 100%;
height: $header_height;
line-height: $header_height;
......@@ -45,7 +45,7 @@ header {
@include border-radius(2px);
border-bottom: 1px solid $grey;
margin: 0 auto;
height: 15px;
height: 20px;
width: 30%;
}
......@@ -145,14 +145,14 @@ main {
%def {
border-bottom: none;
color: #fff;
background-color: #337ab7;
background-color: #d53f3f;
}
a {
@extend %def;
text-decoration: none;
font-weight: 700; // controversial sentences
&:hover, &:active {
background-color: #2e6da4;
background-color: #bf3636;
@extend %def;
}
}
......@@ -166,8 +166,8 @@ main {
mark {
line-height: 25px;
color: #2b6dad;
background-color: #f1f8fb;
color: $mark_txt;
background: $mark_bg;
@include border-radius(2px);
padding: 2px;
}
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="500"
height="500"
id="svg2"
version="1.1"
inkscape:version="0.48.5 r10040"
sodipodi:docname="logo.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="375"
inkscape:cy="514.28571"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1366"
inkscape:window-height="702"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-552.36218)">
<path
sodipodi:type="star"
style="fill:#ed0000;fill-opacity:1"
id="path2987"
sodipodi:sides="5"
sodipodi:cx="260"
sodipodi:cy="432.36218"
sodipodi:r1="37.142857"
sodipodi:r2="18.571428"
sodipodi:arg1="0.39479112"
sodipodi:arg2="1.0231097"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="5.781"
d="M 349.13121,429.6771 311.43361,404.94827 423.26673,391.40569 110.54905,425.55978 283.37786,256.6381 134.38522,487.78007 91.259241,215.84582 l 6.054767,267.29481 3.570322,-163.91842 24.68394,166.28637 z"
inkscape:transform-center-x="2.7370149"
inkscape:transform-center-y="-80.549238"
transform="translate(45.71429,434.28572)" />
</g>
</svg>
html,ul,body,header,input,span,form{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;-webkit-text-size-adjust:100%}body{font-family:"Palatino LT", "Palatino Linotype", Palatino, Baskerville, "Bodoni MT", Garamond, Trebuchet, serif !important;font-variant-numeric:oldstyle-nums diagonal-fractions slashed-zero;text-rendering:optimizeLegibility;font-size:1em;word-wrap:break-word}h1,h2,h3,h4,h5{font-family:"Zapf Humanist 601", Optima, "Nunito Sans", "Optima Nova", "URW Imperial", Amira, "Chianti BT", sans-serif !important;font-weight:700 !important}h1,h2,h3,h4,h5{text-transform:uppercase}h1{font-size:130%}h2{font-size:110%}h3{font-size:90%}h4{font-size:75%}h5{font-size:60%}input{outline:0;box-shadow:none;-webkit-tap-highlight-color:transparent}img{max-width:100%;height:auto;margin:auto}a{-webkit-tap-highlight-color:transparent;text-decoration:none;color:inherit;border-bottom:1px dotted;line-height:130%;word-wrap:break-word}a:hover,a:active{color:#ed0000;border-bottom:1px solid;text-decoration:none}input.field{padding:6px 12px;color:#555;border-bottom:1px dashed #d9d9d9;-webkit-border-radius:1px;-moz-border-radius:1px;-ms-border-radius:1px;border-radius:1px;margin:0 auto;margin-bottom:5px;height:20px;width:70%;text-align:center}input[type="submit"]{cursor:pointer;min-width:100px;height:40px;color:#333;padding:4px;outline:0;border-radius:0;-webkit-appearance:none;-webkit-transition:all 0.15s ease-in-out 0s;-moz-transition:all 0.15s ease-in-out 0s;-ms-transition:all 0.15s ease-in-out 0s;transition:all 0.15s ease-in-out 0s;background-color:#e9e9e9;border:1px solid #c3c3c3}input[type="submit"]:hover{border-color:#a3a3a3}input[type="submit"]:focus,input[type="submit"]:active{outline:0}input[type="submit"]:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}input::-moz-focus-inner{border:0}footer{margin:5em 0 0.5em 0;width:95%;color:#b0b0b0;font-size:12px;text-align:center}footer p{padding-top:10px;line-height:150%}div#message,div#error{position:fixed;font-size:90%;overflow:hidden;padding:3px;top:0;background-color:#a3a3a3;color:#fff;text-align:center;width:100%}div#message a,div#error a{color:#fff}div#error{background-color:#edb43a}@media (max-width: 400px){div#error,div#message,div#error{font-size:smaller;opacity:0.9}}html{border-top:3px solid #ed0000}div#login{padding:1px 5px 20px 5px;text-align:center;-webkit-box-shadow:0 1px 2px 2px #eee;-moz-box-shadow:0 1px 2px 2px #eee;-ms-box-shadow:0 1px 2px 2px #eee;box-shadow:0 1px 2px 2px #eee;width:450px;margin:5em auto 0 auto}div#login form{margin-top:10px}div#login center{margin-top:1em}div#login div.g-recaptcha{display:table;margin:0 auto}div#login h2{font-size:1.1em;margin:20px 0 5px 0}@media (max-width: 520px){div#login{width:350px;font-size:14px}div#login input[type="submit"]{height:35px}}@media (max-width: 390px){div#login{width:320px;margin-top:2em}}@media (max-width: 320px){div#login{width:290px;margin:1em auto}html,body{margin:0}}
html,ul,body,header,input,span,form{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;-webkit-text-size-adjust:100%}body{font-family:"Libre Baskerville","Palatino","Garamond",serif;font-variant-numeric:oldstyle-nums diagonal-fractions slashed-zero;text-rendering:optimizeLegibility;font-size:0.9em;word-wrap:break-word}input,.sans,.logo,h1,h2,h3,h4,h5{font-family:"Zapf Humanist 601","Optima","Nunito Sans",sans-serif}.logo,h1,h2,h3,h4,h5{font-weight:700 !important}h1,h2,h3,h4,h5{text-transform:uppercase}h1{font-size:130%}h2{font-size:110%}h3{font-size:90%}h4{font-size:75%}h5{font-size:60%}input{outline:0;box-shadow:none;-webkit-tap-highlight-color:transparent}img{max-width:100%;height:auto;margin:auto}a{-webkit-tap-highlight-color:transparent;text-decoration:none;color:inherit;border-bottom:1px dotted;line-height:130%;word-wrap:break-word}a:hover,a:active{color:#ed0000;border-bottom:1px solid;text-decoration:none}input.field{padding:6px 12px;color:#555;border-bottom:1px dashed #d9d9d9;-webkit-border-radius:1px;-moz-border-radius:1px;-ms-border-radius:1px;border-radius:1px;margin:0 auto;margin-bottom:5px;height:20px;width:70%;text-align:center}input[type="submit"]{cursor:pointer;min-width:100px;height:40px;color:#333;padding:4px;outline:0;border-radius:0;-webkit-appearance:none;-webkit-transition:all 0.15s ease-in-out 0s;-moz-transition:all 0.15s ease-in-out 0s;-ms-transition:all 0.15s ease-in-out 0s;transition:all 0.15s ease-in-out 0s;background-color:#e9e9e9;border:1px solid #c3c3c3}input[type="submit"]:hover{border-color:#a3a3a3}input[type="submit"]:focus,input[type="submit"]:active{outline:0}input[type="submit"]:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}input::-moz-focus-inner{border:0}footer{margin:5em 0 0.5em 0;width:95%;color:#b0b0b0;font-size:12px;text-align:center}footer p{padding-top:10px;line-height:150%}div#message,div#error{position:fixed;font-size:90%;overflow:hidden;padding:3px;top:0;background-color:#a3a3a3;color:#fff;text-align:center;width:100%}div#message a,div#error a{color:#fff}div#error{background-color:#edb43a}@media (max-width: 400px){div#error,div#message,div#error{font-size:smaller;opacity:0.9}}html{border-top:3px solid #ed0000}div#login{padding:1px 5px 20px 5px;text-align:center;-webkit-box-shadow:0 1px 2px 2px #eee;-moz-box-shadow:0 1px 2px 2px #eee;-ms-box-shadow:0 1px 2px 2px #eee;box-shadow:0 1px 2px 2px #eee;width:450px;margin:2em auto 0 auto}div#login form{margin-top:10px}div#login center{margin-top:1em}div#login div.g-recaptcha{display:table;margin:0 auto}div#login h1{font-weight:400 !important;text-transform:none;margin:20px 0 5px 0}div#login h1 b{text-transform:uppercase}div#login .star{color:gold}@media (max-width: 520px){div#login{width:350px;font-size:14px}div#login input[type="submit"]{height:35px}}@media (max-width: 390px){div#login{width:320px;margin-top:2em}}@media (max-width: 320px){div#login{width:290px;margin:1em auto}html,body{margin:0}}
/*# sourceMappingURL=login.css.map */
if (navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') > 0) {
window.location.replace('not-supported');
}
document.getElementsByTagName('form')[0].style.display = 'block';
if (!window.jQuery) {
document.getElementsByTagName('form')[0].style.display = 'none';
document.getElementById('anon_login').style.display = 'none';
}
$(document).ready(function() {
getJSON(function(d) {
issues = d.length;
$("#loading_bugs").hide();
$("#n_bugs")
.show()
.text(issues);
$("#bugs_a").text('Report a bug')
}, function() {
issues = '?';
}, 'https://api.github.com/repos/SXibolet/controversy/issues');
});
function getJSON(callback, failure_callback, url) {
$.getJSON(url, function(data) {
callback(data);
}).fail(function() {
failure_callback();
});
}
......@@ -7,21 +7,35 @@ div#login {
text-align: center;
@include box-shadow(1px, 2px, 2px, #eee);
width: 450px;
margin: 5em auto 0 auto;
form { margin-top: 10px; }
margin: 2em auto 0 auto;
form {
margin-top: 10px;
}
center {
margin-top: 1em;
}
div.g-recaptcha {
display: table;
margin: 0 auto; }
h2 {
font-size: 1.1em;
margin: 20px 0 5px 0; }
margin: 0 auto;
}
h1 {
font-weight: 400 !important;
text-transform: none;
margin: 20px 0 5px 0;
b {
text-transform: uppercase;
}
}
.star {
color: gold;
}
}
@media (max-width: 520px) {
div#login {
input[type="submit"] { height: 35px; }
input[type="submit"] {
height: 35px;
}
width: 350px;
font-size: 14px;
}
......
......@@ -28,7 +28,7 @@ def keyword_trend(keyword, x, y):
ax.set_title('"%s" controversy vs. time' % keyword)
ax.set_ylabel('controversy entropy-based score')
ax.set_xlabel('time')
ax.plot_date(x, y, fmt='bo-')
ax.plot_date(x, y, fmt='bo-', color='#ed0000')
ax.xaxis.set_major_formatter(DateFormatter('%Y-%m-%d'))
ax.grid(True)
......
{% extends "base.html" %}
{% extends 'base.html' %}
{% block content %}
<header>
<div>
<h1>Controversy</h1>
<span id=subtitle class=non-essentials>
hotspots of news articles
</span>
<span id=right-header title="{{ user['Name'] }} at {{ user['School'] }}">
<i class=non-essentials>
{% if user['Logins'] > 1 %}
welcome back, {{ user['Name']|first_name }} &middot;
{% else %}
welcome, {{ user['Name']|first_name }} &middot;
{% endif %}
</i>
<a href="/">&times;</a>
&middot;
<span><a href='../'>&larr; back</a></span>
<span id='right-header'>
{% if user.Id == 'bourbaki@illinois.edu' %}
<a href="/register_anon">register &rarr;</a>
<a href='/register_anon'>register &rarr;</a>
{% else %}
<a href="/logout">logout &rarr;</a>
<a href='/logout'>logout &rarr;</a>
{% endif %}
</span>
</div>
......@@ -27,7 +15,7 @@
<main>
<h3>Query history</h3>
<h2>Query history</h2>
{% if user['Id'] == 'bourbaki@illinois.edu' %}
<i>Anonymous users do not have query histories.</i>
{% else %}
......@@ -53,7 +41,7 @@
{% endif %}
<h3>This account</h3>
<h2>This account</h2>
<p>This account is owned by <b>{{ user['Name'] }}</b> who goes by <b>{{ user['Id'] }}</b> and is ostensibly associated with <b>{{ user['School'] }}</b>.</p>
{% if user['Id'] != 'bourbaki@illinois.edu' %}
<p>You're welcome to close your account. We'll delete anything associated with you. This doesn't include contributions to trending queries, since those are anonymous.</p>
......@@ -80,29 +68,25 @@
{% endif %}
<h3 name=bugs id=bugs>About / Bugs</h3>
<a class="github-button" href="https://github.com/SXibolet/controversy" data-icon="octicon-star" data-style="mega" aria-label="Star SXibolet/controversy on GitHub">Star</a>
<a class="github-button" href="https://github.com/SXibolet/controversy" data-icon="octicon-eye" data-style="mega" aria-label="Watch SXibolet/controversy on GitHub">Watch</a>
<a class="github-button" href="https://github.com/SXibolet/controversy/issues" data-icon="octicon-issue-opened" data-style="mega" data-count-api="/repos/ntkme/github-buttons#open_issues_count" data-count-aria-label="# issues on GitHub" aria-label="Issue SXibolet/controversy on GitHub">Known bugs</a>
<p>This is <b style='font-family:Optima,inherit;'>CONTROVERSY</b>, available <a target=_blank href="http://github.com/SXibolet/controversy">on GitHub</a>.</p>
<h2 name=bugs id=bugs>About / Bugs</h2>
<p>This is <span class='logo'>CONTROVERSY</span>, available <a target='_blank' href='http://github.com/SXibolet/controversy'>on GitHub</a>.</p>
<p>We encrypt passwords with a one-way hash. As of fall 2015, we force SSL as you browse the site.</p>
<p>We'd like to thank the NSF and NIH for supporting this work.</p>
<div>
<p>Found a bug? <a target=_blank href="https://github.com/SXibolet/controversy/issues/new">Please file a report</a>.</p>
<ul ng-controller="IssuesController" class=issues_list>
<p>Found a bug? <a target='_blank' href='https://github.com/SXibolet/controversy/issues/new'>Please file a report</a>.</p>
<ul ng-controller='IssuesController' class='issues_list'>
Known problems &hellip;
{% raw %}
<img ng-src="/static/img/small-loading.gif" ng-show="!issues_loaded" />
<b style="color:#4cae4c" ng-show="issues.length==0 && issues_loaded">none &#10003;</b>
<li ng-show="issues && issues_loaded" ng-repeat="i in issues">
<img ng-src='/static/img/small-loading.gif' ng-show='!issues_loaded' />
<b style='color:#4cae4c' ng-show='issues.length==0 && issues_loaded'>none &#10003;</b>
<li ng-show='issues && issues_loaded' ng-repeat='i in issues'>
<dl>
<dt><sup>#</sup>{{ i.number }} <b>{{ i.title }}</b></dt>
<dd>{{ i.body || 'no details provided' }}<br>{{ i.assignee.login || 'no one'}} was assigned on {{ i.created_at | date:'medium'}}. <small><a target=_blank href="{{ i.html_url }}">View on GitHub</a></small>.</dd>
<dd>{{ i.body || 'no details provided' }}<br>{{ i.assignee.login || 'no one'}} was assigned on {{ i.created_at | date:'medium'}}. <small><a target='_blank' href='{{ i.html_url }}'>View on GitHub</a></small>.</dd>
</dl>
</li>
{% endraw %}
</ul>
</div>
</main>
<script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
{% endblock %}
......@@ -8,23 +8,24 @@
{% if title is defined %}
{{ title }} &mdash;
{% endif %}
CONTROVERSY Project&mdash;hotspots of news articles</title>
CONTROVERSY project &mdash; hotspots of news articles</title>
<meta name="description" content="Hotspots of news articles: joint mining of news text and social media to discover controversial points in news. " />
<meta name=viewport content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link href='//www.cdn.2pitau.org/css/Nunito.css' rel='stylesheet' />
<link rel=icon href="{{ url_for('static', filename='img/fav.ico') }}" />
<link href='//www.cdn.2pitau.org/css/Libre_Baskerville.css' rel='stylesheet' />
<link rel=icon href="{{ url_for('static', filename='img/fav.png') }}" />
<link rel=stylesheet href="{{ css }}" />
{% block content %}{% endblock %}
<footer>
<p>
<i><a href="https://graham.2pitau.org/_static/pdf/big-data-2015.pdf" target=_blank>Hotspots of News Articles: Joint Mining of News Text &amp; Social Media to Discover Controversial Points in News</a></i>
<em><a href='https://graham.2pitau.org/_static/pdf/big-data-2015.pdf' target='_blank'>Hotspots of News Articles: Joint Mining of News Text &amp; Social Media to Discover Controversial Points in News</a></em>
<br>
Ismini Lourentzou, Graham Dyer, Abhishek Sharma, ChengXiang Zhai &mdash; <tt>{lourent2, gdyer2, sharma51, czhai}@illinois.edu</tt> &mdash; University of Illinois, Urbana-Champaign.
<br>
<span style='font-family: Optima;'>CONTROVERSY</span> is a <a href="https://2pitau.org" target=_blank>2PITAU</a> project.
<span class='logo'>CONTROVERSY</span> is a <a href='https://2pitau.org' target='_blank'>2PITAU</a> project.
</p>
</footer>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment