Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
This commit is contained in:
Shannon
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
BIN
src/Umbraco.Web.UI.Client/src/assets/videos/formsintro.mp4
Normal file
BIN
src/Umbraco.Web.UI.Client/src/assets/videos/formsintro.mp4
Normal file
Binary file not shown.
@@ -54,7 +54,7 @@
|
||||
@import "../../lib/bootstrap/less/thumbnails.less";
|
||||
@import "../../lib/bootstrap/less/media.less";
|
||||
@import "../../lib/bootstrap/less/labels-badges.less";
|
||||
@import "../../lib/bootstrap/less/progress-bars.less";
|
||||
@import "../../lib/bootstrap/less/progress-bars.less";
|
||||
@import "../../lib/bootstrap/less/accordion.less";
|
||||
@import "../../lib/bootstrap/less/carousel.less";
|
||||
@import "../../lib/bootstrap/less/hero-unit.less";
|
||||
@@ -63,7 +63,7 @@
|
||||
@import "../../lib/bootstrap/less/utilities.less"; // Has to be last to override when necessary
|
||||
|
||||
// Belle styles
|
||||
@import "grid.less";
|
||||
@import "grid.less";
|
||||
@import "login.less";
|
||||
@import "buttons.less";
|
||||
@import "forms.less";
|
||||
@@ -78,9 +78,10 @@
|
||||
@import "footer.less";
|
||||
@import "animations.less";
|
||||
@import "dragdrop.less";
|
||||
@import "dashboards.less";
|
||||
|
||||
//used for property editors
|
||||
@import "property-editors.less";
|
||||
|
||||
@import "typeahead.less";
|
||||
@import "hacks.less";
|
||||
@import "hacks.less";
|
||||
|
||||
@@ -171,6 +171,7 @@ input[type="button"] {
|
||||
.btn-primary {
|
||||
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
|
||||
}
|
||||
|
||||
// Warning appears are orange
|
||||
.btn-warning {
|
||||
.buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
|
||||
@@ -209,6 +210,20 @@ input[type="button"] {
|
||||
|
||||
}
|
||||
|
||||
.btn-install {
|
||||
margin: 40px auto;
|
||||
display: block;
|
||||
padding: 15px 50px;
|
||||
font-size: 16px;
|
||||
border: none;
|
||||
background: @blue;
|
||||
color: white;
|
||||
|
||||
&:hover {
|
||||
background: #2b8ee3;
|
||||
}
|
||||
}
|
||||
|
||||
// Cross-browser Jank
|
||||
// --------------------------------------------------
|
||||
|
||||
|
||||
61
src/Umbraco.Web.UI.Client/src/less/dashboards.less
Normal file
61
src/Umbraco.Web.UI.Client/src/less/dashboards.less
Normal file
@@ -0,0 +1,61 @@
|
||||
.umb-dashboards-forms-install {
|
||||
background: url('../img/forms/installer-background.png');
|
||||
background-repeat: repeat-x;
|
||||
position: relative;
|
||||
top: -30px;
|
||||
padding-top: 30px;
|
||||
box-shadow: inset 0px -40px 30px 25px rgba(255,255,255,1);
|
||||
border-radius: 0px 0px 200px 200px;
|
||||
-moz-border-radius: 0px 0px 200px 200px;
|
||||
-webkit-border-radius: 0px 0px 200px 200px;
|
||||
|
||||
small {
|
||||
font-size: 14px;
|
||||
opacity: .5;
|
||||
}
|
||||
|
||||
.umb-loader{
|
||||
width: 640px;
|
||||
height: 4px;
|
||||
}
|
||||
|
||||
.video_player video {
|
||||
width: 100%;
|
||||
max-width: 640px;
|
||||
border: 1px solid #ededed;
|
||||
border-left: none;
|
||||
border-bottom: none;
|
||||
box-sizing:border-box;
|
||||
-moz-box-sizing:border-box;
|
||||
}
|
||||
|
||||
.installer-top {
|
||||
overflow: hidden;
|
||||
margin: 0 auto 30px;
|
||||
height: 80px;
|
||||
line-height: 80px;
|
||||
text-align: center;
|
||||
position: relative;
|
||||
|
||||
i, h3 {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
i {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
margin-top: -40px;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin: 0;
|
||||
line-height: 80px;
|
||||
font-weight: 700;
|
||||
margin-left: 100px;
|
||||
font-size: 36px;
|
||||
letter-spacing: -1px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,60 +1,36 @@
|
||||
<div ng-controller="Umbraco.Dashboard.FormsDashboardController">
|
||||
<div ng-controller="Umbraco.Dashboard.FormsDashboardController" class="umb-dashboards-forms-install">
|
||||
<div style="max-width: 800px; text-align: center; margin: auto; padding: 20px; min-height: 800px;">
|
||||
|
||||
<div style="max-width: 800px; text-align: center; margin: auto; padding: 20px">
|
||||
<div class="installer-top"> <!-- ADDED -->
|
||||
<i style="font-size: 80px" class="icon icon-umb-contour"></i>
|
||||
<h3>Umbraco Forms</h3>
|
||||
</div> <!-- ADDED -->
|
||||
|
||||
<i style="font-size: 80px" class="icon icon-umb-contour"></i>
|
||||
<div class="step-one" ng-hide="state"> <!-- STEP one -->
|
||||
|
||||
<h3>Umbraco Forms Preivew</h3>
|
||||
<div id="video_1" class="video_player" style="margin-bottom: 40px">
|
||||
<video autoplay loop>
|
||||
<!-- <source src="videos/gif.webm" type="video/webm"> -->
|
||||
<source src="assets/videos/formsintro.mp4" type="video/mp4">
|
||||
Sorry, you don't have HTML5 video and we didn't catch this properly in javascript.
|
||||
</video>
|
||||
</div>
|
||||
|
||||
<p><strong>Umbraco forms makes creating contact forms, entry forms and questionnaires just as easy as using Word. You won't need to write a single line of code.</strong></p>
|
||||
<p style="font-size: 16px; line-height: 1.5; color: #4c4c4c;">Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it!</p>
|
||||
|
||||
<p>A new version of Umbraco Forms is coming. We've reimagined the entire product from ground up and would love
|
||||
input from experienced users before we launch.</p>
|
||||
|
||||
<button class="btn publish" ng-hide="state" ng-click="installForms()">Install</button>
|
||||
|
||||
<br/>
|
||||
<small>Preview version should not be used in production</small>
|
||||
<br/>
|
||||
|
||||
<div style="width: 99%; overflow: hidden" ng-if="state">
|
||||
<p>{{state}}...</p>
|
||||
<div class="umb-loader"></div>
|
||||
<button class="btn publish btn-install" ng-click="installForms()">Install</button>
|
||||
<small>Preview version should not be used in production</small>
|
||||
</div>
|
||||
|
||||
<div class="step-two" ng-if="state"> <!-- STEP two -->
|
||||
<p id="installer" style="font-size: 16px; line-height: 1.5; color: #4c4c4c;">Installing...</p>
|
||||
|
||||
<hr/>
|
||||
|
||||
|
||||
<div class="row-fluid">
|
||||
<div class="span4" style="padding: 10px; text-align: left">
|
||||
<div class="thumbnail" style="height: 100px"></div>
|
||||
|
||||
<h4><i class="icon icon-thumb-up"></i> Easy to use</h4>
|
||||
<p>
|
||||
Everything from simple contact forms to multiple page questionaries are possible to build in our visual form designer.
|
||||
</p>
|
||||
<div class="installing">
|
||||
<div style="width: 99%; overflow: hidden" ng-if="state">
|
||||
<div class="umb-loader"></div>
|
||||
<small>{{state}}</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="span4" style="padding: 10px; text-align: left">
|
||||
|
||||
<div class="thumbnail" style="height: 100px"></div>
|
||||
|
||||
<h4><i class="icon icon-code"></i> In control</h4>
|
||||
<p>
|
||||
Markup matters, thats why you are in full control, if there's part you don't like, simply swap with one that fits.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="span4" style="padding: 10px; text-align: left">
|
||||
<div class="thumbnail" style="height: 100px"></div>
|
||||
<h4><i class="icon icon-mindmap"></i> Connected and flexible</h4>
|
||||
<p>Your form doesnt just collect entries, it can send it off to remote services, database, or simply to your inbox</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user