Merge pull request #10 from SlateFoundation/development

themightychris · themightychris · commit c547aa9e72e2 · 2015-09-14T14:32:01.000-04:00
Release: slate-theme v2.1.1
diff --git a/overrides/tree/Panel.js b/overrides/tree/Panel.js
@@ -0,0 +1,6 @@
+Ext.define('SlateTheme.tree.Panel', {
+    override: 'Ext.tree.Panel',
+
+    useArrows: false,
+    lines: false
+});
diff --git a/resources/images/tree/minus.svg b/resources/images/tree/minus.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+    <g opacity=".5">
+        <path fill="#FFF" d="M2 10.5C1.2 10.5.5 9.8.5 9V2C.5 1.2 1.2.5 2 .5h7c.8 0 1.5.7 1.5 1.5v7c0 .8-.7 1.5-1.5 1.5H2z"/>
+        <path fill="#999" d="M9 1c.5 0 1 .5 1 1v7c0 .5-.5 1-1 1H2c-.5 0-1-.5-1-1V2c0-.5.5-1 1-1h7m0-1H2C.9 0 0 .9 0 2v7c0 1.1.9 2 2 2h7c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2z"/>
+        <path fill="#333" d="M2 5h7v1H2z"/>
+    </g>
+</svg>
diff --git a/resources/images/tree/plus.svg b/resources/images/tree/plus.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+    <g opacity=".5">
+        <path fill="#FFF" d="M2 10.5C1.2 10.5.5 9.8.5 9V2C.5 1.2 1.2.5 2 .5h7c.8 0 1.5.7 1.5 1.5v7c0 .8-.7 1.5-1.5 1.5H2z"/>
+        <path fill="#999" d="M9 1c.5 0 1 .5 1 1v7c0 .5-.5 1-1 1H2c-.5 0-1-.5-1-1V2c0-.5.5-1 1-1h7m0-1H2C.9 0 0 .9 0 2v7c0 1.1.9 2 2 2h7c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2z"/>
+        <path fill="#333" d="M9 5v1H6v3H5V6H2V5h3V2h1v3"/>
+    </g>
+</svg>
diff --git a/sass/src/button/Button.scss b/sass/src/button/Button.scss
@@ -1,5 +1,6 @@
 @include glyph-color('danger',  $danger-color);
 @include glyph-color('success', $success-color);
+@include glyph-color('accent',  $accent-color);
 
 .x-btn {
 }
diff --git a/sass/src/grid/feature/Grouping.scss b/sass/src/grid/feature/Grouping.scss
@@ -7,4 +7,12 @@
     small.pull-right {
         margin-top: .0625em;
     }
+
+    .has-small-group-headers & {
+        color: $muted-color;
+        font-size: smaller;
+        letter-spacing: .5px;
+        padding-top: 1em;
+        text-transform: uppercase;
+    }
 }
diff --git a/sass/src/panel/Panel.scss b/sass/src/panel/Panel.scss
@@ -0,0 +1,6 @@
+.x-panel-body {
+    .empty-text {
+        padding: 1.5em;
+        text-align: center;
+    }
+}
diff --git a/sass/src/tree/View.scss b/sass/src/tree/View.scss
@@ -14,4 +14,16 @@
 
 .x-tree-icon-leaf {
     background-image: inline-image('tree/file.svg');
+}
+
+.x-tree-no-lines {
+    .x-tree-expander {
+        background-image: inline-image('tree/plus.svg');
+        background-position: center;
+        background-size: 11px;
+    }
+
+    .x-grid-tree-node-expanded .x-tree-expander {
+        background-image: inline-image('tree/minus.svg');
+    }
 }
diff --git a/sass/var/toolbar/Toolbar.scss b/sass/var/toolbar/Toolbar.scss
@@ -1,2 +1,3 @@
-$toolbar-background-color: #e9e9e9 !default;
-$toolbar-vertical-spacing: 5px !default;
+$toolbar-background-color:  #e9e9e9 !default;
+$toolbar-separator-color:   darken($toolbar-background-color, 15) !default;
+$toolbar-vertical-spacing:  5px !default;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`@include glyph-color('danger', $danger-color);`
`2`	`2`	`@include glyph-color('success', $success-color);`
	`3`	`+@include glyph-color('accent', $accent-color);`
`3`	`4`
`4`	`5`	`.x-btn {`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,12 @@`
`7`	`7`	`small.pull-right {`
`8`	`8`	`margin-top: .0625em;`
`9`	`9`	`}`
	`10`	`+`
	`11`	`+ .has-small-group-headers & {`
	`12`	`+ color: $muted-color;`
	`13`	`+ font-size: smaller;`
	`14`	`+ letter-spacing: .5px;`
	`15`	`+ padding-top: 1em;`
	`16`	`+ text-transform: uppercase;`
	`17`	`+ }`
`10`	`18`	`}`