Merge pull request #69 from shniperson/master

css clean-up & refactoring
comindware · Aug 3, 2016 · 6a64f5e · 6a64f5e
2 parents e2aef77 + 83d9f21
commit 6a64f5e
Show file tree

Hide file tree

Showing 50 changed files with 4,998 additions and 10,322 deletions.
diff --git a/demo/public/app/cases/list/listBasicUsage.js b/demo/public/app/cases/list/listBasicUsage.js
@@ -31,7 +31,7 @@ define([
         // - you MUST implement ListItemViewBehavior
         // - you CAN implement onHighlighted/onUnhighlighted methods to support text highlighting while searching
         var ListItemView = Marionette.ItemView.extend({
-            template: Handlebars.compile('<div class="js-menu-select-item menu-bselect__item">{{title}}</div>'),
+            template: Handlebars.compile('<div class="dd-list__i">{{title}}</div>'),
 
             behaviors: {
                 ListItemViewBehavior: {

diff --git a/demo/public/app/cases/list/listGroupBy.js b/demo/public/app/cases/list/listGroupBy.js
@@ -54,7 +54,7 @@ define([
         // 5. Create child view that display list rows.
         // - you MUST implement ListItemViewBehavior
         var ListItemView = Marionette.ItemView.extend({
-            template: Handlebars.compile('<div class="js-menu-select-item menu-bselect__item"><span class="js-title">{{title}}</span></div>'),
+            template: Handlebars.compile('<div class="dd-list__i"><span class="js-title">{{title}}</span></div>'),
 
             behaviors: {
                 ListItemViewBehavior: {
@@ -65,7 +65,7 @@ define([
 
         // 5. Create child view that display grouping rows.
         var ListGroupItemView = Marionette.ItemView.extend({
-            template: Handlebars.compile('<h2 class="h3-group h3-group_mselect"> {{displayText}}</h2>'),
+            template: Handlebars.compile('<div class="dd-list__i dd-list__i_group"> {{displayText}}</div>'),
             className: 'mselect__group',
 
             behaviors: {

diff --git a/demo/public/app/cases/list/listSearchHighlight.js b/demo/public/app/cases/list/listSearchHighlight.js
@@ -36,7 +36,7 @@ define([
         // - you MUST implement ListItemViewBehavior
         // - [NEW] you MUST implement onHighlighted/onUnhighlighted methods to support text highlighting while searching
         var ListItemView = Marionette.ItemView.extend({
-            template: Handlebars.compile('<div class="js-menu-select-item menu-bselect__item"><span class="js-title">{{title}}</span></div>'),
+            template: Handlebars.compile('<div class="dd-list__i"><span class="js-title">{{title}}</span></div>'),
 
             ui: {
                 title: '.js-title'

diff --git a/demo/public/app/cases/other/splitPanel.js b/demo/public/app/cases/other/splitPanel.js
@@ -5,13 +5,13 @@ define([ 'comindware/core', 'demoPage/views/CanvasView' ], function (core, Canva
         // Important layout note: SplitPanelView expect that region element has computed size != 0.
 
         var Panel1View = Marionette.ItemView.extend({
-            template: Handlebars.compile('<div>Panel 1</div>'),
-            className: 'demo-cases__other__split-panel__panel'
+            template: Handlebars.compile('Panel 1'),
+            className: 'demo-split-panel demo-split-panel_left'
         });
 
         var Panel2View = Marionette.ItemView.extend({
-            template: Handlebars.compile('<div>Panel 2</div>'),
-            className: 'demo-cases__other__split-panel__panel'
+            template: Handlebars.compile('Panel 2'),
+            className: 'demo-split-panel demo-split-panel_right'
         });
 
         var MySplitPanel = core.views.SplitPanelView.extend({

diff --git a/demo/public/demoPage/templates/canvas.html b/demo/public/demoPage/templates/canvas.html
@@ -1 +1 @@
-<div class="js-view-region"></div>
+<div class="js-view-region demo-view-region"></div>
diff --git a/demo/public/demoPage/templates/listCanvas.html b/demo/public/demoPage/templates/listCanvas.html
@@ -1,2 +1,2 @@
-<div class="js-content-region dev-demo-core__list-canvas__content-region"></div>
-<div class="js-scrollbar-region dev-demo-core__list-canvas__scrollbar-region"></div>
+<div class="js-content-region demo-list-canvas"></div>
+<div class="js-scrollbar-region demo-list-scrollbar"></div>
diff --git a/demo/public/demoPage/templates/listSearchCanvas.html b/demo/public/demoPage/templates/listSearchCanvas.html
@@ -1,5 +1,5 @@
-<div class="js-search-region dev-demo-core__list-canvas__search-region"></div>
-<div class="dev-demo-core__list_canvas__list-container">
-    <div class="js-content-region dev-demo-core__list-canvas__content-region_search"></div>
-    <div class="js-scrollbar-region dev-demo-core__list-canvas__scrollbar-region_search"></div>
+<div class="js-search-region demo-list-search"></div>
+<div class="demo-list-container">
+    <div class="js-content-region demo-list-container__search"></div>
+    <div class="js-scrollbar-region demo-list-container__scrollbar"></div>
 </div>
diff --git a/demo/public/demoPage/views/ListCanvasView.js b/demo/public/demoPage/views/ListCanvasView.js
@@ -27,7 +27,7 @@ define([
             scrollbarRegion: '.js-scrollbar-region'
         },
 
-        className: 'dev-demo-core__list-canvas__view',
+        className: 'demo-list-canvas__view',
 
         onShow: function () {
             this.contentRegion.show(this.options.content);

diff --git a/demo/public/demoPage/views/ListSearchCanvasView.js b/demo/public/demoPage/views/ListSearchCanvasView.js
@@ -28,7 +28,7 @@ define([
             scrollbarRegion: '.js-scrollbar-region'
         },
 
-        className: 'dev-demo-core__list-canvas__view_search',
+        className: 'demo-list-canvas__view_search',
 
         onShow: function () {
             this.contentRegion.show(this.options.content);

diff --git a/demo/public/index.js b/demo/public/index.js
@@ -12,8 +12,6 @@ import 'babel-polyfill';
 
 import '../../dist/styles.bundle.css';
 import 'styles/demo.css';
-import 'styles/master.css';
-import 'styles/master-new.css';
 import 'lib/prism/prism.css';
 
 import Application from './Application';