Author: sevein
Date: Wed Aug 31 08:06:34 2011
New Revision: 9642
Log:
Trillium, playing with a second level header
Added:
trunk/plugins/qtTrilliumPlugin/css/less/header.less
trunk/plugins/qtTrilliumPlugin/css/main.less
Deleted:
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_quickLinks.php
Modified:
trunk/plugins/qtTrilliumPlugin/build.sh
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
trunk/plugins/qtTrilliumPlugin/css/less/patterns.less
trunk/plugins/qtTrilliumPlugin/css/less/scaffolding.less
trunk/plugins/qtTrilliumPlugin/css/main.css
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified: trunk/plugins/qtTrilliumPlugin/build.sh
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/build.sh Tue Aug 30 16:33:56 2011
(r9641)
+++ trunk/plugins/qtTrilliumPlugin/build.sh Wed Aug 31 08:06:34 2011
(r9642)
@@ -1 +1 @@
-vendor/less/bin/lessc css/less/bootstrap.less > css/main.css
+vendor/less/bin/lessc css/main.less > css/main.css
Modified:
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
==============================================================================
---
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Tue Aug 30 16:33:56 2011 (r9641)
+++
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Wed Aug 31 08:06:34 2011 (r9642)
@@ -35,8 +35,8 @@
//
$context->response->addJavaScript('/plugins/sfCaribouPlugin/js/navigation',
'last');
// Development
-
$context->response->addJavaScript('/plugins/qtTrilliumPlugin/vendor/less/dist/less-1.1.4.min.js');
-
$context->response->addStylesheet('/plugins/qtTrilliumPlugin/css/less/bootstrap.less',
'last', array('rel' => 'stylesheet/less'));
+
$context->response->addJavaScript('/plugins/qtTrilliumPlugin/vendor/less/dist/less-1.1.4.js');
+
$context->response->addStylesheet('/plugins/qtTrilliumPlugin/css/main.less',
'last', array('rel' => 'stylesheet/less', 'type' => '', 'media' => ''));
// Trillium CSS file generated with lessc
$context->response->addJavaScript('/plugins/qtTrilliumPlugin/js/trillium');
Added: trunk/plugins/qtTrilliumPlugin/css/less/header.less
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/css/less/header.less Wed Aug 31 08:06:34
2011 (r9642)
@@ -0,0 +1,316 @@
+#header {
+
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 10000;
+ overflow: visible;
+
+ > div {
+
+ > #first-level {
+
+ height: 40px;
+ background: #222;
+ #gradient > .vertical(#222, #444);
+ @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+ .box-shadow(@shadow);
+
+ > div {
+
+ // .container();
+
+ }
+
+ #name-and-slogan {
+
+ float: left;
+
+ #site-name {
+
+ line-height: 20px;
+
+ > a {
+
+ float: left;
+ display: block;
+ padding: 8px 20px 12px;
+ margin-left: -20px; // negative indent to left-align the text down
the page
+ color: @white;
+ font-size: 20px;
+ font-weight: 200;
+ line-height: 1;
+
+ &:hover {
+
+ text-decoration: none;
+
+ }
+
+ }
+
+ }
+
+ #site-slogan {
+
+ display: none;
+
+ }
+
+ }
+
+ #logo {
+
+ display: none;
+
+ }
+
+ .search {
+
+ form {
+
+ float: left;
+ margin: 5px 0 0 10px;
+ position: relative;
+ .opacity(100);
+
+ input[type=submit] {
+
+ display: none;
+
+ }
+
+ input[name=query] {
+
+ background-color: #444;
+ background-color: rgba(255,255,255,.3);
+ #font > .sans-serif(normal, 13px, 1);
+ width: 220px;
+ padding: 4px 9px;
+ color: #fff;
+ color: rgba(255,255,255,.75);
+ border: 1px solid #111;
+ .border-radius(4px);
+ @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px
rgba(255,255,255,.25);
+ .box-shadow(@shadow);
+ .transition(none);
+
+ &:hover {
+
+ background-color: @grayLight;
+ background-color: rgba(255,255,255,.5);
+ color: #fff;
+
+ }
+
+ &:focus,
+ &.focused {
+
+ outline: none;
+ background-color: #fff;
+ color: @grayDark;
+ text-shadow: 0 1px 0 #fff;
+ border: 0;
+ padding: 5px 10px;
+ .box-shadow(0 0 3px rgba(0,0,0,.15));
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ > #second-level {
+
+ height: 24px;
+ background: #777;
+ #gradient > .vertical(#fff, #eee);
+ @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+ .box-shadow(@shadow);
+ border-bottom: 1px solid #666;
+
+ > div {
+
+ // .container();
+
+ ul > li {
+
+ > a {
+
+ padding: 2px 10px 2px;
+ color: @gray;
+
+ }
+
+ ul {
+
+ top: 20px;
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ ul {
+
+ display: block;
+ float: left;
+ margin: 0 0 0 0;
+ position: relative;
+
+ &#options-menu {
+
+ float: right;
+
+ > li > ul {
+
+ right: 0;
+
+ }
+
+ }
+
+ li {
+
+ display: block;
+ float: left;
+ font-size: 13px;
+
+ a {
+
+ display: block;
+ float: none;
+ padding: 10px 10px 11px;
+ line-height: 19px;
+ text-decoration: none;
+ color: @grayLight;
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+
+ &:hover {
+
+ text-decoration: none;
+ background-color: #333;
+ background-color: rgba(255,255,255,.05);
+ color: @white;
+
+ }
+
+ &.active {
+
+ background-color: #222;
+ background-color: rgba(0,0,0,.5);
+
+ }
+
+ }
+
+ &.menu {
+
+ position: relative;
+
+ > a {
+
+ &:after {
+
+ width: 0px;
+ height: 0px;
+ display: inline-block;
+ content: "↓";
+ text-indent: -99999px;
+ vertical-align: top;
+ margin-top: 8px;
+ margin-left: 4px;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #fff;
+ .opacity(50);
+
+ }
+
+ }
+
+ }
+
+ &.open {
+
+ a.menu,
+ a:hover {
+
+ background-color: #444;
+ background-color: rgba(255,255,255,.1);
+ color: #fff;
+
+ }
+
+ ul {
+
+ display: block;
+
+ }
+
+ }
+
+ ul {
+
+ background-color: #333;
+ float: left;
+ display: none;
+ position: absolute;
+ top: 40px;
+ min-width: 160px;
+ max-width: 220px;
+ margin-left: 0px;
+ margin-right: 0px;
+ padding: 0;
+ text-align: left;
+ border: 0;
+ zoom: 1;
+ .border-radius(0 0 5px 5px);
+ .box-shadow(0 1px 2px rgba(0,0,0,0.6));
+
+ li {
+
+ float: none;
+ clear: both;
+ display: block;
+ background: none;
+ font-size: 12px;
+
+ a {
+
+ display: block;
+ padding: 6px 15px;
+ clear: both;
+ font-weight: normal;
+ line-height: 19px;
+ color: #bbb;
+
+ &:hover {
+
+ background-color: #333;
+ background-color: rgba(255,255,255,.25);
+ color: #fff;
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+ }
+
+}
Modified: trunk/plugins/qtTrilliumPlugin/css/less/patterns.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/patterns.less Tue Aug 30
16:33:56 2011 (r9641)
+++ trunk/plugins/qtTrilliumPlugin/css/less/patterns.less Wed Aug 31
08:06:34 2011 (r9642)
@@ -10,7 +10,6 @@
> .section {
- background-color: Red;
background: #222;
#gradient > .vertical(#222, #444);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
Modified: trunk/plugins/qtTrilliumPlugin/css/less/scaffolding.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/scaffolding.less Tue Aug 30
16:33:56 2011 (r9641)
+++ trunk/plugins/qtTrilliumPlugin/css/less/scaffolding.less Wed Aug 31
08:06:34 2011 (r9642)
@@ -31,7 +31,7 @@
}
}
-
+
}
#footer {
Modified: trunk/plugins/qtTrilliumPlugin/css/main.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/main.css Tue Aug 30 16:33:56 2011
(r9641)
+++ trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 31 08:06:34 2011
(r9642)
@@ -1,13 +1,3 @@
-/*!
- * Bootstrap v1.1.0
- *
- * Copyright 2011 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: @DATE
- */
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an
adapted version here that cuts out some of the reset HTML elements we will
never need here (i.e., dfn, samp, etc).
*
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
*/
@@ -304,175 +294,16 @@
padding: 0;
border: 0;
}
-p {
- font-size: 13px;
- font-weight: normal;
- line-height: 18px;
- margin-bottom: 9px;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
- font-weight: bold;
- color: #404040;
-}
-h1 {
- margin: 20px 0 0 0;
- font-size: 14px;
- line-height: 36px;
- color: #bfbfbf;
-}
-h1.label {
- color: #404040;
- margin: 0 0 18px 0;
- font-size: 30px;
-}
-h2 {
- color: #9d261d;
- font-size: 20px;
- line-height: 36px;
- border-bottom: 1px solid #e6e6e6;
-}
-h3,
-h4,
-h5,
-h6 {
- line-height: 36px;
-}
-h3 {
- font-size: 18px;
-}
-h4 {
- font-size: 16px;
-}
-h5 {
- font-size: 14px;
-}
-h6 {
- font-size: 13px;
- color: #bfbfbf;
- text-transform: uppercase;
-}
-ul, ol {
- margin: 0 0 18px 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
- margin-bottom: 0;
-}
-ul {
- list-style: disc;
-}
-ol {
- list-style: decimal;
-}
-li {
- line-height: 18px;
- color: #808080;
-}
-ul.unstyled {
- list-style: none;
- margin-left: 0;
-}
-dl {
- margin-bottom: 18px;
-}
-dl dt, dl dd {
- line-height: 18px;
-}
-dl dt {
- font-weight: bold;
-}
-dl dd {
- margin-left: 9px;
-}
-hr {
- margin: 0 0 19px;
- border: 0;
- border-bottom: 1px solid #eee;
-}
-strong {
- font-style: inherit;
- font-weight: bold;
- line-height: inherit;
-}
-em {
- font-style: italic;
- font-weight: inherit;
- line-height: inherit;
-}
-.muted {
- color: #e6e6e6;
-}
-blockquote {
- margin-bottom: 18px;
- border-left: 5px solid #eee;
- padding-left: 15px;
-}
-blockquote p {
- font-size: 14px;
- font-weight: 300;
- line-height: 18px;
- margin-bottom: 0;
-}
-blockquote small {
- display: block;
- font-size: 12px;
- font-weight: 300;
- line-height: 18px;
- color: #bfbfbf;
-}
-blockquote small:before {
- content: '\2014 \00A0';
-}
-address {
- display: block;
- line-height: 18px;
- margin-bottom: 18px;
-}
-code, pre {
- padding: 0 3px 2px;
- font-family: Monaco, Andale Mono, Courier New, monospace;
- font-size: 12px;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-code {
- background-color: #fee9cc;
- color: rgba(0, 0, 0, 0.75);
- padding: 1px 3px;
-}
-pre {
- background-color: #f5f5f5;
- display: block;
- padding: 17px;
- margin: 0 0 18px;
- line-height: 18px;
- font-size: 12px;
- border: 1px solid #ccc;
- border: 1px solid rgba(0, 0, 0, 0.15);
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- white-space: pre-wrap;
-}
#header {
- height: 40px;
+ height: 200px;
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 10000;
- overflow: visible;
+ overflow: scroll;
}
-#header > .section {
- background-color: Red;
+#header > div > #first-level {
background: #222;
background-color: #444444;
background-repeat: repeat-x;
@@ -487,520 +318,23 @@
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0,
0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
}
-#header a {
- color: #bfbfbf;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-#header a:hover, #header ul li.active a {
- background-color: #333;
- background-color: rgba(255, 255, 255, 0.05);
- color: #ffffff;
- text-decoration: none;
-}
-#header #logo {
- display: none;
-}
-#header #name-and-slogan #site-name {
- position: relative;
- margin: 0;
-}
-#header #name-and-slogan #site-name a {
- float: left;
- display: block;
- padding: 8px 20px 12px;
- margin-left: -20px;
- color: #ffffff;
- font-size: 20px;
- font-weight: 200;
- line-height: 1;
-}
-#header #name-and-slogan #site-slogan {
- display: none;
-}
-#header .search form {
- float: left;
- margin: 5px 0 0 0;
- position: relative;
- filter: alpha(opacity=100);
- -khtml-opacity: 1;
- -moz-opacity: 1;
- opacity: 1;
-}
-#header .search form input[type=submit] {
+#header > div > #first-level > #logo, #header > div > #first-level >
#name-and-slogan {
display: none;
}
-#header .search form input[name=query] {
- background-color: #444;
- background-color: rgba(255, 255, 255, 0.3);
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: normal;
- font-weight: 13px;
- line-height: 1;
- width: 220px;
- padding: 4px 9px;
- color: #fff;
- color: rgba(255, 255, 255, 0.75);
- border: 1px solid #111;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255,
255, 255, 0.25);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255,
255, 255, 0.25);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255,
255, 0.25);
- -webkit-transition: none;
- -moz-transition: none;
- transition: none;
-}
-#header .search form input[name=query]:-moz-placeholder {
- color: #e6e6e6;
-}
-#header .search form input[name=query]::-webkit-input-placeholder {
- color: #e6e6e6;
-}
-#header .search form input[name=query]:hover {
- background-color: #bfbfbf;
- background-color: rgba(255, 255, 255, 0.5);
- color: #fff;
-}
-#header .search form input[name=query]:focus, #header .search form
input[name=query].focused {
- outline: none;
- background-color: #fff;
- color: #404040;
- text-shadow: 0 1px 0 #fff;
- border: 0;
- padding: 5px 10px;
- -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-}
-#header ul {
- display: block;
- float: left;
- margin: 0 10px 0 0;
- position: relative;
-}
-#header ul.secondary-nav {
- float: right;
- margin-left: 10px;
- margin-right: 0;
-}
-#header ul li {
- display: block;
- float: left;
- font-size: 13px;
-}
-#header ul li a {
- display: block;
- float: none;
- padding: 10px 10px 11px;
- line-height: 19px;
- text-decoration: none;
-}
-#header ul li a:hover {
- color: #fff;
- text-decoration: none;
-}
-#header ul li.active a {
- background-color: #222;
- background-color: rgba(0, 0, 0, 0.5);
-}
-#header ul.primary-nav li ul {
- left: 0;
-}
-#header ul.secondary-nav li ul {
- right: 0;
-}
-#header ul li.menu {
- position: relative;
-}
-#header ul li.menu a.menu:after {
- width: 0px;
- height: 0px;
- display: inline-block;
- content: "↓";
- text-indent: -99999px;
- vertical-align: top;
- margin-top: 8px;
- margin-left: 4px;
- border-left: 4px solid transparent;
- border-right: 4px solid transparent;
- border-top: 4px solid #fff;
- filter: alpha(opacity=50);
- -khtml-opacity: 0.5;
- -moz-opacity: 0.5;
- opacity: 0.5;
-}
-#header ul li.menu.open a.menu, #header ul li.menu.open a:hover {
- background-color: #444;
- background-color: rgba(255, 255, 255, 0.1);
- *background-color: #444;
- /* IE6-7 */
-
- color: #fff;
-}
-#header ul li.menu.open ul {
- display: block;
-}
-#header ul li.menu.open ul li a {
- background-color: transparent;
- font-weight: normal;
-}
-#header ul li.menu.open ul li a:hover {
- background-color: rgba(255, 255, 255, 0.1);
- *background-color: #444;
- /* IE6-7 */
-
- color: #fff;
-}
-#header ul li.menu.open ul li.active a {
- background-color: rgba(255, 255, 255, 0.1);
- font-weight: bold;
-}
-#header ul li.menu.open ul li ul {
- display: none;
-}
-#header ul li ul {
- background-color: #333;
- float: left;
- display: none;
- position: absolute;
- top: 40px;
- min-width: 160px;
- max-width: 220px;
- _width: 160px;
- margin-left: 0;
- margin-right: 0;
- padding: 0;
- text-align: left;
- border: 0;
- zoom: 1;
- -webkit-border-radius: 0 0 5px 5px;
- -moz-border-radius: 0 0 5px 5px;
- border-radius: 0 0 5px 5px;
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
- -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
-}
-#header ul li ul li {
- float: none;
- clear: both;
- display: block;
- background: none;
- font-size: 12px;
-}
-#header ul li ul li a {
- display: block;
- padding: 6px 15px;
- clear: both;
- font-weight: normal;
- line-height: 19px;
- color: #bbb;
-}
-#header ul li ul li a:hover {
- background-color: #333;
- background-color: rgba(255, 255, 255, 0.25);
- color: #fff;
-}
-#header ul li ul li.divider {
- height: 1px;
- overflow: hidden;
+#header > div > #second-level {
background: #222;
- background: rgba(0, 0, 0, 0.2);
- border-bottom: 1px solid rgba(255, 255, 255, 0.1);
- margin: 5px 0;
-}
-#header ul li ul li span {
- clear: both;
- display: block;
- background: rgba(0, 0, 0, 0.2);
- padding: 6px 15px;
- cursor: default;
- color: #808080;
- border-top: 1px solid rgba(0, 0, 0, 0.2);
-}
-#header ul#main-menu {
- margin-left: 10px;
- float: right;
-}
-#header ul li.add > a {
- padding-left: 22px;
- background: transparent url(../../images/add.png) no-repeat 8px 50%;
-}
-#header ul li.help > a {
- padding-left: 22px;
- background: transparent url(../../images/help.png) no-repeat 8px 50%;
-}
-#header ul li.language > a {
- padding-left: 22px;
- background: transparent url(../../images/world.png) no-repeat 8px 50%;
-}
-#header ul li.user > a {
- padding-left: 28px;
- background: transparent url(../../images/user.png) no-repeat 8px 50%;
-}
-.messages {
- margin-bottom: 18px;
- padding: 14px;
- color: #404040;
- color: rgba(0, 0, 0, 0.8);
- *color: #404040;
- /* IE 6-7 */
-
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-}
-.messages p, .messages li {
- color: #404040;
- color: rgba(0, 0, 0, 0.8);
- *color: #404040;
- /* IE 6-7 */
-
-}
-.messages p {
- margin-right: 30px;
- margin-bottom: 0;
-}
-.messages ul {
- margin-bottom: 0;
-}
-.messages strong {
- display: block;
-}
-.messages.error {
- background: #f8dcda;
- border: 1px solid #f4c8c5;
-}
-.messages.warning {
- background: #fff0c0;
- border: 1px solid #ffe38d;
-}
-.messages.success {
- background: #dff1df;
- border: 1px solid #bbe2bb;
-}
-.messages.info {
- background: #c7eefe;
- border: 1px solid #ade6fe;
-}
-.messages .close {
- float: right;
- margin-top: -2px;
- color: #000;
- font-size: 20px;
- font-weight: bold;
- text-shadow: 0 1px 0 #ffffff;
- filter: alpha(opacity=20);
- -khtml-opacity: 0.2;
- -moz-opacity: 0.2;
- opacity: 0.2;
-}
-.messages .close:hover {
- text-decoration: none;
- filter: alpha(opacity=40);
- -khtml-opacity: 0.4;
- -moz-opacity: 0.4;
- opacity: 0.4;
-}
-.actions {
- background-color: #f5f5f5;
- margin-bottom: 20px;
- padding: 19px;
- min-height: 20px;
- border: 1px solid #eee;
- border: 1px solid rgba(0, 0, 0, 0.05);
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-.actions > div {
- width: 940px;
- margin: 0 auto;
- zoom: 1;
- width: 940px;
- margin: 0 auto;
-}
-.actions > div:before, .actions > div:after {
- display: table;
- content: "";
-}
-.actions > div:after {
- clear: both;
-}
-.actions ul {
- margin: 0;
-}
-.actions li {
- display: inline;
- list-style-type: none;
-}
-.actions a {
- cursor: pointer;
- display: inline-block;
- background-color: #e6e6e6;
- background-repeat: no-repeat;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff),
color-stop(0.25, #ffffff), to(#e6e6e6));
- background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
- background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
- background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
- background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
- background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
- padding: 4px 14px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
- color: #333;
- font-size: 13px;
- line-height: 18px;
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px
rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0,
0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0,
0.05);
- -webkit-transition: 0.1s linear all;
- -moz-transition: 0.1s linear all;
- transition: 0.1s linear all;
-}
-.actions a:hover {
- background-position: 0 -15px;
- color: #333;
- text-decoration: none;
-}
-.actions a.primary, .actions a.danger {
- color: #fff;
-}
-.actions a.primary:hover, .actions a.danger:hover {
- color: #fff;
-}
-.actions a.primary {
- background-color: #0064cd;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom,
from(#049cdb), to(#0064cd));
- background-image: -moz-linear-gradient(#049cdb, #0064cd);
- background-image: -ms-linear-gradient(#049cdb, #0064cd);
- background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #049cdb), color-stop(100%, #0064cd));
- background-image: -webkit-linear-gradient(#049cdb, #0064cd);
- background-image: -o-linear-gradient(#049cdb, #0064cd);
- background-image: linear-gradient(#049cdb, #0064cd);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #0064cd #0064cd #003f81;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.actions a.danger {
- background-color: #9d261d;
+ background-color: #444444;
background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom,
from(#d83a2e), to(#9d261d));
- background-image: -moz-linear-gradient(#d83a2e, #9d261d);
- background-image: -ms-linear-gradient(#d83a2e, #9d261d);
- background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #d83a2e), color-stop(100%, #9d261d));
- background-image: -webkit-linear-gradient(#d83a2e, #9d261d);
- background-image: -o-linear-gradient(#d83a2e, #9d261d);
- background-image: linear-gradient(#d83a2e, #9d261d);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #9d261d #9d261d #5c1611;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.actions a.large {
- font-size: 16px;
- line-height: 28px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-}
-.actions a.small {
- padding-right: 9px;
- padding-left: 9px;
- font-size: 11px;
-}
-.actions a.disabled {
- background-image: none;
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- cursor: default;
-}
-.actions a:disabled {
- background-image: none;
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- cursor: default;
-}
-.actions a:active {
- -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0,
0, 0.05);
- -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0,
0.05);
- box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0,
0.05);
-}
-.actions a::-moz-focus-inner {
- padding: 0;
- border: 0;
-}
-.tabs ul {
- margin: 10px 0 20px;
- padding: 0;
- zoom: 1;
- width: 100%;
- border-bottom: 1px solid #bfbfbf;
-}
-.tabs ul:before, .tabs ul:after {
- display: table;
- content: "";
-}
-.tabs ul:after {
- clear: both;
-}
-.tabs li {
- display: inline;
-}
-.tabs li a {
- float: left;
- width: auto;
- margin-bottom: -1px;
- margin-right: 2px;
- padding: 0px 6px;
- line-height: 35px;
- -webkit-border-radius: 3px 3px 0 0;
- -moz-border-radius: 3px 3px 0 0;
- border-radius: 3px 3px 0 0;
-}
-.tabs li a:hover {
- background-color: #e6e6e6;
- border-bottom: 1px solid #bfbfbf;
-}
-.tabs li.active a {
- background-color: #fff;
- padding: 0px 6px;
- border: 1px solid #ccc;
- border-bottom: 0;
- color: #808080;
-}
-div.field {
- overflow: hidden;
- border-bottom: .1px solid #CCC;
- border-top: .1px solid #CCC;
- text-align: left;
-}
-div.field h3 {
- margin: 0 0 -32767px 0;
- padding: 0 0 32767px 0;
- background: #999;
- color: White;
- float: left;
- font-size: inherit;
- padding: 2px 1%;
- text-align: right;
- width: 28%;
-}
-div.field > div {
- margin-left: 30%;
- padding: 2px 4px;
+ background-image: -khtml-gradient(linear, left top, left bottom,
from(#222222), to(#444444));
+ background-image: -moz-linear-gradient(#222222, #444444);
+ background-image: -ms-linear-gradient(#222222, #444444);
+ background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #222222), color-stop(100%, #444444));
+ background-image: -webkit-linear-gradient(#222222, #444444);
+ background-image: -o-linear-gradient(#222222, #444444);
+ background-image: linear-gradient(#222222, #444444);
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0,
0, 0.1);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0,
0.1);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
}
.nowrap {
white-space: nowrap;
@@ -1009,6 +343,7 @@
display: none;
}
.element-invisible {
+ border: 0;
height: 0;
overflow: hidden;
position: absolute;
Added: trunk/plugins/qtTrilliumPlugin/css/main.less
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/plugins/qtTrilliumPlugin/css/main.less Wed Aug 31 08:06:34
2011 (r9642)
@@ -0,0 +1,18 @@
+/*!
+ *
+ * qtTrilliumPlugin
+ *
+ *
+*/
+
+@import "less/reset";
+@import "less/preboot";
+@import "less/scaffolding";
+
+@import "less/header";
+
+.element-invisible {
+
+ display: none;
+
+}
Modified:
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
==============================================================================
---
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
Tue Aug 30 16:33:56 2011 (r9641)
+++
trunk/plugins/qtTrilliumPlugin/modules/i18n/templates/_changeLanguageList.php
Wed Aug 31 08:06:34 2011 (r9642)
@@ -1,4 +1,4 @@
-<a class="menu" href="#"> </a>
+<a class="menu" href="#"><?php echo __('Language') ?></a>
<ul class="links">
<?php foreach (sfConfig::getAll() as $name => $value): ?>
Modified: trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php Tue Aug
30 16:33:56 2011 (r9641)
+++ trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php Wed Aug
31 08:06:34 2011 (r9642)
@@ -1,5 +1,5 @@
<li class="menu add">
- <a href="#" class="menu"> </a>
+ <a href="#" class="menu"><?php echo
$addMenu->getLabel(array('cultureFallback' => true)) ?></a>
<?php echo QubitMenu::displayHierarchyAsList($addMenu, 0,
array('overrideVisibility' => array('admin' =>
$sf_user->hasCredential('administrator')))) ?>
</li>
Modified: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/templates/_header.php Tue Aug 30
16:33:56 2011 (r9641)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php Wed Aug 31
08:06:34 2011 (r9642)
@@ -1,75 +1,91 @@
<div id="header">
- <div class="section clearfix">
- <div class="container">
- <?php if (sfConfig::get('app_toggleLogo')): ?>
- <?php echo link_to(image_tag('logo', array('alt' => __('Home'))),
'@homepage', array('id' => 'logo', 'rel' => 'home', 'title' => __('Home'))) ?>
- <?php endif; ?>
-
- <?php if (sfConfig::get('app_toggleTitle') ||
sfConfig::get('app_toggleDescription')): ?>
- <div id="name-and-slogan">
-
- <?php if (sfConfig::get('app_toggleTitle')): ?>
- <h1 id="site-name">
- <?php echo
link_to('<span>'.sfConfig::get('app_siteTitle').'</span>', '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?>
- </h1>
- <?php endif; ?>
+ <div>
- <?php if (sfConfig::get('app_toggleDescription')): ?>
- <div id="site-slogan">
- <?php echo sfConfig::get('app_siteDescription') ?>
- </div>
- <?php endif; ?>
+ <div id="first-level">
- </div> <!-- /#name-and-slogan -->
- <?php endif; ?>
+ <div>
- <ul id="browse-menu">
+ <?php if (sfConfig::get('app_toggleLogo')): ?>
+ <?php echo link_to(image_tag('logo', array('alt' => __('Home'))),
'@homepage', array('id' => 'logo', 'rel' => 'home', 'title' => __('Home'))) ?>
+ <?php endif; ?>
- <li class="menu">
- <?php echo get_component('menu', 'browseMenu', array('sf_cache_key'
=> 'settings')) ?>
- </li>
+ <?php if (sfConfig::get('app_toggleTitle') ||
sfConfig::get('app_toggleDescription')): ?>
+ <div id="name-and-slogan">
- </ul>
+ <?php if (sfConfig::get('app_toggleTitle')): ?>
+ <h1 id="site-name">
+ <?php echo
link_to('<span>'.sfConfig::get('app_siteTitle').'</span>', '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?>
+ </h1>
+ <?php endif; ?>
+
+ <?php if (sfConfig::get('app_toggleDescription')): ?>
+ <div id="site-slogan">
+ <?php echo sfConfig::get('app_siteDescription') ?>
+ </div>
+ <?php endif; ?>
- <?php echo get_component('search', 'box') ?>
+ </div>
+ <?php endif; ?>
- <?php echo get_component_slot('header') ?>
+ <ul id="browse-menu">
+ <li class="menu">
+ <?php echo get_component('menu', 'browseMenu',
array('sf_cache_key' => 'settings')) ?>
+ </li>
+ </ul>
- <ul id="main-menu">
+ <?php echo get_component('search', 'box') ?>
- <?php if ($sf_user->isAuthenticated()): ?>
- <?php echo get_component('menu', 'mainMenu', array('sf_cache_key' =>
'settings')) ?>
- <?php endif; ?>
+ <?php echo get_component_slot('header') ?>
- <li class="menu language">
- <?php echo get_component('i18n', 'changeLanguageList') ?>
- </li>
-
- <li class="menu help">
- <a class="menu" href="#"> </a>
- <ul>
- <li><?php echo link_to(__('About'), array('module' =>
'staticpage', 'slug' => 'about')) ?></li>
- <li><?php echo link_to(__('?'), array('module' => 'staticpage',
'slug' => 'help')) ?></li>
- </ul>
- </li>
-
- <?php if ($sf_user->isAuthenticated()): ?>
- <li class="menu user">
- <a class="menu" href="#"><?php echo $sf_user->user->__toString()
?></a>
- <ul>
- <li><?php echo link_to(__('Profile'), array($sf_user->user,
'module' => 'user')) ?></li>
- <li><?php echo link_to(__('Log out'), array('module' =>
'user', 'action' => 'logout')) ?></li>
- </ul>
+ <ul id="options-menu">
+
+ <li class="menu">
+ <?php echo get_component('i18n', 'changeLanguageList') ?>
</li>
- <?php else: ?>
- <li><?php echo link_to('<strong>'.__('Log in').'</strong>',
array('module' => 'user', 'action' => 'login')) ?></li>
- <?php endif; ?>
- </ul>
+ <li class="menu">
+ <a class="menu" href="#"><?php echo __('Help') ?></a>
+ <ul>
+ <li><?php echo link_to(__('About'), array('module' =>
'staticpage', 'slug' => 'about')) ?></li>
+ <li><?php echo link_to(__('?'), array('module' => 'staticpage',
'slug' => 'help')) ?></li>
+ </ul>
+ </li>
+
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <li class="menu user">
+ <a class="menu" href="#"><?php echo $sf_user->user->__toString()
?></a>
+ <ul>
+ <li><?php echo link_to(__('Profile'), array($sf_user->user,
'module' => 'user')) ?></li>
+ <li><?php echo link_to(__('Log out'), array('module' =>
'user', 'action' => 'logout')) ?></li>
+ </ul>
+ </li>
+ <?php else: ?>
+ <li><?php echo link_to(__('Log in'), array('module' => 'user',
'action' => 'login')) ?></li>
+ <?php endif; ?>
+
+ </ul>
+
+ </div>
+
+ </div> <!-- /#first-level -->
+
+ <div id="second-level">
+
+ <div>
+
+ <ul>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <?php echo get_component('menu', 'mainMenu', array('sf_cache_key'
=> 'settings')) ?>
+ <?php endif; ?>
+ </ul>
+
+ </div>
+
+ </div> <!-- /#second-level -->
+
+ <?php echo get_component('default', 'updateCheck') ?>
- <?php echo get_component('default', 'updateCheck') ?>
+ </div>
- </div> <!-- /.container -->
- </div> <!-- /.section -->
-</div> <!-- /#header -->
+</div>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
