Code

Django templating#32

Code

Open

catcosmo wants to merge 187 commits intoecprice:masterecprice/newsdiffs:masterfrom NewsdiffsDE:DjangoTemplatingNewsdiffsDE/newsdiffs:DjangoTemplatingCopy head branch name to clipboard

+21,281-8,384

Commits

Commits on Apr 15, 2015

• added gitignore and modified manage.py

  anjakammer

  committed
  573fc22

  Copy full SHA for 573fc22

• Merge pull request #2 from NewsdiffsDE/Setup/Project

  Show description for c6e220e
  thomaspuppe

  committed
  c6e220e

  Copy full SHA for c6e220e

Commits on Apr 28, 2015

• translated article_history_missing.html

  Relana

  committed
  674ef0a

  Copy full SHA for 674ef0a

• Update 404.html

  Relana

  committed
  b1d1b7c

  Copy full SHA for b1d1b7c

• translated 500.html

  Relana

  committed
  5f49eb0

  Copy full SHA for 5f49eb0

• translated about.html

  Relana

  committed
  6082ecd

  Copy full SHA for 6082ecd

• translated article_history.html

  Relana

  committed
  1ca3ea8

  Copy full SHA for 1ca3ea8

• translated article_history.xml

  Relana

  committed
  7abf9ca

  Copy full SHA for 7abf9ca

• translated browse.html

  Relana

  committed
  89e4aad

  Copy full SHA for 89e4aad

• translated browse_base.html

  Relana

  committed
  416b2e7

  Copy full SHA for 416b2e7

• translated contact.html

  Relana

  committed
  e600556

  Copy full SHA for e600556

• translated diffview.html

  Relana

  committed
  9ba5037

  Copy full SHA for 9ba5037

• translated part of examples.html

  Show description for 336fed6
  Relana

  committed
  336fed6

  Copy full SHA for 336fed6

• translated feed.xml

  Relana

  committed
  518efb0

  Copy full SHA for 518efb0

• translated find_by_uri.html

  Relana

  committed
  7d79ccd

  Copy full SHA for 7d79ccd

• edited front.html

  Show description for 6e0bd13
  Relana

  committed
  6e0bd13

  Copy full SHA for 6e0bd13

• translated navigation

  Relana

  committed
  10afc18

  Copy full SHA for 10afc18

• translated upvote.html

  Relana

  committed
  14f67a4

  Copy full SHA for 14f67a4

Commits on Apr 29, 2015

• minor changes like href fixes

  Relana

  committed
  28d69ca

  Copy full SHA for 28d69ca

• corrected Twitterhandle and url

  Relana

  committed
  1fd2e30

  Copy full SHA for 1fd2e30

Commits on May 1, 2015

• deleted images in about and front

  Relana

  committed
  5b142d1

  Copy full SHA for 5b142d1

Commits on May 4, 2015

• corrected some links, deleted unused pages/routing

  anjakammer

  committed
  0ddf9e0

  Copy full SHA for 0ddf9e0

• deleted unused links

  anjakammer

  committed
  d1004ed

  Copy full SHA for d1004ed

• deleted contactForm script

  anjakammer

  committed
  0655d21

  Copy full SHA for 0655d21

• Merge pull request #3 from NewsdiffsDE/Frontend/ContentTranslation

  Show description for 9caa86b
  anjakammer

  committed
  9caa86b

  Copy full SHA for 9caa86b

Commits on May 6, 2015

• added static HTML templates

  PashGit

  committed
  8c3069b

  Copy full SHA for 8c3069b

• Fixed stylesheet link in html files

  PashGit

  committed
  0bb521e

  Copy full SHA for 0bb521e

Commits on May 7, 2015

• modified article-list-page and made diff-list-page to include paulas new nav, search, and footer, included custom css for those two pages, added jquery

  Relana

  committed
  063461e

  Copy full SHA for 063461e

• some major changes in htmls, minor in css

  Relana

  committed
  72bdf07

  Copy full SHA for 72bdf07

Commits on May 8, 2015

• included new index and custom, and old bootstrap

  Relana

  committed
  a99f94b

  Copy full SHA for a99f94b

• Merge pull request #6 from NewsdiffsDE/Frontend/Static-HTML-Templates_article-and-diff-list-pages

  Show description for 1bf663c
  

  paulahaertel

  committed
  1bf663c

  Copy full SHA for 1bf663c

• added colspan for header and footer; changed side-margins for #search-bar and #description to auto

  Relana

  committed
  e027f8d

  Copy full SHA for e027f8d

• Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/NewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates

  

  paulahaertel

  committed
  0d008b6

  Copy full SHA for 0d008b6

• made everything in footer white

  Relana

  committed
  0407f4f

  Copy full SHA for 0407f4f

• Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/NewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates

  

  paulahaertel

  committed
  b385d7b

  Copy full SHA for b385d7b

• changed small things

  Relana

  committed
  f23eed0

  Copy full SHA for f23eed0

• added article details html file

  PashGit

  committed
  ac8c7d2

  Copy full SHA for ac8c7d2

• Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/NewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates

  PashGit

  committed
  1b00752

  Copy full SHA for 1b00752

• Added social media icons

  PashGit

  committed
  8af1557

  Copy full SHA for 8af1557

• Added html and css file for Article display

  PashGit

  committed
  9d716a4

  Copy full SHA for 9d716a4

• Added compare and archive icons

  PashGit

  committed
  19e8e7b

  Copy full SHA for 19e8e7b

Commits on May 10, 2015

• Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/NewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates

  

  paulahaertel

  committed
  df1b67b

  Copy full SHA for df1b67b

• add stylesheet for anything related to searchbar

  

  paulahaertel

  committed
  bc771b7

  Copy full SHA for bc771b7

• add folder for images related to searchbar

  

  paulahaertel

  committed
  2045afc

  Copy full SHA for 2045afc

• Edited Logo font

  PashGit

  committed
  144e202

  Copy full SHA for 144e202

Commits on May 12, 2015

• Please enter the commit message for your changes. Lines startin

  

  paulahaertel

  committed
  cbc07ea

  Copy full SHA for cbc07ea

• set size of items in searchbar

  anjakammer

  committed
  8d08cab

  Copy full SHA for 8d08cab

• foldout under input

  anjakammer

  committed
  59d5cac

  Copy full SHA for 59d5cac

• inserted rows

  anjakammer

  committed
  7ae8c68

  Copy full SHA for 7ae8c68

• checked logic

  anjakammer

  committed
  73ad5ce

  Copy full SHA for 73ad5ce

• Added Buttons on Article Page for prior and next version

  PashGit

  committed
  4e39c75

  Copy full SHA for 4e39c75

Commits on May 13, 2015

• changes on article-list and diff-list html and css, and smaller icons

  Relana

  committed
  f48e6d2

  Copy full SHA for f48e6d2

• cleaned up article-list and diff-list htmls

  Relana

  committed
  c6639ae

  Copy full SHA for c6639ae

Commits on May 14, 2015

• fixed HTML syntax errors

  thomaspuppe

  committed
  9aa7eec

  Copy full SHA for 9aa7eec

• layout with nav, content, sticky footer

  thomaspuppe

  committed
  2b5f428

  Copy full SHA for 2b5f428

• nav styling

  thomaspuppe

  committed
  cc72f38

  Copy full SHA for cc72f38

Commits on May 15, 2015

• use not-fixed-to-top-navbar in index.html, delete searchbar content from custom.css and put it in custom-searchbar.css, modify searchbar code in index.html, create a javascript file for foldout-effect

  

  paulahaertel

  committed
  3d63ead

  Copy full SHA for 3d63ead

Commits on May 16, 2015

• remove unwanted navbar-fixed-top class

  thomaspuppe

  committed
  194e967

  Copy full SHA for 194e967

• added explanation for Bootstrap Grid Layout

  thomaspuppe

  committed
  f5ae3f4

  Copy full SHA for f5ae3f4

• added explanation for article list pages

  thomaspuppe

  committed
  bd3c79b

  Copy full SHA for bd3c79b

Commits on May 18, 2015

• Update ND_2015-05-14_frontent-review.md

  Relana

  committed
  c81c75e

  Copy full SHA for c81c75e

Commits on May 22, 2015

• delete text below search bar and adjusted search bar width

  

  paulahaertel

  committed
  5278e1a

  Copy full SHA for 5278e1a

Commits on May 23, 2015

• adjusted search bar details, tried out new logo, tried out different menu order, fixed small things

  

  paulahaertel

  committed
  f6999ad

  Copy full SHA for f6999ad

• added borders to menu for topic grouping

  

  paulahaertel

  committed
  c795129

  Copy full SHA for c795129

• made technical and visual improvements on border: no accidental pixel shift because all elements have border; aand smaller border

  

  paulahaertel

  committed
  6e62889

  Copy full SHA for 6e62889

Commits on May 25, 2015

• deleted navbar-fixed-top in list-htmls

  Relana

  committed
  f32f88a

  Copy full SHA for f32f88a

• filled list-htmls with 'real' content

  Relana

  committed
  e7b377e

  Copy full SHA for e7b377e

• changed button tags to a tags for Quellen, Vergleichen, Artikelverlauf in list-htmls

  Relana

  committed
  39b6352

  Copy full SHA for 39b6352

• changed another button tag to a tag in diff-list-html

  Relana

  committed
  7f161a6

  Copy full SHA for 7f161a6

• added correct links to source a-tags

  Relana

  committed
  6b7fc08

  Copy full SHA for 6b7fc08

• deleted seperate column for 'Zeitungen/Quelle', put link to newssite in parenthesis instead (as requested in ND_2015-05-14_frontent-review 2d)

  Relana

  committed
  81d9606

  Copy full SHA for 81d9606

• changed structure a little in diff-list

  Relana

  committed
  027029c

  Copy full SHA for 027029c

• Merge pull request #13 from NewsdiffsDE/Frontend/Static-HTML-Templates-Fixes

  Show description for aa19fe4
  PashGit

  committed
  aa19fe4

  Copy full SHA for aa19fe4

• added faq page, added contact page with submit form

  PashGit

  committed
  ae22c1a

  Copy full SHA for ae22c1a

• removed ul- and li-tags in table (as requested in ND_2015-05-14_frontent-review 2d) and changed css accordingly

  Relana

  committed
  9808381

  Copy full SHA for 9808381

• changed some margins, paddings etc. in article-list-page

  Relana

  committed
  1c1a81a

  Copy full SHA for 1c1a81a

Commits on May 27, 2015

• used only 5 menu items in index.html and highlights.html

  

  paulahaertel

  committed
  d2ed002

  Copy full SHA for d2ed002

Commits on May 31, 2015

• removed buttons in table, removed some margins

  Relana

  committed
  9d71bc9

  Copy full SHA for 9d71bc9

• made diff table resposive with bootstrap class

  Relana

  committed
  4a3864d

  Copy full SHA for 4a3864d

• assimilated diff-list to article-list a bit

  Relana

  committed
  3ad9c9f

  Copy full SHA for 3ad9c9f

• changed hrefs, corrected icon association

  Relana

  committed
  7894690

  Copy full SHA for 7894690

Commits on Jun 2, 2015

• css with @media query and removed table-responsive class from diff-list table to get line breaks (no side scrolling)

  Relana

  committed
  5892246

  Copy full SHA for 5892246

Commits on Jun 3, 2015

• changed console.log statement in the javascript file

  

  paulahaertel

  committed
  b820e07

  Copy full SHA for b820e07

• Merge pull request #14 from NewsdiffsDE/Frontend/Static-HTML-Templates-Fixes

  Show description for f1e7337
  

  paulahaertel

  committed
  f1e7337

  Copy full SHA for f1e7337

• icons in links are no longer underlined on :hover

  Relana

  committed
  8a97fd2

  Copy full SHA for 8a97fd2

• added javascript snippet to listen on click of category links - does not work yet

  

  paulahaertel

  committed
  2a235a5

  Copy full SHA for 2a235a5

Commits on Jun 5, 2015

• add foldout functionality to search bar - not 100% done yet

  

  paulahaertel

  committed
  a449bce

  Copy full SHA for a449bce

• shift placeholder text to the right, change colors of foldout links

  

  paulahaertel

  committed
  917dcd9

  Copy full SHA for 917dcd9

• add footer hover color, add general link color settings

  

  paulahaertel

  committed
  c66b8e8

  Copy full SHA for c66b8e8

• add home link to logo

  

  paulahaertel

  committed
  8755725

  Copy full SHA for 8755725

• change link color back to blue

  

  paulahaertel

  committed
  6b0c59a

  Copy full SHA for 6b0c59a

• add about page including sections Einführung, F.A.Q. and Presse - no scrolling yet

  

  paulahaertel

  committed
  0fb8c56

  Copy full SHA for 0fb8c56

• add styling for about page

  

  paulahaertel

  committed
  8355ac0

  Copy full SHA for 8355ac0

• try out solution for toggled navbar problem, add about page link to menu

  

  paulahaertel

  committed
  c6f2e4d

  Copy full SHA for c6f2e4d

• align page content with header and footer

  

  paulahaertel

  committed
  b7938fd

  Copy full SHA for b7938fd

• moved description css to into custom-searchbar.css

  

  paulahaertel

  committed
  610c95c

  Copy full SHA for 610c95c

• add margin to description because container is now container-fluid

  

  paulahaertel

  committed
  bcbf8ad

  Copy full SHA for bcbf8ad

Commits on Jun 8, 2015

• changed bottom margin of searchbar

  

  paulahaertel

  committed
  c4a022e

  Copy full SHA for c4a022e

• changed nothing

  

  paulahaertel

  committed
  17f6ded

  Copy full SHA for 17f6ded

• deleted description text

  

  paulahaertel

  committed
  244ceb1

  Copy full SHA for 244ceb1

• implemented smooth scrolling and submenu - submenu to be discussed

  

  paulahaertel

  committed
  5e914d1

  Copy full SHA for 5e914d1

• styled submenu, optimized section height, took away section coloring

  

  paulahaertel

  committed
  a3fb714

  Copy full SHA for a3fb714

Commits on Jun 15, 2015

• detected unused css rules

  

  paulahaertel

  committed
  c465ea0

  Copy full SHA for c465ea0

• used consistent container, put menu in own container and added a row

  

  paulahaertel

  committed
  bad2374

  Copy full SHA for bad2374

• adjusted padding of logo

  

  paulahaertel

  committed
  d5e1e43

  Copy full SHA for d5e1e43

• deleted unused css rule

  

  paulahaertel

  committed
  6b743e1

  Copy full SHA for 6b743e1

Commits on Jun 17, 2015

• views angepasst

  

  catcosmo

  authored and

  catcosmo

  committed
  d04b476

  Copy full SHA for d04b476

• views angepasst

  

  catcosmo

  authored and

  catcosmo

  committed
  622a7e4

  Copy full SHA for 622a7e4

Commits on Jun 18, 2015

• moved html files to templates, static files to static folder

  

  catcosmo

  authored and

  catcosmo

  committed
  aeb5091

  Copy full SHA for aeb5091

• created headerfooter html for templating

  

  catcosmo

  authored and

  catcosmo

  committed
  34ed007

  Copy full SHA for 34ed007

• built on headerfooter, created favicon

  

  catcosmo

  authored and

  catcosmo

  committed
  ffb866f

  Copy full SHA for ffb866f

• integrated sticky footer styles into custom css

  Relana

  committed
  381f705

  Copy full SHA for 381f705

• added images regex url

  Relana

  committed
  aa62038

  Copy full SHA for aa62038

• added fav, image functionality test

  

  catcosmo

  authored and

  catcosmo

  committed
  99147d6

  Copy full SHA for 99147d6

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  

  catcosmo

  authored and

  catcosmo

  committed
  728db10

  Copy full SHA for 728db10

• tried something else with the img url

  Relana

  committed
  326e9cf

  Copy full SHA for 326e9cf

• images source reference in headerfooter equivalent to styles references

  Relana

  committed
  70bf69f

  Copy full SHA for 70bf69f

• functional templates for header footer and index content

  

  catcosmo

  authored and

  catcosmo

  committed
  8defb90

  Copy full SHA for 8defb90

• entdecken template created and adjusted in views/urls

  

  catcosmo

  authored and

  catcosmo

  committed
  9c44c73

  Copy full SHA for 9c44c73

• templated diff-list-page

  Relana

  committed
  cd84f75

  Copy full SHA for cd84f75

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  Relana

  committed
  ff10271

  Copy full SHA for ff10271

• complete django templating for main menue pages

  

  catcosmo

  authored and

  catcosmo

  committed
  598fdb8

  Copy full SHA for 598fdb8

• uniforming of links and variables

  

  catcosmo

  authored and

  catcosmo

  committed
  9b6e18a

  Copy full SHA for 9b6e18a

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  

  catcosmo

  authored and

  catcosmo

  committed
  c94a23e

  Copy full SHA for c94a23e

• renamed diff-list to article_history in all files

  Relana

  committed
  edf80b2

  Copy full SHA for edf80b2

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  Relana

  committed
  358f160

  Copy full SHA for 358f160

• 'outsourced' the searchbar into an html of its own

  Relana

  committed
  b06e23d

  Copy full SHA for b06e23d

• article-hostory-missing template

  

  catcosmo

  authored and

  catcosmo

  committed
  b0d0ab4

  Copy full SHA for b0d0ab4

Commits on Jun 23, 2015

• fixed social media icons

  

  catcosmo

  authored and

  catcosmo

  committed
  5f7d3d6

  Copy full SHA for 5f7d3d6

• links underlined instead of blue

  

  catcosmo

  authored and

  catcosmo

  committed
  98ea461

  Copy full SHA for 98ea461

Commits on Jun 24, 2015

• start: trying to merge frontend and templates

  

  catcosmo

  authored and

  catcosmo

  committed
  796ae1a

  Copy full SHA for 796ae1a

• url/view einbindung von kontakt/impressum. created impressum.html

  

  catcosmo

  authored and

  catcosmo

  committed
  c774acc

  Copy full SHA for c774acc

• added mac relevant file name

  

  paulahaertel

  committed
  db22d97

  Copy full SHA for db22d97

• merged css

  

  paulahaertel

  committed
  11f3dd4

  Copy full SHA for 11f3dd4

• included about text

  

  paulahaertel

  committed
  aa49e4e

  Copy full SHA for aa49e4e

• specified link coloring for more precision

  

  paulahaertel

  committed
  bcd37bb

  Copy full SHA for bcd37bb

• included heading and floated it with submenu

  

  paulahaertel

  committed
  6a06d84

  Copy full SHA for 6a06d84

• added class

  

  paulahaertel

  committed
  7dcbb8c

  Copy full SHA for 7dcbb8c

• included heading, deleted searchbar, added maincontent class

  

  paulahaertel

  committed
  1d58a3a

  Copy full SHA for 1d58a3a

• article is now diffview

  Relana

  committed
  21aa1f6

  Copy full SHA for 21aa1f6

• url/view changes for unity

  

  catcosmo

  authored and

  catcosmo

  committed
  bbf6a7a

  Copy full SHA for bbf6a7a

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  

  catcosmo

  authored and

  catcosmo

  committed
  b6eb459

  Copy full SHA for b6eb459

• followed bootstrap convention, aligned header

  

  paulahaertel

  committed
  87e8bf3

  Copy full SHA for 87e8bf3

• styling for searchbar dropdown links: cursor, underline

  

  paulahaertel

  committed
  d2c6d6c

  Copy full SHA for d2c6d6c

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  

  catcosmo

  authored and

  catcosmo

  committed
  950a17c

  Copy full SHA for 950a17c

• url/view einbindung von suchergebnissen. anpassung srticle missing

  

  catcosmo

  authored and

  catcosmo

  committed
  749a7e3

  Copy full SHA for 749a7e3

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  Show description for 1a84655
  

  paulahaertel

  committed
  1a84655

  Copy full SHA for 1a84655

• uncommented unneeded styling

  

  paulahaertel

  committed
  f508385

  Copy full SHA for f508385

• began with diffview template

  Relana

  committed
  865d3ed

  Copy full SHA for 865d3ed

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  Relana

  committed
  a28d177

  Copy full SHA for a28d177

• added endblock syntax and corrected icon links

  

  paulahaertel

  committed
  655f407

  Copy full SHA for 655f407

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  Show description for 70fcdea
  

  paulahaertel

  committed
  70fcdea

  Copy full SHA for 70fcdea

• included search, corrected text

  

  paulahaertel

  committed
  dd3890e

  Copy full SHA for dd3890e

• deleted unnecessary css link

  

  paulahaertel

  committed
  72ee430

  Copy full SHA for 72ee430

• updated from static

  

  paulahaertel

  committed
  0f080dc

  Copy full SHA for 0f080dc

• included css to avoid including it in the other html files

  

  paulahaertel

  committed
  b5aaee4

  Copy full SHA for b5aaee4

• deleted margin because text is now below search bar

  

  paulahaertel

  committed
  7dd9d78

  Copy full SHA for 7dd9d78

• included search, updated from static

  

  paulahaertel

  committed
  deffde6

  Copy full SHA for deffde6

• included search correctly, updated from static (align)

  

  paulahaertel

  committed
  5c1cb5b

  Copy full SHA for 5c1cb5b

• included search correctly, updated from static (align), changed title, added text

  

  paulahaertel

  committed
  64ebd0c

  Copy full SHA for 64ebd0c

• included search bar correctly, added breadcrumbs

  

  paulahaertel

  committed
  90ce710

  Copy full SHA for 90ce710

• included search bar correctly, updated from static (align), included breadcrumbs. not tested yet bc not running

  

  paulahaertel

  committed
  c6040ee

  Copy full SHA for c6040ee

• renamed css, updated from static (align), included search

  

  paulahaertel

  committed
  10e45c8

  Copy full SHA for 10e45c8

• did basic set up for file

  

  paulahaertel

  committed
  5df8219

  Copy full SHA for 5df8219

• url/view einbindung von diffview and article_history. update tazparser

  

  catcosmo

  authored and

  catcosmo

  committed
  cb67164

  Copy full SHA for cb67164

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  Show description for b8989b3
  

  catcosmo

  authored and

  catcosmo

  committed
  b8989b3

  Copy full SHA for b8989b3

Commits on Jun 25, 2015

• included scroll javascript

  

  paulahaertel

  committed
  b629763

  Copy full SHA for b629763

• updated icon links, made suchergebisse table responsive

  

  paulahaertel

  committed
  4283b5c

  Copy full SHA for 4283b5c

Commits on Jun 26, 2015

• deleted the questionmark

  Show description for 885a4c5
  Relana

  committed
  885a4c5

  Copy full SHA for 885a4c5

• Moved static tagcloud to Templating branch, Modifications

  PashGit

  committed
  f0d6f43

  Copy full SHA for f0d6f43

• Moved tagcloud css to Templating branch

  PashGit

  committed
  17bb956

  Copy full SHA for 17bb956

• fixed googleapi-links <- those do not need the django template language stuff around them

  Relana

  committed
  4229444

  Copy full SHA for 4229444

• included missing closing-div-tag

  Relana

  committed
  8a3cf01

  Copy full SHA for 8a3cf01

• Changed tagcloud font colors to different shades of grey.

  PashGit

  committed
  67a7327

  Copy full SHA for 67a7327

• put social column on the right hand side (as it was in the static htmls) and aligned it, so it is not apart from everything else

  Relana

  committed
  092adf3

  Copy full SHA for 092adf3

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  Relana

  committed
  5a2ebf0

  Copy full SHA for 5a2ebf0

• changed some selectors and removed border from a's in .cloud ('.maincontent a' from custom.css was favoured over custom-cloud stuff)

  Relana

  committed
  42a8c5f

  Copy full SHA for 42a8c5f

Commits on Jun 27, 2015

• added filter-column

  Relana

  committed
  b28616c

  Copy full SHA for b28616c

Commits on Jun 28, 2015

• added link configuration for archiv

  

  paulahaertel

  committed
  d2afc9d

  Copy full SHA for d2afc9d

• rearranged faq and integrated javascript

  

  paulahaertel

  committed
  e343bd2

  Copy full SHA for e343bd2

• deleted empty statement

  

  paulahaertel

  committed
  02ed5b0

  Copy full SHA for 02ed5b0

• added top identifier for about-scroll-function

  

  paulahaertel

  committed
  d079925

  Copy full SHA for d079925

• separated image from link for css styling

  

  paulahaertel

  committed
  f631fe3

  Copy full SHA for f631fe3

• Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/newsdiffs into DjangoTemplating

  

  paulahaertel

  committed
  68b5fb3

  Copy full SHA for 68b5fb3

• Added categories filter html to Discover

  PashGit

  committed
  0d6fe4e

  Copy full SHA for 0d6fe4e

• Added required css classes for categories filter

  PashGit

  committed
  eda691c

  Copy full SHA for eda691c

Commits on Jun 30, 2015

• safely deleted unused css styling

  

  paulahaertel

  committed
  92ac9f1

  Copy full SHA for 92ac9f1