From 028845d66a407f8af072c7b11be7be4bb4ae4602 Mon Sep 17 00:00:00 2001 From: sstvinc2 Date: Mon, 13 Feb 2017 19:22:13 -0600 Subject: New layout implemented, plus a CBS fix --- html_template/BAKtemplate.html | 118 +++++++++++++++++++++++++++ html_template/BAKunbiased.css | 104 ++++++++++++++++++++++++ html_template/newtemplate.html | 52 ++++++------ html_template/template.html | 176 ++++++++++++++++++++++++----------------- html_template/testtemplate.css | 136 ------------------------------- html_template/unbiased.css | 89 ++++++++++++++++----- main.py | 4 +- 7 files changed, 422 insertions(+), 257 deletions(-) create mode 100644 html_template/BAKtemplate.html create mode 100644 html_template/BAKunbiased.css delete mode 100644 html_template/testtemplate.css diff --git a/html_template/BAKtemplate.html b/html_template/BAKtemplate.html new file mode 100644 index 0000000..ab1dbb9 --- /dev/null +++ b/html_template/BAKtemplate.html @@ -0,0 +1,118 @@ + + + + + + + UnBiased + + + +
+ unbiased
+ a different way to read the news +

Last updated: xxTimexx

+
+ +
+
+
+ +
+ +
+
xxTitle1-1xx
+ +
xxDesc1-1xx
+
+ +
+ +
+ +
+
xxTitle1-2xx
+ +
xxDesc1-2xx
+
+ +
+ +
+ +
+
xxTitle1-3xx
+ +
xxDesc1-3xx
+
+
+ + + +
+
+ +
+ +
+ Sources: xxSourcesxx +
+ + diff --git a/html_template/BAKunbiased.css b/html_template/BAKunbiased.css new file mode 100644 index 0000000..49b6dce --- /dev/null +++ b/html_template/BAKunbiased.css @@ -0,0 +1,104 @@ +a:link, a:visited, a:hover, a:active { + color: #00f; + text-decoration:none; + } + +#page-header{ + text-align:center; + padding:.5em 0 1em; + margin-bottom:1em; + border-bottom:1px solid #000; +} + +.title{ + font-size:3em; +} + +#title-1{ + font-style:italic; + color:#d00; +} + +#title-2{ + color:#00d; +} + +#subtitle{ + font-size:1.25em; +} + +#timestamp{ + margin:.5em 0 0 0; + font-size:.8em; +} + +#page-container{ + width:1150px; + padding:0 1em; + margin-left:auto; + margin-right:auto; +} + +#top-stories{ + width:1150px; + margin-left:auto; + margin-right:auto; + font-size:1.25em; +} + +.top-story{ + width:350px; + float:left; + margin:0 .5em; +} + +.top-stories-img{ + width:350px; + height:200px; + overflow:hidden; +} + +.top-stories-img img{ + width:100%; + display:block; + vertical-align:text-bottom; +} + +.top-stories-desc{ + font-size:.8em; + padding-top:.5em; +} + +#middle-stories{ + clear:both; + width:1000px; + margin:0 auto; +} + +.middle-story{ + margin:2em 5px; + width:45%; + float:left; + height:100px; +} + +.middle-story img{ + vertical-align:middle; + height:100px; + float:left; + margin-right:1em; +} + +.middle-stories-hed{ + font-size:1.1em; +} + +.middle-story p{ + display:block; +} + +#sources{ + clear:both; + padding-top:4em; + font-size:.8em; +} \ No newline at end of file diff --git a/html_template/newtemplate.html b/html_template/newtemplate.html index e9715fc..7170a4a 100644 --- a/html_template/newtemplate.html +++ b/html_template/newtemplate.html @@ -10,7 +10,7 @@
unbiased
a different way to read the news -

Last updated: xxTimexx

+

Last updated: Mon, Feb 13, 7:51pm EST

@@ -18,38 +18,38 @@
-
+
-
xxTitle1-1xx
+
Rand Paul and Cory Booker push bipartisan effort to limit solitary confinement for juveniles
 -
xxDesc1-1xx
+
Sen. Rand Paul (R-Ky) and Sen …
-
+
-
xxTitle1-2xx
+
Bibi and Donald
 -
xxDesc1-2xx
+
This week, Israel's prime minister will visit Washington and meet with our new president. They will have a complex agenda. Benjamin ...
-
+
-
xxTitle1-3xx
+
David Oyelowo on How to Play a Real King
 -
xxDesc1-3xx
+
He stars in “A United Kingdom,” about the Botswana leader who married a white woman and set off an international crisis.
-
+
-
xxTitle1-4xx
+
Judge orders Ohio village to pay back $3 million to lead-footed drivers
 -
xxDesc1-4xx
+
Speed cameras became a cash cow for the small village of New Miami, Ohio.
@@ -58,49 +58,49 @@
-
+
-
xxTitle2-1xx
+
DHS says 75 percent of those detained in ICE raids last week were ‘criminal aliens’
-
+
-
xxTitle2-2xx
+
Drama grips Trump inner circle, as president charges ahead on agenda
-
+
-
xxTitle2-3xx
+
Ku Klux Klan killing: Frank Ancona's wife and stepson charged - BBC News
-
+
-
xxTitle2-4xx
+
Nearly 190,000 ordered to evacuate in California dam spillway failure
-
+
-
xxTitle2-5xx
+
Jerry Sandusky's son, 41, arrested on child sex charges
-
+
-
xxTitle2-6xx
+
Angry Town Hall Meetings on Health Care Law, and Few Answers
 @@ -144,7 +144,7 @@
- Sources: xxSourcesxx + Sources: BBC US, NBC News, CBS News, The Blaze, Weekly Standard, New York Times, Fox News
diff --git a/html_template/template.html b/html_template/template.html index 94a3796..87e34e8 100644 --- a/html_template/template.html +++ b/html_template/template.html @@ -2,7 +2,6 @@ - UnBiased @@ -15,98 +14,131 @@
-
-
- -
- -
-
xxTitle1-1xx
- -
xxDesc1-1xx
+
+ +
+ +
+
+
xxTitle1-1xx
+ +
xxDesc1-1xx
+
+ +
+ +
+
+
xxTitle1-2xx
+ +
xxDesc1-2xx
+
+ +
+ +
+
+
xxTitle1-3xx
+ +
xxDesc1-3xx
+
+ +
+ +
+
+
xxTitle1-4xx
+ +
xxDesc1-4xx
+
+
-
- -
- + - -
- -
- + + +
+
+
+
xxTitle2-2xx
+
+ + + +
+
+
+
xxTitle2-3xx
+
+ + + +
+
+
+
xxTitle2-4xx
-
xxTitle1-3xx
 -
xxDesc1-3xx
+ + +
+
+
+
xxTitle2-5xx
+
+ + + +
+
+
+
xxTitle2-6xx
+
+ + +
-
- -
- -
-
- -

xxTitle2-1xx

-
+
+
+ xxTitle3-1xx
- - -
-
- - xxTitle2-2xx -
+
+ xxTitle3-2xx
- - -
-
- - xxTitle2-3xx -
+
+ xxTitle3-3xx
- - - -
-
- - xxTitle2-4xx -
+
+ xxTitle3-4xx
- - -
-
- - xxTitle2-5xx -
+
+ xxTitle3-5xx
- - -
-
- - xxTitle2-6xx -
+
+ xxTitle3-6xx
- -
+
+ xxTitle3-7xx +
-
+
+ xxTitle3-8xx +
diff --git a/html_template/testtemplate.css b/html_template/testtemplate.css deleted file mode 100644 index 2cab020..0000000 --- a/html_template/testtemplate.css +++ /dev/null @@ -1,136 +0,0 @@ -/*body{ - width:900px; - margin-left:auto; - margin-right:auto; -}*/ - - -a:link, a:visited, a:hover, a:active { - color: #00f; - text-decoration:none; - } - -#page-header{ - width:100%; - text-align:center; - padding:.5em 0 1em; - margin-bottom:1em; - border-bottom:1px solid #000; -} - -.title{ - font-size:3em; -} - -#title-1{ - font-style:italic; - color:#d00; -} - -#title-2{ - color:#00d; -} - -#subtitle{ - font-size:1.25em; -} - -#timestamp{ - margin:.5em 0 0 0; - font-size:.8em; -} - -#page-container{ - width:900px; - margin-left:auto; - margin-right:auto; -} - -#top-stories{ - width:95%; - display:block; - overflow:auto; - padding:10px; - margin-left:auto; - margin-right:auto; - font-size:1.25em; - text-align:center; -} - -.top-story{ - display:inline-block; - text-align:left; - width:360px; - background:#fff; - margin:10px; - padding:10px; - border:2px solid #ccc; -} - -.top-stories-img{ - width:350px; - height:200px; - overflow:hidden; - background-size: cover; - background-position: center center; - margin:0 auto; -} - -.top-stories-desc{ - font-size:.8em; - padding-top:.5em; -} - -#middle-stories{ - clear:both; - width:500px; - margin:0 auto; - padding:0; - display:block; - overflow:auto; - float:left; -} - -.middle-story{ - margin:5px 10px; - padding:10px; - background:#fff; - border:2px solid #ddd; - width:460px; - float:left; -} - -.middle-stories-img{ - width:150px; - height:100px; - overflow:hidden; - background-size: cover; - background-position: center center; - float:left; -} - -.middle-stories-hed{ - font-size:1.1em; - float:left; - width:300px; -} - -#bottom-stories{ - margin:0 10px; - padding:10px; - display:block; - overflow:auto; - float:left; - width:350px; - border:5px solid #ddd; -} - -.bottom-story{ - padding:15px 0; -} - -#sources{ - clear:both; - padding-top:4em; - font-size:.8em; -} \ No newline at end of file diff --git a/html_template/unbiased.css b/html_template/unbiased.css index ade390b..b632cdd 100644 --- a/html_template/unbiased.css +++ b/html_template/unbiased.css @@ -1,13 +1,26 @@ +/*body{ + width:900px; + margin-left:auto; + margin-right:auto; +}*/ + + +body{ + margin:0; +} + a:link, a:visited, a:hover, a:active { color: #00f; text-decoration:none; } #page-header{ + width:100%; text-align:center; padding:.5em 0 1em; margin-bottom:1em; border-bottom:1px solid #000; + background:#fdf; } .title{ @@ -33,68 +46,102 @@ a:link, a:visited, a:hover, a:active { } #page-container{ - width:1150px; - padding:0 1em; + width:900px; margin-left:auto; margin-right:auto; } #top-stories{ - width:1150px; + width:95%; + display:block; + overflow:auto; + padding:10px; margin-left:auto; margin-right:auto; - font-size:1.25em; + text-align:center; } .top-story{ - width:350px; - float:left; - margin:0 .5em; + display:inline-block; + vertical-align:top; + text-align:left; + width:360px; + height:322px; + overflow:hidden; + background:#fff; + margin:10px; + padding:10px; + border:2px solid #ccc; } .top-stories-img{ width:350px; height:200px; overflow:hidden; + background-size: cover; + background-position: center center; + margin:0 auto; } -.top-stories-img img{ - width:100%; - display:block; - vertical-align:text-bottom; +.top-stories-hed{ + font-weight:bold; + font-size:1.35em; + margin:10px 10px 0; } .top-stories-desc{ - font-size:.8em; + font-size:1em; padding-top:.5em; + margin:0 .75em; } #middle-stories{ clear:both; - width:1000px; + width:500px; margin:0 auto; + padding:0; + display:block; + overflow:auto; + float:left; } .middle-story{ - margin:2em 5px; - width:45%; + margin:5px 10px; + padding:10px; + background:#fff; + border:2px solid #ddd; + width:460px; float:left; - height:100px; } -.middle-story img{ - vertical-align:middle; +.middle-stories-img{ + width:150px; height:100px; + overflow:hidden; + background-size: cover; + background-position: center center; float:left; - margin-right:1em; } .middle-stories-hed{ - font-size:1.1em; + font-size:1.2em; + float:left; + width:300px; + margin-left:10px; } -.middle-story p{ +#bottom-stories{ + margin:0 10px; + padding:10px; display:block; + overflow:auto; + float:left; + width:350px; + border:5px solid #ddd; +} + +.bottom-story{ + padding:15px 0; } #sources{ diff --git a/main.py b/main.py index b18e6ce..3a22875 100644 --- a/main.py +++ b/main.py @@ -38,10 +38,10 @@ def run(): sourceList.append(NewsSource('CBS News', 'http://cbsnews.com', - ['', '' + None, None, #'Big News Area Side Assets', '' 'Big News Area Side Assets', '
', None, None)) -- cgit v1.2.3