From: Kai Moritz Date: Sun, 22 Dec 2013 06:57:58 +0000 (+0100) Subject: Sammelseite für HTML-Experimente eingebaut X-Git-Tag: thymeroot-2.0.0~156 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=9d7ce4e0aa83eea667d4c2b2a3f9ae1acbd04895;p=website Sammelseite für HTML-Experimente eingebaut --- diff --git a/src/main/webapp/WEB-INF/templates/maincontent.jsp b/src/main/webapp/WEB-INF/templates/maincontent.jsp index c710ebb6..b8f6e352 100644 --- a/src/main/webapp/WEB-INF/templates/maincontent.jsp +++ b/src/main/webapp/WEB-INF/templates/maincontent.jsp @@ -6,7 +6,7 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim - ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in diff --git a/src/main/webapp/WEB-INF/views/projects.jsp b/src/main/webapp/WEB-INF/views/projects.jsp index 98fbdb4f..2161e9d4 100644 --- a/src/main/webapp/WEB-INF/views/projects.jsp +++ b/src/main/webapp/WEB-INF/views/projects.jsp @@ -22,7 +22,7 @@

  • hibernate4-maven-plugin
  • fix-swf
  • jquery.openx
  • -
  • halbekunst
  • +
  • HTML-Experimente
  • accelerator
  • Typography
  • diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp index ac7cc06b..bcd68e89 100644 --- a/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp +++ b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp @@ -34,9 +34,10 @@
  • jquery.openx
  • -
  • halbekunst
  • +
  • HTML-Experimente
  • accelerator
  • Typography
  • + diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp index 830abc1d..a74f2426 100644 --- a/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp +++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp @@ -35,7 +35,7 @@
  • jquery.openx
  • -
  • halbekunst
  • +
  • HTML-Experimente
  • accelerator
  • Typography
  • diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp index 682be348..84c94736 100644 --- a/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp +++ b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp @@ -35,7 +35,7 @@
  • jquery.openx
  • -
  • halbekunst
  • +
  • HTML-Experimente
  • accelerator
  • Typography
  • diff --git a/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp b/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp new file mode 100644 index 00000000..a273fb65 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp @@ -0,0 +1,40 @@ +<%@page contentType="text/html;charset=UTF-8"%> +<%@page pageEncoding="UTF-8"%> +<%@page session="false" %> +<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %> +<%@taglib uri="http://www.springframework.org/tags" prefix="s"%> + + + + +
  • Home
  • +
  • Projects
  • +
  • HTML-Experimente
  • +
    + +

    Navigation

    + + + + +
    + +
      +
    • bla
    • +
    • blub
    • +
    +
    +
    diff --git a/src/main/webapp/WEB-INF/views/projects/typo.jsp b/src/main/webapp/WEB-INF/views/projects/typo.jsp index 789cb016..a42ff91c 100644 --- a/src/main/webapp/WEB-INF/views/projects/typo.jsp +++ b/src/main/webapp/WEB-INF/views/projects/typo.jsp @@ -26,7 +26,7 @@
  • hibernate4-maven-plugin
  • fix-swf
  • jquery.openx
  • -
  • halbekunst
  • +
  • HTML-Experimente
  • accelerator
  • Typography
  • diff --git a/src/main/webapp/less/screen/layout.less b/src/main/webapp/less/screen/layout.less index ceffeab4..4ef2bbe5 100644 --- a/src/main/webapp/less/screen/layout.less +++ b/src/main/webapp/less/screen/layout.less @@ -8,6 +8,7 @@ body .content { position: relative; + height: 100%; padding-bottom: 7.1875em; /** 115px (gemessene Gesamthöhe des Footers - mit Abstand und Margin) */ } .cols_2 > .content