Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

WEB-60 Addapt the header to new design model

  • Loading branch information...
commit ecfba7eef947b75f150047750672f9c899f4876b 1 parent c81457e
@mgallego authored
View
2  src/SFM/PicmntBundle/Menu/Builder.php
@@ -14,7 +14,7 @@ public function menuCategories(FactoryInterface $factory)
$menu = $factory->createItem('root');
$menu->setCurrentUri($this->container->get('request')->getRequestUri());
- $menu->setAttribute('class', 'submenu');
+ $menu->setAttribute('class', 'submenu unstyled');
$em = $this->container->get('doctrine')->getEntityManager();
$categories = $em->getRepository('SFMPicmntBundle:Category')->findAll();
View
66 src/SFM/PicmntBundle/Resources/public/less/header.less
@@ -1,7 +1,3 @@
-/////////////////////////////////
-// header
-/////////////////////////////////
-
header {
height: @headerHeight;
width: 100%;
@@ -26,65 +22,3 @@ header {
letter-spacing: -2px;
color: @darkGrey;
}
-
-/* .menu li { */
-/* margin-left: 20px; */
-/* padding-left: 16px; */
-/* } */
-
-/* .menu ul { */
-/* list-style-type: none; */
-/* } */
-
-/* .menu ul li { */
-/* display: inline; */
-/* font-weight: bold; */
-/* } */
-
-/* .menu { */
-/* text-align: right; */
-/* } */
-
-
-
-/////////////////////////////////
-// updload menu
-/////////////////////////////////
-
-/* .upload { */
-/* padding-left: 20px; */
-/* } */
-
-/* .upload a { */
-/* padding-left: 3px; */
-/* } */
-
-/* header .menu li.upload { */
-/* background-position: 0px top; */
-/* background-repeat: no-repeat; */
-/* /\* background-image: url('/bundles/sfmpicmnt/images/upload_ico_gray.png'); *\/ */
-/* margin-right: 10px; */
-/* -webkit-transition: background-image 0.3s ease-in-out; */
-/* -moz-transition: background-image 0.3s ease-in-out; */
-/* -o-transition: background-image 0.3s ease-in-out; */
-/* transition: background-image 0.3s ease-in-out; */
-/* } */
-
-/* /\* header .menu li.upload:hover { *\/ */
-/* /\* background-image: url('/bundles/sfmpicmnt/images/upload_ico_blue.png'); *\/ */
-/* /\* } *\/ */
-
-/* header .menu li.upload:hover a { */
-/* color: @p-letter-color; */
-/* } */
-
-
-/////////////////////////////////
-// login menu
-/////////////////////////////////
-
-/* #login-menu li { */
-/* padding-left: 1px; */
-/* margin-left: auto; */
-/* } */
-
View
9 src/SFM/PicmntBundle/Resources/public/less/scaffolding.less
@@ -0,0 +1,9 @@
+.container {
+ min-height: @minHeight;
+ margin-top: @containerMarginTop;
+}
+
+.navbar .inline {
+ margin-top: 14px;
+ font-weight: bold;
+}
View
52 src/SFM/PicmntBundle/Resources/public/less/tooltip.less
@@ -0,0 +1,52 @@
+ul.tooltip-menu span {
+ color: @darkGrey;
+}
+
+ul.tooltip-menu ul {
+ background: @header-background-color;
+ -webkit-box-shadow: 1px 1px 1px gray;
+ -moz-box-shadow: 1px 1px 1px gray;
+ -o-box-shadow: 1px 1px 1px gray;
+ -ms-box-shadow: 1px 1px 1px gray;
+ box-shadow: 1px 1px 1px gray;
+ display: none;
+ padding: 0;
+
+ position: absolute;
+ top: 31px;
+ left: 0px;
+
+ width: 130px;
+}
+
+ul.tooltip-menu > li {
+ padding-bottom: 20px;
+ position: relative;
+ z-index: 10;
+}
+
+.submenu li {
+ float: left;
+ display: block;
+ padding: 8px 10px;
+ margin: 0 !important;
+}
+
+.submenu li a {
+ display: block;
+ padding: 0 100px 0 0;
+}
+
+ul.tooltip-menu li:hover > ul, ul.tooltip-menu li:focus > ul {
+ display: block;
+}
+
+.submenu li:hover, .submenu li:focus {
+ background: @PicmntLightGrey;
+ width: 112px;
+ -webkit-box-shadow: 0 1px 5px @darkGrey;
+ -moz-box-shadow: 0 1px 5px @darkGrey;
+ -o-box-shadow: 0 1px 5px @darkGrey;
+ -ms-box-shadow: 0 1px 5px @darkGrey;
+ box-shadow: 0 1px 5px @darkGrey;
+}
View
37 src/SFM/PicmntBundle/Resources/public/less/type.less
@@ -0,0 +1,37 @@
+// Lists
+// --------------------------------------------------
+
+// Unordered and Ordered lists
+ul, ol {
+ padding: 0;
+ margin: 0 0 @baseLineHeight / 2 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+ margin-bottom: 0;
+}
+li {
+ line-height: @baseLineHeight;
+}
+
+// Remove default list styles
+ul.unstyled,
+ol.unstyled {
+ margin-left: 0;
+ list-style: none;
+}
+
+// Single-line list items
+ul.inline,
+ol.inline {
+ margin-left: 0;
+ list-style: none;
+ > li {
+ display: inline-block;
+ .ie7-inline-block();
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+}
View
7 src/SFM/PicmntBundle/Resources/views/layout.html.twig
@@ -10,20 +10,19 @@
<span class="p-letter">P</span><span class="icmnt-word">icmnt</span>
</a>
</div>
- <div class="grid_4 prefix_4 menu">
+ <div class="grid_4 prefix_1 menu">
<ul class="tooltip-menu unstyled inline">
<li id="explore-tooltip">
<span>{% trans %}Explore{% endtrans %}</span>
{{ knp_menu_render('SFMPicmntBundle:Builder:menuCategories', {'class': 'tooltip-menu', 'currentClass': 'active'}) }}
</li>
<li><a href="{{ path('img_show', { 'option': 'random', 'category': 'all'}) }}">{% trans %}Random{% endtrans %}</a></li>
-
- <li class="upload">
+ <li>
<a href="{{ path('img_upload') }}">{% trans %}Upload Image{% endtrans %}</a>
</li>
</ul>
</div>
- <div class="grid_3">
+ <div class="grid_3 prefix_3">
<ul class="unstyled inline">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") or is_granted("IS_AUTHENTICATED_FULLY") %}
<li><a href="{{ path('fos_user_security_logout') }}">{% trans %}Logout{% endtrans %}</a></li>
Please sign in to comment.
Something went wrong with that request. Please try again.