Author: sevein
Date: Wed Aug 31 16:31:21 2011
New Revision: 9649
Log:
Trillium, show second header only if necessary, other changes
Modified:
trunk/plugins/qtTrilliumPlugin/css/less/_header.less
trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less
trunk/plugins/qtTrilliumPlugin/css/main.css
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_header.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_header.less Wed Aug 31
16:02:03 2011 (r9648)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_header.less Wed Aug 31
16:31:21 2011 (r9649)
@@ -139,18 +139,38 @@
.container();
- ul > li {
+ ul {
- > a {
+ li {
- padding: 2px 10px 2px;
- color: @gray;
+ > a {
- }
+ padding: 2px 10px 2px;
+ color: @grayDark;
+ text-shadow: 0 0 0;
+
+ &.menu {
+
+
+ }
+
+ }
+
+ &.menu { color: Green;
- ul {
+ > a:after {
- top: 20px;
+ color: Red;
+
+ }
+
+ }
+
+ > ul {
+
+ top: 20px;
+
+ }
}
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Wed Aug 31 16:02:03
2011 (r9648)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Wed Aug 31 16:31:21
2011 (r9649)
@@ -20,6 +20,14 @@
}
+.page > h1 {
+
+ font-size: 30px;
+ color: @grayDark;
+ font-weight: bold;
+
+}
+
/*
* Actions
*
@@ -201,8 +209,6 @@
}
- .grippie,
- textarea,
input {
margin-left: 20px;
@@ -210,6 +216,16 @@
}
+ input.readOnly {
+
+ background-image: url(../../../../images/lock.png);
+ background-position: 99% 50%;
+ background-repeat: no-repeat;
+ padding-right: 20px;
+ width: 354px;
+
+ }
+
.resizable-textarea {
margin-left: 130px;
@@ -222,6 +238,14 @@
}
+ textarea,
+ .grippie {
+
+ margin-left: 20px;
+ width: 480px;
+
+ }
+
.messages {
position: absolute;
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less Wed Aug 31
16:02:03 2011 (r9648)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less Wed Aug 31
16:31:21 2011 (r9649)
@@ -44,7 +44,7 @@
#footer {
- border-top: 1px solid black;
+ display: none;
}
Modified: trunk/plugins/qtTrilliumPlugin/css/main.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 31 16:02:03 2011
(r9648)
+++ trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 31 16:31:21 2011
(r9649)
@@ -1,350 +0,0 @@
-/* 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).
- *
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
*/
-html, body {
- margin: 0;
- padding: 0;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-dd,
-dl,
-dt,
-li,
-ol,
-ul,
-fieldset,
-form,
-label,
-legend,
-button,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td {
- margin: 0;
- padding: 0;
- border: 0;
- font-weight: normal;
- font-style: normal;
- font-size: 100%;
- line-height: 1;
- font-family: inherit;
-}
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-ol, ul {
- list-style: none;
-}
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
- content: "";
-}
-header,
-section,
-footer,
-article,
-aside {
- display: block;
-}
-/* Preboot.less
- * Variables and mixins to pre-ignite any new web development project
- * ------------------------------------------------------------------ */
-.clearfix {
- zoom: 1;
-}
-.clearfix:before, .clearfix:after {
- display: table;
- content: "";
-}
-.clearfix:after {
- clear: both;
-}
-.center-block {
- display: block;
- margin: 0 auto;
-}
-.container {
- width: 940px;
- margin: 0 auto;
- zoom: 1;
-}
-.container:before, .container:after {
- display: table;
- content: "";
-}
-.container:after {
- clear: both;
-}
-#page-wrapper {
- margin-top: 40px;
-}
-#page-wrapper #page #main-wrapper {
- width: 940px;
- margin: 0 auto;
- zoom: 1;
- width: 940px;
- margin: 0 auto;
-}
-#page-wrapper #page #main-wrapper:before, #page-wrapper #page
#main-wrapper:after {
- display: table;
- content: "";
-}
-#page-wrapper #page #main-wrapper:after {
- clear: both;
-}
-#page-wrapper #page #main-wrapper #main #content {
- float: left;
- width: 580px;
- margin-left: 20px;
-}
-#page-wrapper #page #main-wrapper #main #content:first-child {
- margin-left: 0;
-}
-#page-wrapper #page #main-wrapper #main .sidebar {
- float: left;
- width: 340px;
- margin-left: 20px;
-}
-#page-wrapper #page #main-wrapper #main .sidebar:first-child {
- margin-left: 0;
-}
-html, body {
- background-color: #fff;
-}
-body {
- margin: 0;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
- font-weight: normal;
- line-height: 18px;
- color: #808080;
- text-rendering: optimizeLegibility;
-}
-div.container {
- width: 940px;
- margin: 0 auto;
-}
-div.container-fluid {
- padding: 0 20px;
- zoom: 1;
-}
-div.container-fluid:before, div.container-fluid:after {
- display: table;
- content: "";
-}
-div.container-fluid:after {
- clear: both;
-}
-div.container-fluid div.sidebar {
- float: left;
- width: 220px;
-}
-div.container-fluid div.content {
- min-width: 700px;
- max-width: 1180px;
- margin-left: 240px;
-}
-a {
- color: #0069d6;
- text-decoration: none;
- line-height: inherit;
- font-weight: inherit;
-}
-a:hover {
- color: #0050a3;
- text-decoration: underline;
-}
-.btn {
- 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;
-}
-.btn:hover {
- background-position: 0 -15px;
- color: #333;
- text-decoration: none;
-}
-.btn.primary, .btn.danger {
- color: #fff;
-}
-.btn.primary:hover, .btn.danger:hover {
- color: #fff;
-}
-.btn.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);
-}
-.btn.danger {
- background-color: #9d261d;
- 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);
-}
-.btn.large {
- font-size: 16px;
- line-height: 28px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-}
-.btn.small {
- padding-right: 9px;
- padding-left: 9px;
- font-size: 11px;
-}
-.btn.disabled {
- background-image: none;
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- cursor: default;
-}
-.btn:disabled {
- background-image: none;
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- cursor: default;
-}
-.btn: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);
-}
-button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
- padding: 0;
- border: 0;
-}
-#header {
- height: 200px;
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- z-index: 10000;
- overflow: scroll;
-}
-#header > div > #first-level {
- background: #222;
- background-color: #444444;
- background-repeat: repeat-x;
- 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);
-}
-#header > div > #first-level > #logo, #header > div > #first-level >
#name-and-slogan {
- display: none;
-}
-#header > div > #second-level {
- background: #222;
- background-color: #444444;
- background-repeat: repeat-x;
- 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;
-}
-.element-hidden {
- display: none;
-}
-.element-invisible {
- border: 0;
- height: 0;
- overflow: hidden;
- position: absolute;
-}
Modified: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/templates/_header.php Wed Aug 31
16:02:03 2011 (r9648)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php Wed Aug 31
16:31:21 2011 (r9649)
@@ -70,19 +70,15 @@
</div> <!-- /#first-level -->
- <div id="second-level">
-
- <div>
-
- <ul>
- <?php if ($sf_user->isAuthenticated()): ?>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <div id="second-level">
+ <div>
+ <ul>
<?php echo get_component('menu', 'mainMenu', array('sf_cache_key'
=> 'settings')) ?>
- <?php endif; ?>
- </ul>
-
- </div>
-
- </div> <!-- /#second-level -->
+ </ul>
+ </div>
+ </div> <!-- /#second-level -->
+ <?php endif; ?>
<?php echo get_component('default', 'updateCheck') ?>
--
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.
