Merge pull request #1 from davidkaneda/master

UPDATIN YO STYLEZ
senchalearn · Jul 15, 2011 · 99f5590 · 99f5590
2 parents 4f356f9 + 25a73d4
commit 99f5590
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/lib/.DS_Store
+/lib/.DS_Store
+/scss/.sass-cache/
diff --git a/app/app.js b/app/app.js
@@ -156,17 +156,22 @@ var wb = new Ext.Application({
                         (wb.indicatorCardChart = new Ext.chart.Chart({
                             title: 'Chart',
                             store: null,
-                            interactions: [],
+                            theme: 'Fancy',
+                            interactions: [{
+                                type: 'reset'
+                            }, {
+                                type: 'axisnavigation'
+                            }],
                             axes: [{
                                 type: 'Numeric',
-                                grid: {
-                                    odd: {
-                                        opacity: 1,
-                                        fill: '#ddd',
-                                        stroke: '#bbb',
-                                        'stroke-width': 0.5
-                                    }
-                                },
+                                // grid: {
+                                //     odd: {
+                                //         opacity: 1,
+                                //         fill: '#ddd',
+                                //         stroke: '#bbb',
+                                //         'stroke-width': 0.5
+                                //     }
+                                // },
                                 position: 'left',
                                 fields: ['value'],
                                 title: 'Value'
@@ -181,14 +186,14 @@ var wb = new Ext.Application({
                             series: [{
                                 type: 'line',
                                 lineWidth: 1,
-                                showMarkers: false,
+                                // showMarkers: false,
                                 fill: true,
                                 axis: 'left',
                                 xField: 'date',
-                                yField: 'value',
-                                style: {
-                                    'stroke-width': 1
-                                }
+                                yField: 'value'
+                                // style: {
+                                //     'stroke-width': 1
+                                // }
                             }]
                         })),
                         (wb.indicatorCardTable = new Ext.List({

diff --git a/css/worldbank.css b/css/worldbank.css
diff --git a/index.html b/index.html
@@ -7,15 +7,12 @@
         <script src="lib/touch/sencha-touch.js" type="text/javascript"></script>
         <script src="lib/touch/touch-charts-debug.js" type="text/javascript"></script>
 
-        <link href="lib/touch/resources/css/sencha-touch.css" rel="stylesheet" type="text/css" />
-        <link href="lib/touch/resources/css/touch-charts.css" rel="stylesheet" type="text/css" />
+        <link href="css/worldbank.css" rel="stylesheet" type="text/css">
 
         <script src="http://maps.google.com/maps/api/js?sensor=true" type="text/javascript"></script>
 
         <script type="text/javascript" src="app/app.js"></script>
         <script type="text/javascript" src="app/models.js"></script>
-
-
     </head>
     <body></body>
 </html>
diff --git a/scss/config.rb b/scss/config.rb
@@ -0,0 +1,16 @@
+# Get the directory that this configuration file exists in
+dir = File.dirname(__FILE__)
+
+# Load the sencha-touch and touch-charts frameworks automatically.
+load File.join(dir, '..', '..', 'SDK', 'touch', 'resources', 'themes')
+load File.join(dir, '..', '..', 'SDK', 'charts', 'resources', 'themes')
+
+# Compass configurations
+sass_path = dir
+css_path = File.join(dir, "..", "css")
+
+images_path = File.join(dir, '..', '..', 'SDK', 'charts', 'resources', 'images')
+
+# Require any additional compass plugins here.
+environment  = :production
+output_style = :compressed
diff --git a/scss/worldbank.scss b/scss/worldbank.scss
@@ -0,0 +1,29 @@
+// Base Sencha Touch stylesheets
+
+$base-color: #5d6056;
+$active-color: #8c0000;
+
+$list-bg-color: #f3f4f0;
+
+@import 'sencha-touch/default/all';
+
+@include sencha-panel;
+@include sencha-buttons;
+/*@include sencha-sheet;*/
+/*@include sencha-picker;*/
+@include sencha-tabs;
+@include sencha-toolbar;
+@include sencha-toolbar-forms;
+/*@include sencha-carousel;*/
+/*@include sencha-indexbar;*/
+@include sencha-list;
+/*@include sencha-list-paging;*/
+/*@include sencha-list-pullrefresh;*/
+@include sencha-layout;
+@include sencha-form;
+@include sencha-msgbox;
+@include sencha-loading-spinner;
+
+// @import Touch charts
+
+@import 'touch-charts/default/all';