From ddb13b5ba514d335eb7e73b82f0cdedf5638342c Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 22 Jun 2014 22:12:54 +0200 Subject: [PATCH] friseurteam stylefix, content load --- friseurteam/page/default_page/default_page.css | 9 +++++++-- friseurteam/page/default_page/default_page.js | 2 +- friseurteam/page/default_page/friseurteam.tpl | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/friseurteam/page/default_page/default_page.css b/friseurteam/page/default_page/default_page.css index 7513902..37c1040 100644 --- a/friseurteam/page/default_page/default_page.css +++ b/friseurteam/page/default_page/default_page.css @@ -155,11 +155,16 @@ a { .info_margin { margin-top: 20px; - margin-left: 30px; + //margin-left: 30px; float: left; } #info_zeiten { - width: 230px; + width: auto; font-size: 12px; +} + +#info_mapfb{ + width: 50%; + padding-left: 18px; } \ No newline at end of file diff --git a/friseurteam/page/default_page/default_page.js b/friseurteam/page/default_page/default_page.js index 08c216b..920ee32 100644 --- a/friseurteam/page/default_page/default_page.js +++ b/friseurteam/page/default_page/default_page.js @@ -1,6 +1,6 @@ $(document).ready(function() { $('#menu a').click(function(){ - $('#content').load('./?page='+$(this).attr('page')); + $('#content_frame_frame').load('./?page='+$(this).attr('page')); }); $('#map_link').click(function(){ $('#map_modal').modal(); diff --git a/friseurteam/page/default_page/friseurteam.tpl b/friseurteam/page/default_page/friseurteam.tpl index 26170da..33355f7 100644 --- a/friseurteam/page/default_page/friseurteam.tpl +++ b/friseurteam/page/default_page/friseurteam.tpl @@ -28,7 +28,7 @@
-
+