yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9591

Browse Source
This commit is contained in:
Shannon
2017-03-20 18:28:38 +11:00
parent 6344ad28aa f4eb37d44d
commit fd0cb7da23
20 changed files with 431 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SolutionInfo.cs
View File

@@ -12,4 +12,4 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.6.0")]
[assembly: AssemblyInformationalVersion("7.6.0-alpha074")]
[assembly: AssemblyInformationalVersion("7.6.0-beta")]

2
src/Umbraco.Core/Configuration/UmbracoVersion.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
/// Gets the version comment (like beta or RC).
/// </summary>
/// <value>The version comment.</value>
public static string CurrentComment { get { return "alpha074"; } }
public static string CurrentComment { get { return "beta"; } }
// Get the version of the umbraco.dll by looking at a class in that dll
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

3
src/Umbraco.Core/Security/MembershipProviderBase.cs
View File

@@ -326,7 +326,8 @@ namespace Umbraco.Core.Security
//Special case to allow changing password without validating existing credentials
//This is used during installation only
if (AllowManuallyChangingPassword == false && ApplicationContext.Current.IsConfigured == false && oldPassword == "default")
if (AllowManuallyChangingPassword == false && ApplicationContext.Current != null
&& ApplicationContext.Current.IsConfigured == false && oldPassword == "default")
{
return PerformChangePassword(username, oldPassword, newPassword);
}

16
src/Umbraco.Web.UI.Client/gruntFile.js
View File

@@ -11,17 +11,17 @@ module.exports = function (grunt) {
//TODO: Too much watching, this brings windows to it's knees when in dev mode
//run by the watch task
grunt.registerTask('watch-js', ['jshint:dev', 'concat', 'copy:app', 'copy:mocks', 'copy:canvasdesigner', 'copy:vs', 'karma:unit']);
grunt.registerTask('watch-less', ['recess:build', 'recess:installer', 'recess:canvasdesigner', 'postcss', 'copy:canvasdesigner', 'copy:assets', 'copy:vs']);
grunt.registerTask('watch-less', ['recess:build', 'recess:installer', 'recess:nonodes', 'recess:canvasdesigner', 'postcss', 'copy:canvasdesigner', 'copy:assets', 'copy:vs']);
grunt.registerTask('watch-html', ['copy:views', 'copy:vs']);
grunt.registerTask('watch-installer', ['concat:install', 'concat:installJs', 'copy:installer', 'copy:vs']);
grunt.registerTask('watch-canvasdesigner', ['copy:canvasdesigner', 'concat:canvasdesignerJs', 'copy:vs']);
grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']);
//triggered from grunt
grunt.registerTask('build', ['concat', 'recess:build', 'recess:installer', 'recess:canvasdesigner', 'postcss', 'bower-install-simple', 'bower', 'copy', 'clean:post']);
grunt.registerTask('build', ['concat', 'recess:build', 'recess:installer', 'recess:nonodes', 'recess:canvasdesigner', 'postcss', 'bower-install-simple', 'bower', 'copy', 'clean:post']);
//triggered from grunt dev vs or grunt vs
grunt.registerTask('build-dev', ['clean:pre', 'concat', 'recess:build', 'recess:installer', 'postcss', 'bower-install-simple', 'bower', 'copy']);
grunt.registerTask('build-dev', ['clean:pre', 'concat', 'recess:build', 'recess:installer', 'recess:nonodes', 'postcss', 'bower-install-simple', 'bower', 'copy']);
//utillity tasks
grunt.registerTask('docs', ['ngdocs']);
@@ -293,6 +293,16 @@ module.exports = function (grunt) {
compress: true
}
},
nonodes: {
files: {
'<%= distdir %>/assets/css/nonodes.style.min.css':
['src/less/pages/nonodes.less']
},
options: {
compile: true,
compress: true
}
},
installer: {
files: {
'<%= distdir %>/assets/css/installer.css':

17
src/Umbraco.Web.UI.Client/src/assets/css/nonodes.style.min.css vendored
View File

@@ -1,17 +0,0 @@
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url('../fonts/opensans/OpenSans-Regular-webfont.eot');
src: local('Open Sans'), local('OpenSans'), url('../fonts/opensans/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/opensans/OpenSans-Regular-webfont.ttf') format('truetype'), url('../fonts/opensans/OpenSans-Regular-webfont.svg#open_sansregular') format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 600;
src: url('../fonts/opensans/OpenSans-Semibold-webfont.eot');
src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('../fonts/opensans/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/opensans/OpenSans-Semibold-webfont.ttf') format('truetype'), url('../fonts/opensans/OpenSans-Semibold-webfont.svg#open_sanssemibold') format('svg');
}
abbr,address,article,aside,audio,b,blockquote,body,canvas,caption,cite,code,dd,del,details,dfn,div,dl,dt,em,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,p,pre,q,samp,section,small,span,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,ul,var,video{margin:0;padding:0;outline:0;border:0;background:0 0;vertical-align:baseline;font-size:100%}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}nav ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}a{margin:0;padding:0;background:0 0;vertical-align:baseline;font-size:100%}ins{background-color:#ff9;color:#000;text-decoration:none}mark{background-color:#ff9;color:#000;font-weight:700;font-style:italic}del{text-decoration:line-through}abbr[title],dfn[title]{border-bottom:1px dotted;cursor:help}table{border-spacing:0;border-collapse:collapse}hr{display:block;margin:1em 0;padding:0;height:1px;border:0;border-top:1px solid #ccc}input,select{vertical-align:middle}html{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}*,:after,:before{box-sizing:border-box}body,html{height:100%;width:100%;color:#fff;font-family:'Open Sans',sans-serif;font-weight:400;font-size:.9375em;line-height:1.5}h1{font-size:1.7em;margin:40px auto 10px;font-weight:700}h2{font-size:1.35em;margin:0 auto .4em;font-weight:700}h3{font-size:1em;font-weight:400;font-style:italic}p{font-size:1em;line-height:1.6}p+a{margin-top:1rem;display:inline-block}a,a:active,a:visited{text-decoration:none}.cta{margin:4.5em auto 1.5em;padding-bottom:4.5em}.button,.button:visited{padding:.9375em 1.875em;border-radius:.1em;font-weight:600;font-size:1.2em;background:#2e99f4;color:#fff;display:inline-block;border:none;transition:all 200ms ease-in-out}.button:hover,.button:visited:hover{border-bottom:none;background:#0c80e3}section{background:url(../img/nonodesbg.jpg) center center/cover;height:100%;width:100%;display:table;padding:3em 1.75em}section a,section a:focus,section a:visited{color:#46a5f5;font-size:1.1625em;border-bottom:1px solid transparent;transition:border-bottom 100ms ease-in-out}section a:focus:hover,section a:hover,section a:visited:hover{border-bottom:1px solid}section:after{content:"";position:absolute;top:0;right:0;bottom:0;left:0;background:rgba(0,0,0,.17);background:linear-gradient(45deg,rgba(85,98,112,.1) 10%,rgba(255,107,107,.1) 95%);z-index:0}section article{display:table-cell;vertical-align:middle;margin:0 auto;text-align:center;position:relative;z-index:100}section article>div{max-width:60em;margin:0 auto}section .logo{background:url(../img/logo.png) no-repeat;width:91px;height:91px;margin:0 auto}section .row{overflow:hidden}section .row .col{text-align:left;width:100%}section .row .col:nth-child(2){margin-top:3em}@media screen and (min-width:48em){body,html{font-size:1em}h1{font-size:2.5em;margin:70px auto 0;letter-spacing:.5px}h2{font-size:1.4375em;margin:0 auto 1em}h3{font-size:1.2em}a{font-size:1.1rem;font-weight:600}p+a{margin-top:3rem}.cta{margin:7.5em auto 2.5em;border-bottom:1px solid rgba(255,255,255,.5);padding-bottom:7.5em}section{padding:0 15px}section .row .col{float:left;width:50%;padding-right:5%;display:inline-block}section .row .col:nth-child(2){padding-right:0;padding-left:5%;margin-top:0}.button{font-size:1.1625em}}

BIN
src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 KiB

After

Width:  |  Height:  |  Size: 273 KiB

2
src/Umbraco.Web.UI.Client/src/installer/steps/database.html
View File

@@ -100,7 +100,7 @@
<input type="submit" ng-disabled="myForm.$invalid || checking" ng-class="{disabled:myForm.$invalid}"
value="Continue" class="btn btn-success" />
<button class="btn" ng-click="restart()">Go back</button>
<button class="btn btn-info" ng-click="restart()">Go back</button>
<span class="inline-help" ng-if="checking" ng-animate="'fade'">
Validating your database connection...

2
src/Umbraco.Web.UI.Client/src/installer/steps/upgrade.html
View File

@@ -8,7 +8,7 @@
To read a report of changes between your current version <strong>{{installer.current.model.currentVersion}}</strong> and this version your upgrading to <strong>{{installer.current.model.newVersion}}</strong>
</p>
<p>
<a ng-href="{{installer.current.model.reportUrl}}" target="_blank" class="btn">View Report</a>
<a ng-href="{{installer.current.model.reportUrl}}" target="_blank" class="btn btn-info">View Report</a>
</p>
<p>

13
src/Umbraco.Web.UI.Client/src/installer/steps/user.html
View File

@@ -46,16 +46,21 @@
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" id="subscribeToNewsLetter" name="subscribeToNewsLetter"
ng-model="installer.current.model.subscribeToNewsLetter" /> Keep me updated on Umbraco Versions, Security Bulletins and Community News</label>
<label>
<input
type="checkbox"
id="subscribeToNewsLetter"
name="subscribeToNewsLetter"
ng-model="installer.current.model.subscribeToNewsLetter" />
Keep me updated on Umbraco Versions, Security Bulletins and Community News
</label>
</div>
</div>
<div class="control-group" ng-class="{disabled:myForm.$invalid}">
<div class="controls">
<input type="submit" ng-disabled="myForm.$invalid" value="Install" class="btn btn-success" />
<a href class="btn btn-neutral control-customize" ng-disabled="myForm.$invalid" ng-click="validateAndForward()">Customize</a>
<a href class="btn btn-info control-customize" ng-disabled="myForm.$invalid" ng-click="validateAndForward()">Customize</a>
</div>
</div>

2
src/Umbraco.Web.UI.Client/src/less/application/grid.less
View File

@@ -19,6 +19,8 @@ body {
line-height: @baseLineHeight;
color: @textColor;
background-color: @bodyBackground;
// better font rendering
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;

4
src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
View File

@@ -367,7 +367,7 @@ input.umb-group-builder__group-sort-value {
/* ---------- PLACEHOLDER BOX ---------- */
.umb-group-builder__placeholder-box {
background: @gray-8;
background: @gray-9;
box-sizing: border-box;
display: flex;
align-items: center;
@@ -475,7 +475,7 @@ input.umb-group-builder__group-sort-value {
border-radius: 5px;
color: @gray-3;
font-weight: bold;
font-size: 13px;
font-size: 14px;
color: @turquoise-d1;
&:hover {
text-decoration: none;

3
src/Umbraco.Web.UI.Client/src/less/components/umb-insert-code-box.less
View File

@@ -24,7 +24,8 @@
}
.umb-insert-code-box__description {
font-size: 12px;
font-size: 13px;
line-height: 1.6em;
}
.umb-insert-code-box__check {

2
src/Umbraco.Web.UI.Client/src/less/forms.less
View File

@@ -331,7 +331,7 @@ input[type="checkbox"]:focus {
// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
input,
textarea {
.placeholder();
.placeholder(@gray-6);
}

2
src/Umbraco.Web.UI.Client/src/less/forms/umb-validation-label.less
View File

@@ -3,7 +3,7 @@
padding: 1px 5px;
background: @red;
color: @white;
font-size: 10px;
font-size: 11px;
line-height: 1.5em;
}

14
src/Umbraco.Web.UI.Client/src/less/installer.less
View File

@@ -40,6 +40,12 @@ body {
vertical-align: middle;
text-align: center;
// better font rendering
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
#logo{
@@ -116,7 +122,7 @@ body {
h1{
border-bottom: 1px solid @gray-10;
padding-bottom: 10px;
color: @gray-3;
color: @gray-2;
}
.error h1, .error .message, span.error{ color: @red;}
@@ -128,6 +134,12 @@ input.ng-dirty.ng-invalid{border-color: #b94a48; color: #b94a48;}
opacity: 0.6;
}
#installer label.control-label,
#installer .constrol-label {
padding-top: 5px !important;
}
.controls{
text-align: left
}

367
src/Umbraco.Web.UI.Client/src/less/pages/nonodes.less Normal file
View File

@@ -0,0 +1,367 @@
@import "../fonts.less"; // Loading fonts
@import "../variables.less"; // Loading variables
abbr,
address,
article,
aside,
audio,
b,
blockquote,
body,
canvas,
caption,
cite,
code,
dd,
del,
details,
dfn,
div,
dl,
dt,
em,
fieldset,
figcaption,
figure,
footer,
form,
h1,
h2,
h3,
h4,
h5,
h6,
header,
hgroup,
html,
i,
iframe,
img,
ins,
kbd,
label,
legend,
li,
mark,
menu,
nav,
object,
ol,
p,
pre,
q,
samp,
section,
small,
span,
strong,
sub,
summary,
sup,
table,
tbody,
td,
tfoot,
th,
thead,
time,
tr,
ul,
var,
video {
margin: 0;
padding: 0;
outline: 0;
border: 0;
background: 0 0;
vertical-align: baseline;
font-size: 100%;
}
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}
nav ul {
list-style: none;
}
blockquote,
q {
quotes: none;
}
blockquote:after,
blockquote:before,
q:after,
q:before {
content: '';
content: none;
}
a {
margin: 0;
padding: 0;
background: 0 0;
vertical-align: baseline;
font-size: 100%;
}
ins {
background-color: @yellow-l3;
color: @black;
text-decoration: none;
}
mark {
background-color: @yellow-l3;
color: @black;
font-weight: bold;
font-style: italic;
}
del {
text-decoration: line-through;
}
abbr[title],
dfn[title] {
border-bottom: 1px dotted;
cursor: help;
}
table {
border-spacing: 0;
border-collapse: collapse;
}
hr {
display: block;
margin: 1em 0;
padding: 0;
height: 1px;
border: 0;
border-top: 1px solid @gray-8;
}
input,
select {
vertical-align: middle;
}
html {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
*,
:after,
:before {
box-sizing: border-box;
}
body,
html {
height: 100%;
width: 100%;
color: @white;
font-family: @sansFontFamily;
font-weight: 400;
font-size: .9375em;
line-height: 1.5;
}
h1 {
font-size: 1.7em;
margin: 40px auto 10px;
font-weight: 700;
}
h2 {
font-size: 1.35em;
margin: 0 auto .4em;
font-weight: 700;
}
h3 {
font-size: 1em;
font-weight: 400;
font-style: italic;
}
p {
font-size: 1em;
line-height: 1.6;
}
p+a {
margin-top: 1rem;
display: inline-block;
}
a,
a:active,
a:visited {
text-decoration: none;
}
.cta {
margin: 4.5em auto 1.5em;
padding-bottom: 4.5em;
}
.button,
.button:visited {
padding: .9375em 1.875em;
border-radius: .1em;
font-weight: 600;
font-size: 1.2em;
background: @green;
color: @white;
display: inline-block;
border: none;
transition: all 200ms ease-in-out;
border-radius: 3px;
}
.button:hover,
.button:visited:hover {
border-bottom: none;
background: @green-d1;
}
section {
background-image: url(../img/nonodesbg.jpg);
background-position: center center;
background-size: cover;
height: 100%;
width: 100%;
display: table;
padding: 3em 1.75em
}
section a,
section a:focus,
section a:visited {
color: @white;
font-size: 1.1625em;
border-bottom: 1px solid @white;
transition: border-bottom 100ms ease-in-out;
}
section a:focus:hover,
section a:hover,
section a:visited:hover {
border-bottom: 1px solid;
}
section:after {
content: "";
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(0, 0, 0, .17);
background: linear-gradient(45deg, rgba(85, 98, 112, .1) 10%, rgba(255, 107, 107, .1) 95%);
z-index: 0
}
section article {
display: table-cell;
vertical-align: middle;
margin: 0 auto;
text-align: center;
position: relative;
z-index: 100;
}
section article>div {
max-width: 60em;
margin: 0 auto;
padding-top: 50px;
padding-bottom: 70px;
}
section .logo {
background-image: url(../img/logo.png);
background-repeat: no-repeat;
width: 91px;
height: 91px;
margin: 0 auto;
}
section .row {
overflow: hidden;
}
section .row .col {
text-align: left;
width: 100%;
}
section .row .col:nth-child(2) {
margin-top: 3em;
}
@media screen and (min-width:48em) {
body,
html {
font-size: 1em;
}
h1 {
font-size: 2.5em;
margin: 70px auto 0;
letter-spacing: .5px;
}
h2 {
font-size: 1.4375em;
margin: 0 auto 1em;
}
h3 {
font-size: 1.2em;
}
a {
font-size: 1.1rem;
font-weight: 600;
}
p+a {
margin-top: 3rem;
}
.cta {
margin: 7.5em auto 2.5em;
border-bottom: 1px solid @gray-5;
padding-bottom: 7.5em;
}
section {
padding: 0 15px;
}
section .row .col {
float: left;
width: 50%;
padding-right: 5%;
display: inline-block;
}
section .row .col:nth-child(2) {
padding-right: 0;
padding-left: 5%;
margin-top: 0;
}
.button {
font-size: 1.1625em;
}
}

2
src/Umbraco.Web.UI.Client/src/less/panel.less
View File

@@ -470,7 +470,7 @@ input.umb-panel-header-description {
background: transparent;
border-color: transparent;
margin-bottom: 0;
font-size: 12px;
font-size: 13px;
box-sizing: border-box;
height: 25px;
line-height: 25px;

2
src/Umbraco.Web.UI.Client/src/less/sections.less
View File

@@ -51,7 +51,7 @@ ul.sections li a {
}
ul.sections a span {
font-size: 10px;
font-size: 11px;
line-height: 1.4em;
opacity: 0;
-webkit-transition: all .3s linear;

22
src/Umbraco.Web.UI.Client/src/less/tree.less
View File

@@ -119,10 +119,9 @@
.umb-tree li.root > div a,
.umb-tree li.root h5, .umb-tree-header {
text-transform: uppercase;
color: @gray-7;
color: @gray-2;
font-weight: bold;
font-size: 13px;
font-size: 15px;
}
.umb-tree ins {
@@ -377,12 +376,15 @@ div.locked:before{
.umb-actions a {
white-space: nowrap;
display: block;
font-size: 14px;
font-size: 15px;
color: @black;
padding: 8px 25px 8px 20px;
padding: 9px 25px 9px 20px;
text-decoration: none;
cursor: pointer;
display: flex;
align-items: center;
}
.umb-actions a:hover, .umb-actions a:focus,
.umb-actions li.selected {
color: @black !important;
@@ -393,11 +395,10 @@ div.locked:before{
display: inline-block;
vertical-align: middle;
padding-left: 15px;
padding-top: 2px;
}
.umb-actions i {
color: @gray-6;
margin-top: 2px;
font-size: 18px;
vertical-align: middle;
color: @gray-3;
@@ -430,15 +431,16 @@ div.locked:before{
display: block;
clear: right;
line-height: 14px;
color: @gray-7;
color: @gray-6;
white-space: normal;
margin-top: 2px;
}
.umb-actions-child li a:hover .menuLabel small {
text-decoration: none !important
}
.umb-actions-child i {
font-size: 32px;
min-width: 32px;
font-size: 30px;
min-width: 30px;
text-align: center;
line-height: 24px; /* set line-height to ensure all icons use same line-height */
}