diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php index 2893bca18..e8e061543 100644 --- a/Controller/DefaultController.php +++ b/Controller/DefaultController.php @@ -8,6 +8,22 @@ class DefaultController extends Controller { public function indexAction() { + $a = array( + array('success', "Message de succès ! "), + array('success',"Un autre message de succès ! "), + array('danger' , "Avert lorem ipsum dolor sit amet spiritur"), + array('danger' ,"Avertum ipsut est amet amergitur tatouari"), + array('info' , "Un message d'information s'affiche."), + array('info' , "Info informitur escept asolitur amet. Sit Roberetur astot.") + ); + + if ($this->getRequest()->query->get('addMessages', 1)) { + foreach ($a as $array) { + $this->get('session')->getFlashBag()->add($array[0], $array[1]); + } + } + + return $this->render('CLChillMainBundle::layout.html.twig'); } } diff --git a/Resources/assets/gumpy/sass/_custom.scss b/Resources/assets/gumpy/sass/_custom.scss index eacc24b55..3c2ecdfd4 100644 --- a/Resources/assets/gumpy/sass/_custom.scss +++ b/Resources/assets/gumpy/sass/_custom.scss @@ -7,10 +7,3 @@ h1,h2,h3,h4,h5,h6 { font-weight: $font-weight-title; } -//correct entypo -@font-face { font-family: "entypo"; font-style: normal; font-weight: 400; - src: url('./../../fonts/icons/entypo.eot'); - src: url("../../fonts/icons/entypo.eot?#iefix") format("ie9-skip-eot"), - url("./../../fonts/icons/entypo.woff") format("woff"), - url("./../../fonts/icons/entypo.ttf") format("truetype"); -} \ No newline at end of file diff --git a/Resources/assets/gumpy/sass/_fonts.scss b/Resources/assets/gumpy/sass/_fonts.scss index 049d315e5..198ca0ad9 100644 --- a/Resources/assets/gumpy/sass/_fonts.scss +++ b/Resources/assets/gumpy/sass/_fonts.scss @@ -15,6 +15,101 @@ url('../fonts/icons/#{$icons}.ttf') format('truetype'); } +$path_to_fonts: "./../../fonts/"; + +//correct entypo +@font-face { + font-family: "entypo"; font-style: normal; font-weight: 400; + src: url('#{$path_to_fonts}icons/entypo.eot'); + src: url("#{$path_to_fonts}icons/entypo.eot?#iefix") format("ie9-skip-eot"), + url("#{$path_to_fonts}icons/entypo.woff") format("woff"), + url("#{$path_to_fonts}icons/entypo.ttf") format("truetype"); +} + + +$font_1: "Merriweather Sans"; +$font_1_path: "Merriweather_Sans/MerriweatherSans-"; + +@font-face { + font-family: '#{$font_1}'; + font-style: normal; + font-weight: 400; + src: url('#{$path_to_fonts}#{font_1_path}Regular.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_1}'; + font-style: italic; + font-weight: 400; + src: url('#{$path_to_fonts}#{$font_1_path}Italic.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_1}'; + font-style: normal; + font-weight: 300; + src: url('#{$path_to_fonts}#{$font_1_path}Light.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_1}'; + font-style: italic; + font-weight: 300; + src: url('#{$path_to_fonts}#{$font_1_path}LigthItalic.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_1}'; + font-style: normal; + font-weight: 700; + src: url('#{$path_to_fonts}#{$font_1_path}Bold.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_1}'; + font-style: italic; + font-weight: 700; + src: url('#{$path_to_fonts}#{$font_1_path}BoldItalic.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_1}'; + font-style: normal; + font-weight: 800; + src: url('#{$path_to_fonts}#{$font_1_path}ExtraBold.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_1}'; + font-style: italic; + font-weight: 800; + src: url('#{$path_to_fonts}#{$font_1_path}ExtraBoldItalic.ttf') format('truetype'); +} + +$font_2: "Oxygen"; +$font_2_path: "Oxygen/Oxygen-"; + +@font-face { + font-family: '#{$font_2}'; + font-style: normal; + font-weight: 300; + src: url('#{$path_to_fonts}#{$font_2_path}Light.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_2}'; + font-style: normal; + font-weight: 400; + src: url('#{$path_to_fonts}#{$font_2_path}Regular.ttf') format('truetype'); +} + +@font-face { + font-family: '#{$font_2}'; + font-style: normal; + font-weight: 700; + src: url('#{$path_to_fonts}#{$font_2_path}Bold.ttf') format('truetype'); +} + // To include your own, local copies of fonts, use the following template // //@font-face { diff --git a/Resources/assets/gumpy/sass/_nav.scss b/Resources/assets/gumpy/sass/_nav.scss index 44f101e5e..5206c0563 100644 --- a/Resources/assets/gumpy/sass/_nav.scss +++ b/Resources/assets/gumpy/sass/_nav.scss @@ -1,18 +1,8 @@ - div#connect_module_menu { - - text-align: right; +nav#header{ - nav.inline-nav { - display: inline; - ul, ol { - - list-style-type: none; - display: inline; - - li { - display: inline; - } - } + #nav_list { + } + } \ No newline at end of file diff --git a/Resources/assets/gumpy/sass/_searchbox.scss b/Resources/assets/gumpy/sass/_searchbox.scss index 54ed63c69..07f8a8eda 100644 --- a/Resources/assets/gumpy/sass/_searchbox.scss +++ b/Resources/assets/gumpy/sass/_searchbox.scss @@ -1,4 +1,68 @@ -div#searchbox { - text-align: right; +div#usefulbar { + background-color: #fbba3a; + z-index: 1000; + //to align with nav bar + padding-right: 15px; + + i.menu { + font-size: 2em; + } + + ul { + display: flex; + justify-content: flex-end; + margin: 0; + padding-top: 5px; + padding-right: 10px; + + } + + li{ + color: white; + margin-left: 10px; + + a { + color: white; + text-shadow: 0px 0px 1px #555; + } + + i.icon-user-add:before { + vertical-align: -5px; + } + + } + + li#search_element { + text-align: right; + + div#search_form { + margin: 0; + padding: 0; + + div { + margin: 0; + } + + .field { + margin: 0; + } + + button { + color: white; + border: none; + bottom: -2px; + height: 35px; + } + + + + } + + + } + + + + } diff --git a/Resources/assets/gumpy/sass/chillmain.scss b/Resources/assets/gumpy/sass/chillmain.scss index c9b9adf0d..1b5d74d66 100644 --- a/Resources/assets/gumpy/sass/chillmain.scss +++ b/Resources/assets/gumpy/sass/chillmain.scss @@ -1,3 +1,5 @@ @import "_nav.scss"; @import "_searchbox.scss"; + +@import "_flashMessages.scss" diff --git a/Resources/public/css/chillmain.css b/Resources/public/css/chillmain.css index 3ae5cb88b..95dea9196 100644 --- a/Resources/public/css/chillmain.css +++ b/Resources/public/css/chillmain.css @@ -1,6 +1,14 @@ -div#connect_module_menu { text-align: right; } -div#connect_module_menu nav.inline-nav { display: inline; } -div#connect_module_menu nav.inline-nav ul, div#connect_module_menu nav.inline-nav ol { list-style-type: none; display: inline; } -div#connect_module_menu nav.inline-nav ul li, div#connect_module_menu nav.inline-nav ol li { display: inline; } +div#usefulbar { background-color: #fbba3a; z-index: 1000; padding-right: 15px; } +div#usefulbar i.menu { font-size: 2em; } +div#usefulbar ul { display: flex; justify-content: flex-end; margin: 0; padding-top: 5px; padding-right: 10px; } +div#usefulbar li { color: white; margin-left: 10px; } +div#usefulbar li a { color: white; text-shadow: 0px 0px 1px #555; } +div#usefulbar li i.icon-user-add:before { vertical-align: -5px; } +div#usefulbar li#search_element { text-align: right; } +div#usefulbar li#search_element div#search_form { margin: 0; padding: 0; } +div#usefulbar li#search_element div#search_form div { margin: 0; } +div#usefulbar li#search_element div#search_form .field { margin: 0; } +div#usefulbar li#search_element div#search_form button { color: white; border: none; bottom: -2px; height: 35px; } -div#searchbox { text-align: right; } +div#flashMessages { margin-top: 20px; } +div#flashMessages .flash-notice { margin-top: 10px; margin-bottom: 10px; } diff --git a/Resources/public/css/gumby.css b/Resources/public/css/gumby.css index 5bb7fa6da..5225a270b 100644 --- a/Resources/public/css/gumby.css +++ b/Resources/public/css/gumby.css @@ -1203,6 +1203,30 @@ i.icon-logo-db:before { content: "\f603"; height: inherit; } /* Fonts */ @font-face { font-family: "entypo"; font-style: normal; font-weight: 400; src: url(../fonts/icons/entypo.eot); src: url("../fonts/icons/entypo.eot?#iefix") format("ie9-skip-eot"), url("../fonts/icons/entypo.woff") format("woff"), url("../fonts/icons/entypo.ttf") format("truetype"); } +@font-face { font-family: "entypo"; font-style: normal; font-weight: 400; src: url("./../../fonts/icons/entypo.eot"); src: url("./../../fonts/icons/entypo.eot?#iefix") format("ie9-skip-eot"), url("./../../fonts/icons/entypo.woff") format("woff"), url("./../../fonts/icons/entypo.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 400; src: url("./../../fonts/font_1_pathRegular.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 400; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 300; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-Light.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 300; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-LigthItalic.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 700; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 700; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 800; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf") format("truetype"); } + +@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 800; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf") format("truetype"); } + +@font-face { font-family: "Oxygen"; font-style: normal; font-weight: 300; src: url("./../../fonts/Oxygen/Oxygen-Light.ttf") format("truetype"); } + +@font-face { font-family: "Oxygen"; font-style: normal; font-weight: 400; src: url("./../../fonts/Oxygen/Oxygen-Regular.ttf") format("truetype"); } + +@font-face { font-family: "Oxygen"; font-style: normal; font-weight: 700; src: url("./../../fonts/Oxygen/Oxygen-Bold.ttf") format("truetype"); } + h1, h2, h3, h4, h5, h6 { font-family: "Oxygen"; font-weight: 300; color: #444444; text-rendering: optimizeLegibility; padding-top: 0.273em; line-height: 1.15538em; padding-bottom: 0.273em; } h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { color: #d04526; } @@ -2585,5 +2609,3 @@ table.rounded thead th, table.rounded thead td, table.rounded caption + tbody tr .ie9 .radio.checked i, .ie9 .checkbox.checked i { top: 0; } h1, h2, h3, h4, h5, h6 { font-family: "Merriweather Sans"; font-weight: 600; } - -@font-face { font-family: "entypo"; font-style: normal; font-weight: 400; src: url("./../../fonts/icons/entypo.eot"); src: url("../../fonts/icons/entypo.eot?#iefix") format("ie9-skip-eot"), url("./../../fonts/icons/entypo.woff") format("woff"), url("./../../fonts/icons/entypo.ttf") format("truetype"); } diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index 524565305..68ad30d6d 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -18,61 +18,125 @@ {# class for multicolumn in gumpy #}
-
+ +
+ + + +
+
+ +
    + +
  • +
    +
    + + + + +
    +
    + +
    • + +
  • + +
    • + + +
+ + + + + + + +
+ +
+ + {# Flash messages ! + + {% if (app.session.flashbag.get('success').length > 0 + OR app.session.flashbag.get('danger').length > 0 + OR app.session.flashbag.get('info').length > 0 ) %}#} +
+ +
+ {% for flashMessage in app.session.flashbag.get('success') %} +
+ {{ flashMessage }}
- - + {% endfor %} + {% for flashMessage in app.session.flashbag.get('info') %} +
+ {{ flashMessage }} +
+ {% endfor %} + +
+ +
+ {# {% endif %} #} + +
-

Hello !

+ + + + +

Title

+

Hello !

Primary
-
+
- +