X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=css%2Ftoolbar.css;h=db083be8299d7d14f1c41ce77f8e68c31bece355;hb=5f0c20d0c4e6eb4fb63ad64ac5dd3323de1b6c0c;hp=9eac4e0ca3b5bbba7b88b84a67b7a985b97acef3;hpb=35383dd7008debf1f189df0576f4c4bf3e63afc6;p=roojs1

diff --git a/css/toolbar.css b/css/toolbar.css
index 9eac4e0ca3..db083be829 100644
--- a/css/toolbar.css
+++ b/css/toolbar.css
@@ -1,19 +1,20 @@
 /* ------- MAIN TOOLBAR ---------------- */
 
-.x-toolbar {
-	background: url(../images/default/toolbar/gray-bg.gif) repeat-x 0 0;
-	border-top: 1px solid #cbc7b8;
-    border-bottom: 1px solid #cbc7b8;
-	display: block;
-    position: relative;
-	padding: 2px;
+.x-toolbar {
+        background: url(../images/default/toolbar/gray-bg.gif) repeat-x 0 0;
+        border-top: 1px solid #cbc7b8;
+        border-bottom: 1px solid #cbc7b8;
+        display: block;
+        position: relative;
+	padding: 1px;
 }
+/*
 .x-toolbar .x-btn 
 {
     margin-left: 2px;
     margin-right: 2px;
 }
-
+*/
 /* ------------ FONTS / colors.-----------------------*/
 .x-toolbar td,
 .x-toolbar span,
@@ -136,6 +137,9 @@
     height:14px;
 }
 
+.roo-gecko .x-toolbar .x-form-text {
+    height:16px;
+}
 
 
 /* ------------ MENUS -----------------------*/
@@ -147,6 +151,8 @@
     border: 1px solid black;
     margin-top: 2px;
     margin-left: 2px;
+    max-height: 95%;
+    overflow-y: auto;
 }
 
 .x-menu-plain
@@ -173,7 +179,7 @@
 }
 .x-menu li
 {
-    line-height; 100%;
+    line-height: 100%;
 }
 
 .x-menu-list-item
@@ -187,7 +193,7 @@
 
 .x-menu-item
 {
-    pointer: cursor;
+    /*pointer: cursor; */
     color: #333;
     display: block;
     line-height: 15px;
@@ -208,13 +214,13 @@
     font-size: 1px;
     line-height: 1px;
     background: #ccc;
-    display: block
+    display: block;
     height: 1px;
     margin: 3px 3px 3px 32px;
 }
 .x-menu-item-icon
 {
-    background-position; center center;
+    background-position: center center;
     border: 0px;
     width: 16px;
     height: 16px;
@@ -259,7 +265,7 @@
     width: 16px;
     height: 16px;
 }
-.x-menu-item-checked .x-menu-check-item  .x-menu-item-icon
+.x-menu-item-checked .x-menu-item-icon
 {
     background-position: 0 -16px;
     width: 16px;
@@ -270,22 +276,22 @@
 
 
 /* NOT SURE WHAT THIS DOES ? - MS HACK? */
-
-
+
+/*
 .mso .x-toolbar, .x-grid-mso .x-toolbar
-{
-	border: 0px none;
-	background: url(../images/default/grid/mso-hd.gif);
-}
+{
+	border: 0px none;
+	background: url(../images/default/grid/mso-hd.gif);
+}
 */
 
 
-/* disabled?? */
+/* disabled?? */
 .x-toolbar .x-tb-button-disabled .x-tb-button-inner
-{
-	color:gray;
-	cursor:default;
-}
+{
+	color:gray;
+	cursor:default;
+}
 
 
 /* a seperator */
@@ -313,80 +319,89 @@
 
 
 
-
-/*
- Default button class is icon only. Add a class with a background-image property
- to your toolbar button
+
+/*
+ Default button class is icon only. Add a class with a background-image property
+ to your toolbar button
 */
-/*
+/*
 .x-toolbar .x-tb-button-inner
-{
-	background-position: center;
-	background-repeat: no-repeat;
-	display: block;
-	height: 16px;
-	width: 16px;
-	cursor:pointer;
-	white-space: nowrap;
-}
-*/
-
-/* 
- Button class for icon and text. Add this class and a class with a background-image 
- to your toolbar button for both text and icon 
+{
+	background-position: center;
+	background-repeat: no-repeat;
+	display: block;
+	height: 16px;
+	width: 16px;
+	cursor:pointer;
+	white-space: nowrap;
+}
 */
+
+/* 
+ Button class for icon and text. Add this class and a class with a background-image 
+ to your toolbar button for both text and icon 
+*/
+ 
 /*
-/*
 .x-toolbar .x-tb-text-icon
-{
-	background-position: 0px 0px;
-	background-repeat: no-repeat;
-	padding-left:18px;
-	padding-top:1px;
-	width:auto;
-	display:block;
-}
-*/
-*/
-/* 
- Button class for a button with only text. Add this class  
- to your toolbar button for a just text button
+{
+	background-position: 0px 0px;
+	background-repeat: no-repeat;
+	padding-left:18px;
+	padding-top:1px;
+	width:auto;
+	display:block;
+}
+*/
+
+/* 
+ Button class for a button with only text. Add this class  
+ to your toolbar button for a just text button
 */
-/*
-.x-toolbar .x-tb-text-only{
-	background:none;
-	padding-left:0px;
-	padding-top:1px;
-	width:auto;
-	display:block;
-}
-.x-toolbar .x-tb-text{
-   padding:2px;
-}
-.x-toolbar .x-tb-button{
-   padding:2px 3px;
-	display:block;
-}
-.x-toolbar .x-tb-button-over{
-   background:#c3d3ed url(../images/default/toolbar/btn-over-bg.gif) repeat-x;
-	border:1px solid #6593cf;
-	padding:1px 2px;
-}
-.x-toolbar .x-tb-sep {
-	background-image: url(../images/default/grid/grid-split.gif);
-	background-position: center;
-	background-repeat: no-repeat;
-	display: block;
-	font-size: 1px;
-	height: 16px;
-	width:4px;
-	overflow: hidden;
-	cursor:default;
-	margin: 0px 2px 0px;
-	border:0px;
-}
-.mso .x-toolbar .x-tb-sep, .x-grid-mso .x-toolbar .x-tb-sep{
-	background-image: url(../images/default/grid/grid-blue-split.gif);
-}
-
-*/
\ No newline at end of file
+/*
+.x-toolbar .x-tb-text-only{
+	background:none;
+	padding-left:0px;
+	padding-top:1px;
+	width:auto;
+	display:block;
+}
+.x-toolbar .x-tb-text{
+   padding:2px;
+}
+.x-toolbar .x-tb-button{
+   padding:2px 3px;
+	display:block;
+}
+.x-toolbar .x-tb-button-over{
+   background:#c3d3ed url(../images/default/toolbar/btn-over-bg.gif) repeat-x;
+	border:1px solid #6593cf;
+	padding:1px 2px;
+}
+.x-toolbar .x-tb-sep {
+	background-image: url(../images/default/grid/grid-split.gif);
+	background-position: center;
+	background-repeat: no-repeat;
+	display: block;
+	font-size: 1px;
+	height: 16px;
+	width:4px;
+	overflow: hidden;
+	cursor:default;
+	margin: 0px 2px 0px;
+	border:0px;
+}
+.mso .x-toolbar .x-tb-sep, .x-grid-mso .x-toolbar .x-tb-sep{
+	background-image: url(../images/default/grid/grid-blue-split.gif);
+}
+
+*/
+
+
+/** ---- Toolbar ontop of tab bar ---------- **/
+.x-tabs-strip-wrap .x-toolbar {
+    background: none !important;
+}
+.x-tab-strip-toolbar {
+    width: 100%;
+}
\ No newline at end of file