diff --git a/index.html b/index.html index 80ba9e465..e58da9da9 100755 --- a/index.html +++ b/index.html @@ -27,10 +27,30 @@
Build your templates without coding
All text blocks could be edited easily with double clicking on it. You can create new text blocks with the command from the left panel
-
Try it now
+
Hover me
+
+
+
+
+
+
+
Title one
+
Subtitle one
+
You can create image blocks with the command from the left panel and edit them with double click
+
+
+
+
+
+
+
+
+
+
+
@@ -38,6 +58,7 @@
ASSET MANAGER
Manage your images with Asset Manager
You can create image blocks with the command from the left panel and edit them with double click
+
Image uploading is not allowed in this demo
@@ -47,20 +68,44 @@
Blocks
Each element in HTML page could be seen as a block. On the left panel you could find different kind of blocks that you can create, move and style
+
Starter
Some random list
-
+ Small feature 1
-
+ Small feature 2
-
+ Small feature 3
-
+ Small feature 4
+
+ Starter feature 1
+
+ Starter feature 2
+
+ Starter feature 3
+
+ Starter feature 4
$ 9,90/mo
+
+
+
Regular
+
Some random list
+
+ Regular feature 1
+
+ Regular feature 2
+
+ Regular feature 3
+
+ Regular feature 4
+
$ 19,90/mo
+
+
+
+
+
Enterprise
+
Some random list
+
+ Enterprise feature 1
+
+ Enterprise feature 2
+
+ Enterprise feature 3
+
+ Enterprise feature 4
+
$ 29,90/mo
+
+
+
@@ -140,6 +185,51 @@ background-color:#ffffff; color:#4c114e; } + .flex-sect{ + background-color: #fafafa; + padding: 100px 0; + } + .cards{ + padding: 20px 0; + display: flex; + justify-content: space-around; + flex-flow: wrap; + } + .card{ + background-color: white; + height: 300px; + width:300px; + margin-bottom:30px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2); + border-radius: 2px; + transition: all 0.5s ease; + font-weight: 100; + } + .card:hover{ + margin-top: -5px; + box-shadow: 0 20px 30px 0 rgba(0, 0, 0, 0.2); + } + .card-header{ + height: 155px; + background-image:url("http://placehold.it/350x250/78c5d6/fff/image1.jpg"); + background-size:cover; + background-position:center center; + } + .card-body{ + padding: 10px; + } + .card-title{ + font-size: 1.4em; + margin-bottom: 5px; + } + .card-sub-title{ + color: #b3b3b3; + font-size: 1em; + margin-bottom: 15px; + } + .card-desc{ + font-size: 0.85rem; + } .am-sect{ padding-top: 100px; padding-bottom: 100px; @@ -170,6 +260,11 @@ font-size:17px; line-height:25px; } + .am-post{ + padding:7px; + line-height:25px; + font-size:13px; + } .blk-sect{ padding-top: 100px; padding-bottom: 100px; @@ -204,6 +299,7 @@ border-radius:5px; font-weight: 100; color: #fff; + width: 90%; } .pc-title{ font-weight:100; @@ -219,22 +315,27 @@ } .pc-feature{ color:rgba(255,255,255,0.5); + background-color:rgba(0, 0, 0, 0.1); letter-spacing:2px; font-size:15px; padding:10px 20px; } .pc-feature:nth-of-type(2n){ background-color:transparent; - color: red; - } - .odd-feat{ - background-color:rgba(0, 0, 0, 0.1); } .pc-amount{ + background-color:rgba(0, 0, 0, 0.1); font-size: 35px; text-align: center; padding: 20px 0; } + .pc-regular{ + background-color: #da78a0; + } + .pc-enterprise{ + background-color: #d66a96; + } + pc-regular diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js index 33ea13fcb..10088a1c3 100644 --- a/src/style_manager/model/PropertyFactory.js +++ b/src/style_manager/model/PropertyFactory.js @@ -40,6 +40,7 @@ define(['backbone'], case 'background-repeat': case 'background-position': case 'background-attachment': case 'background-size': case 'transition-property': case 'transition-timing-function': case 'cursor': + case 'overflow': obj.type = 'select'; break; case 'top': case 'right': case 'bottom': case 'left': @@ -156,6 +157,9 @@ define(['backbone'], case 'transition-timing-function': obj.defaults = 'ease'; break; + case 'overflow': + obj.defaults = 'visible'; + break; } // Units @@ -389,6 +393,14 @@ define(['backbone'], { value : 'text'} ]; break; + case 'overflow': + obj.list = [ + { value : 'visible'}, + { value : 'hidden'}, + { value : 'scroll'}, + { value : 'auto'} + ]; + break; } // Properties diff --git a/test/specs/style_manager/model/Models.js b/test/specs/style_manager/model/Models.js index ca34c4ec4..c94943f46 100644 --- a/test/specs/style_manager/model/Models.js +++ b/test/specs/style_manager/model/Models.js @@ -783,6 +783,19 @@ define([path + 'Sector', obj.build('cursor').should.deep.equal([res]); }); + it('Build overflow', function() { + var res = { + type: 'select', + property: 'overflow', + defaults: 'visible', + list: [{ value : 'visible'}, + { value : 'hidden'}, + { value : 'scroll'}, + { value : 'auto'}], + }; + obj.build('overflow').should.deep.equal([res]); + }); + }); }