Permalink
Browse files

MINOR remove console.log. MINOR clean up for icon sprites in the cms …

…and content toolbars
  • Loading branch information...
1 parent 3d77214 commit aba6b441635deb5a2586e54ad59cd8cbf45f4cd3 @wilr wilr committed Oct 29, 2011
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -85,7 +85,6 @@
},
togglePanel: function(bool) {
- // if((!bool && this.hasClass('collapsed')) || (bool && !this.hasClass('collapsed'))) return;
//apply or unapply the flyout formatting
$('.cms-menu-list').children('li').each(function(){
@@ -74,9 +74,17 @@
// Monitor window resizes, panel changes and edit form loads for layout changes.
// Also triggers redraw through handleStateChange()
- $(window).resize(function() {self.redraw()});
- $('.cms-panel').live('toggle', function() {self.redraw();});
- $('.cms-edit-form').live('reloadeditform', function() {self.redraw()});
+ $(window).resize(function() {
+ self.redraw();
+ });
+
+ $('.cms-panel').live('toggle', function() {
+ self.redraw();
+ });
+
+ $('.cms-edit-form').live('reloadeditform', function() {
+ self.redraw()
+ });
// Remove loading screen
$('.ss-loading-screen').hide();
@@ -92,14 +100,13 @@
redraw: function() {
// Move from inner to outer layouts. Some of the elements might not exist.
- this.find('.cms-panel-layout').redraw(); // sidebar.
-
this.find('.cms-edit-form[data-layout]').redraw(); // Not all edit forms are layouted
this.find('.cms-preview').redraw();
this.find('.cms-content').redraw();
this.layout({resize: false});
- console.log('resizing page');
+
+ this.find('.cms-panel-layout').redraw(); // sidebar panels.
},
/**
@@ -322,7 +329,6 @@
$(".cms-panel-layout").entwine({
redraw: function() {
- console.log('adding layout');
this.layout({resize: false});
}
});
View
@@ -87,7 +87,7 @@ html,body {
.cms-content-header {
background-color: darken($color-widget-bg, 20%);
- padding: $grid-vertical $grid-horizontal ($grid-vertical - 2) $grid-horizontal * 2;
+ padding: $grid-vertical $grid-horizontal ($grid-vertical - 2);
height: $grid-vertical * 4;
z-index: 60;
border-bottom: 2px solid darken($color-widget-bg, 35%);
@@ -368,22 +368,22 @@ html,body {
z-index: 70;
.cms-panel-header {
- padding: 0 $grid-horizontal / 2;
- margin: $grid-vertical $grid-horizontal * 1.5 0;
+ padding: 0;
+ margin: 0 0 $grid-vertical - 1;
line-height: $grid-vertical * 3;
@include doubleborder(bottom, $color-light-separator, lighten($color-light-separator, 10%))
-
}
.cms-panel-content {
- width: ($grid-horizontal * 21);
- padding: $grid-vertical $grid-horizontal * 2;
+ width: ($grid-horizontal * 22);
+ padding: $grid-vertical $grid-horizontal;
+ overflow-x: hidden;
+ overflow-y: scroll;
}
.cms-content-header {
- background-color: darken($color-widget-bg, 40%);
-
+ background-color: darken($color-widget-bg, 40%);
border-bottom: 2px solid darken($color-widget-bg, 50%);
@include background-image(
@@ -437,7 +437,7 @@ html,body {
}
&.checkbox {
- padding: 0 8px 7px;
+ padding: 0 8px 0;
input {
margin: 2px 0;
View
@@ -496,7 +496,7 @@
clear: left;
}
- & li, ins {
+ & ins {
background-color: transparent;
background-image: url(../images/sitetree_ss_default_icons.png);
}
@@ -6,11 +6,13 @@
</div>
</div>
- <div class="cms-content-tools west cms-panel" data-expandOnClick="true">
+ <div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}">
- <h3 class="cms-panel-header">Filter</h3>
-
- <div class="cms-panel-content">
+ <div class="north">
+ <h3 class="cms-panel-header">Filter</h3>
+ <div>
+
+ <div class="cms-panel-content center">
<div id="SearchForm_holder" class="leftbottom ss-tabset">
<% if SearchClassSelector = tabs %>
<ul>

0 comments on commit aba6b44

Please sign in to comment.