From add18f6affd759db8f61ce7494cbcfe05ad06910 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 9 Apr 2017 23:18:25 +0200 Subject: [PATCH] fixup round 3, styles, texts --- .../default_anfahrt/tpl/default_anfahrt.tpl | 2 +- .../page/default_page/css/default_page.css | 227 ++++++------------ .../page/default_page/js/default_page.js | 2 +- .../page/default_page/tpl/friseurteam.tpl | 56 ++--- .../page/default_preise/default_preise.php | 2 +- .../page/default_preise/default_preise.tpl | 2 - .../default_preise/tpl/default_preise.tpl | 3 + friseurteam/sql/mysql/system_text.sql | 34 ++- 8 files changed, 123 insertions(+), 205 deletions(-) delete mode 100644 friseurteam/page/default_preise/default_preise.tpl create mode 100644 friseurteam/page/default_preise/tpl/default_preise.tpl diff --git a/friseurteam/page/default_anfahrt/tpl/default_anfahrt.tpl b/friseurteam/page/default_anfahrt/tpl/default_anfahrt.tpl index d7bf11b..003c8dd 100644 --- a/friseurteam/page/default_anfahrt/tpl/default_anfahrt.tpl +++ b/friseurteam/page/default_anfahrt/tpl/default_anfahrt.tpl @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/friseurteam/page/default_page/css/default_page.css b/friseurteam/page/default_page/css/default_page.css index d378069..632812f 100644 --- a/friseurteam/page/default_page/css/default_page.css +++ b/friseurteam/page/default_page/css/default_page.css @@ -1,6 +1,8 @@ body{ margin: 0; font-family: Helvetica,Arial,sans-serif; + font-style: italic; + font-stretch: semi-expanded; } a { @@ -11,164 +13,77 @@ a { color: #fd4d4a; } -//#footer{ -// width: 100%; -// color: white; -// clear: both; -// font-size: 12px; -//} +h1, h2{ + font-family: HEATHER; + font-size: 30px; +} -//#main{ -// width: 80%; -// margin-left: auto; -// margin-right: auto; -//} +.padding0{ + padding:0 !important; +} -//#static { -// float: right; -//} +.margin0{ + margin:0 !important; +} +#flexsliderheader { + z-index: 0; border:0; +} +#flexsliderheader li img { + height: 300px; + width: 100%; +} -//#map_link { -// height: 110px; -// cursor: pointer; -//} +.navbar-toggle { + background-color: #333 !important; +} -//#content{ -// float: left; -// background-color: #F996AC; -// background-color: rgba(249, 150, 172, 0.6); -// opacity: 0.95; -// width: 61.8%; -// min-height: 500px; -// max-height: 500px; -// overflow-y: scroll; -// border-radius: 0 0 0 5px; -//} -//#menu { -// background-color: #990015; -// clear: both; -//} +#static-img { + border-radius: 5px; + border: 1px solid grey; + margin-top: 15px; +} -//#content_frame { -// margin: 0; -// padding: 0; -// width: 100%; -//} - -//#content_frame_frame { -// margin-left: auto; -// margin-right: auto; -// padding: 0; -// text-align: justify; -// font-size: 105%; -// width: 80%; -//} - -//#info { -// width: 38.2%; -// float: right; -// background-color: rgba(246, 53, 95, 0.8); -// font-weight: bold; -// height: 200px; -//} - -//#info_text { -// padding-top: 20px; -// float: right; -// padding-right: 50px; -// font-weight: bold; -// font-size: 15px; -// line-height: 25px; -//} - -//#logo { -// height: 200px; -// opacity: 1; -// margin: 0; -// width: 61.8%; -// float: left; -//} - -//#menu div{ -// margin: 0; -// padding: 0; -// height: 30px; -// width: 20.6%; -// text-align: center; -// float: left; -// padding-top: 5px; -//} - -//#menu div a{ -// display: block; -// height: 30px; -// color: white; -//} - -//#menu div:hover{ -// background: #EFF0F2; -//} - -//#menu div:hover a{ -// color: #3C85D6; -//} - -//#menu_1{ -// background: #3C85D6;} -//#menu_2{ -// background: #023F83;} -//#menu_3{ -// background: #91B8E4;} -//#angebot{ -// float: left; -// color: white; -// font-weight: bold; -// text-align: center; -// width: 38.2%; -// background-color: #023F83; -// height: 30px; -// padding-top: 5px; -// font-size: 12px; -//} - -//#menu_ul { -// margin: 0; -// padding: 0; -// -//} -//#galleria { -// height: 500px; -// width: 100%; -//} - -//#galleria_container { -// float: left; -// width: 38.2%; -// background-color: rgba(255, 0, 0, 0.3); -// border-radius: 0 0 5px 0; -//} - -//#galleria_container2 { -// float: left; -// width: 38.2%; -//} - -//.info_margin { -// margin-top: 20px; - //margin-left: 30px; -// float: left; -//} - -//#info_zeiten { -// width: auto; -// font-size: 12px; -//} - -//#info_mapfb{ -// width: 50%; -// padding-left: 18px; -//} - -//#top_container{ -// background-color: white; -//} \ No newline at end of file +.navbar-inverse a{ + color: #fd4d4a !important; + font-size: 20px; + font-family: HEATHER; +} +.footer a{ + color: #333; + font-weight: normal; +} +.container { + margin-top: 20px; border: 1px solid darkgrey; margin-bottom: 10px; border-radius: 5px 5px 5px 5px; +} +#brand-img{ + float:left; z-index: 1; position: absolute; margin-top: 25px; width: 300px; +} +#head-div{ + height: 300px; background: black; width: 100%; +} +.navbar { + border-radius: 0 !important; + background-color: #d5d5d5 !important; + border: 0 !important; +} +.navbar-header { + margin-left: 5px; +} +#fb-iframe{ + border:none; overflow:hidden; height:20px; margin: 0; padding: 0; margin-top: 15px; margin-left: 9px; width: 140px; +} +#content-row{ + background-color: beige; color: #333; +} +#content { + border-left: 1px dotted #d5d5d5; +} +.footer { + background-color: #d5d5d5; border-radius: 0 0 5px 5px; +} +#footer-middle { + text-align: center; +} +#footer-right { + text-align: right; +} \ No newline at end of file diff --git a/friseurteam/page/default_page/js/default_page.js b/friseurteam/page/default_page/js/default_page.js index 4e023bd..e0992c8 100644 --- a/friseurteam/page/default_page/js/default_page.js +++ b/friseurteam/page/default_page/js/default_page.js @@ -5,7 +5,7 @@ $(document).ready(function() { $(".navbar-collapse").collapse('hide'); }); - $('.flexsliderheader').flexslider({ + $('#flexsliderheader').flexslider({ animation: "slide", directionNav: false, controlNav: false, diff --git a/friseurteam/page/default_page/tpl/friseurteam.tpl b/friseurteam/page/default_page/tpl/friseurteam.tpl index 8b061a5..255788f 100644 --- a/friseurteam/page/default_page/tpl/friseurteam.tpl +++ b/friseurteam/page/default_page/tpl/friseurteam.tpl @@ -8,40 +8,21 @@ ${page_title} -
+
- -
-
${head_gallery}
+

Friseurteam Angelika Gabriel - Darmstädter Straße 30 - 64673 Zwingenberg - Bergstraße - Friseursalon

+
+
${head_gallery}
-