diff --git a/.gitignore b/.gitignore index 5edd79f9..aea33b02 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,7 @@ OurUmbraco.Site/usercontrols/Deli/ OurUmbraco.Site/App_Data/mail/ OurUmbraco.Client/build/assets/ OurUmbraco.Client/node_modules/ -npm-debug.log +npm-debug.log OurUmbraco.Site/[Ww]eb.config OurUmbraco.Site/[Aa]ssets/css/style.min.css OurUmbraco.Site/[Aa]ssets/js/app.min.js @@ -63,4 +63,5 @@ OurUmbraco.Site/[Aa]ssets/js/app.min.js OurUmbraco.Site/App_Data/migrations/*.txt OurUmbraco.Site/apidocs/ OurUmbraco.Site/App_Data/Documentation/ +OurUmbraco.Site/App_Data/NotificationTest/ build/tools/node* diff --git a/OurUmbraco.Client/build/forum-thread.html b/OurUmbraco.Client/build/forum-thread.html index b99e127f..ca1e3e64 100644 --- a/OurUmbraco.Client/build/forum-thread.html +++ b/OurUmbraco.Client/build/forum-thread.html @@ -1,4 +1,4 @@ - + @@ -1104,8 +1104,8 @@ namespace TestProject.Controllers - - + + diff --git a/OurUmbraco.Client/build/package-detail.html b/OurUmbraco.Client/build/package-detail.html index 0c128f76..953f55d3 100644 --- a/OurUmbraco.Client/build/package-detail.html +++ b/OurUmbraco.Client/build/package-detail.html @@ -1,4 +1,4 @@ - + @@ -624,8 +624,8 @@ grunt
- Umbraco as a Service (Works) - Umbraco as a Service (Not working yet) + Umbraco Cloud (Works) + Umbraco Cloud (Not working yet) 7.2.x (untested) 7.1.x (91%) 7.0.x (100%) diff --git a/OurUmbraco.Client/gulpfile.js b/OurUmbraco.Client/gulpfile.js index bae9a371..85086803 100644 --- a/OurUmbraco.Client/gulpfile.js +++ b/OurUmbraco.Client/gulpfile.js @@ -1,4 +1,4 @@ -var gulp = require('gulp'), +var gulp = require('gulp'), gutil = require('gulp-util'), sass = require('gulp-sass'), jshint = require('gulp-jshint'), @@ -57,7 +57,7 @@ gulp.task('css', function () { .pipe(sass()) .on('error', gutil.log) .pipe(autoprefixer('last 1 version', 'ie 9', 'ios 7')) - .pipe(cmq({log: true})) + // .pipe(cmq({log: true})) .pipe(rename({suffix: '.min'})) .pipe(minifyCss()) .pipe(gulp.dest(settings.build + '/assets/css')) diff --git a/OurUmbraco.Client/package.json b/OurUmbraco.Client/package.json index 2597ebde..fbb1615d 100644 --- a/OurUmbraco.Client/package.json +++ b/OurUmbraco.Client/package.json @@ -4,33 +4,28 @@ "description": "Umbraco Our gulpjs config", "main": "gulpfile.js", "private": true, - "dependencies": {}, + "dependencies": { + }, "devDependencies": { "gulp": "^3.9.1", + "gulp-util": "3.0.x", + "gulp-watch": "0.6.x", + "gulp-minify-css": "1.1.x", + "gulp-sass": "^2.2.0", + "gulp-combine-media-queries": "0.2.x", + "gulp-imagemin": "0.6.x", "gulp-autoprefixer": "^3.1.0", - "gulp-clean": "*", - "gulp-concat": "^2.6.0", - "gulp-group-css-media-queries": "^1.1.0", - "gulp-imagemin": "^3.0.2", - "gulp-jshint": "^2.0.1", - "gulp-minify-css": "^1.2.4", - "gulp-rename": "*", - "gulp-sass": "^2.3.2", - "gulp-svgmin": "^1.2.2", - "gulp-uglify": "^2.0.0", - "gulp-util": "^3.0.7", - "gulp-watch": "^4.3.9", - "jshint": "^2.9.2", - "jshint-stylish": "^2.2.0", - "node-sass": "^3.8.0" + "gulp-uglify": "^1.5.3", + "gulp-jshint": "2.0.0", + "gulp-concat": "2.2.x", + "jshint-stylish": "0.2.x", + "gulp-clean": "0.3.x", + "gulp-svgmin": "0.4.x", + "gulp-rename": "1.2.x" }, "scripts": { "test": "gulp build --verbose" }, "author": "umbraco", - "license": "MIT", - "repository": { - "type": "git", - "url": "http://github.com/devdk/gulp-workflow.git" - } + "license": "MIT" } diff --git a/OurUmbraco.Client/src/scss/elements/_alertbar.scss b/OurUmbraco.Client/src/scss/elements/_alertbar.scss index a75b3e2c..0a297de0 100644 --- a/OurUmbraco.Client/src/scss/elements/_alertbar.scss +++ b/OurUmbraco.Client/src/scss/elements/_alertbar.scss @@ -4,6 +4,7 @@ border: none !important; padding: 20px; + line-height: 1.5; @include colorset(alertbar); diff --git a/OurUmbraco.Client/src/scss/elements/_buttons.scss b/OurUmbraco.Client/src/scss/elements/_buttons.scss index 66b28cd3..6cfe3fe6 100644 --- a/OurUmbraco.Client/src/scss/elements/_buttons.scss +++ b/OurUmbraco.Client/src/scss/elements/_buttons.scss @@ -1,7 +1,11 @@ button.button, .button, a.button { background: $color-blue; - padding: 14px 40px; - display: inline-block; + padding: 12px 40px; + + display: inline-flex; + align-items: center; + justify-content: center; + text-decoration: none; border: none; border-radius: 36px; @@ -11,8 +15,7 @@ button.button, .button, a.button { color: #fff; text-align: center; - font-size: 1rem; - line-height: 1; + font-size: 14px; margin: 0; @@ -103,7 +106,7 @@ button.button, .button, a.button { &.large { - font-size: 1.2rem; + font-size: 1.175rem; } diff --git a/OurUmbraco.Client/src/scss/elements/_forum-thread.scss b/OurUmbraco.Client/src/scss/elements/_forum-thread.scss index d2f4af6e..9fbd0c5d 100644 --- a/OurUmbraco.Client/src/scss/elements/_forum-thread.scss +++ b/OurUmbraco.Client/src/scss/elements/_forum-thread.scss @@ -1,559 +1,561 @@ -.comments { - list-style-type: none; - padding: 0 20px 0 20px; - position: relative; - margin: 0 0 0 10px; - - @media (min-width: $md) { - padding: 0 20px 0 30px; - margin: 0 0 0 30px; - } - - - .comment { - margin-bottom: 75px; - position: relative; - border-radius: 2px; - background: rgba($color-space, 0.08); - border: 1px solid rgba($color-space, 0.15); - - - &.solution { - background: rgba($color-our, .23); - border: 1px solid rgba($color-our, .3); - - .photo { - img { - padding: 2px; - border: 1px solid $color-our; - } - } - - .meta { - border-bottom: none; - } - - .comment-inner { - border-bottom: none; - border-top: none; - } - - .actions { - border-top: none; - - a { - &:hover { - color: #000; - } - } - } - - .body { - a { - color: #000; - word-wrap:break-word; - text-decoration: underline; - - &:hover { - text-decoration: none; - } - } - } - } - - - - .photo { - position: absolute; - left: -22px; - top: 10px; - z-index: 10; - - span { - display: none; - - @media (min-width: $md) { - display: block; - font-size: .7rem; - text-decoration: none; - position: absolute; - left: 50%; - transform: translate(-50%, 4px); - background: #fff; - padding: 3px; - text-align: center; - color: #8e8e8e; - } - } - - @media (min-width: $md) { - left: -52px; - } - - &:hover { - img { - &:hover { - @extend .BoxShadow; - } - } - } - - img { - overflow: hidden; - max-width: 32px; - border-radius: 50%; - height: auto; - @include transition(box-shadow, .2s); - - @media (min-width: $md) { - max-width: 44px; - } - } - } - - - - .body { - white-space: normal; - - p, li { - line-height: 1.5; - font-size: 1rem; - } - - * + * { - margin-top: 15px; - } - - a { - text-decoration: underline; - word-wrap:break-word; - - &:hover { - text-decoration: none; - } - } - } - - - - .meta { - padding: .7rem 20px; - font-size: .9rem; - overflow: hidden; - color: darken($color-space, 15%); - border-bottom: none; - @include transition(all, .2s); - - display: flex; - flex-wrap: wrap; - justify-content: space-between; - - @media (min-width: $md) { - align-items: center; - } - - - - .profile { - width: auto; - flex: 0 0 50%; - flex-direction: column; - - a { - color: darken($color-space, 45%); - text-decoration: none; - display: block; - - @media (min-width: $md) { - display: inline-block; - margin-right: .2rem; - } - - &:hover { - text-decoration: underline; - } - } - - span { - margin-right: .1rem; - } - - .roles { - span { - font-size: .7rem; - line-height: 1; - - @media (min-width: $md) { - padding: 4px 6px; - } - } - } - } - - - .time { - text-decoration: none; - flex: 0 0 50%; - - text-align: right; - } - - & + .body { - padding-top: 1rem; - } - - .gotosolution { - margin-left: 5px; - color: #000; - - &:hover { - text-decoration: none; - } - } - - .hide-xs { - display: none; - - @media (min-width: $md) { - display: inline-block; - } - } - } - - - - &.question { - .topic { - font-size: 1.1rem; - - @media (min-width: $md) { - font-size: 1.35rem; - } - } - } - - - - .body-meta { - margin-bottom: 1rem; - padding-bottom: 1rem; - overflow: hidden; - border-bottom: 1px solid transparent; - - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: flex-start; - - .category, .version { - a { - font-size: .7rem; - - @media (min-width: $md) { - font-size: .9rem; - } - } - } - - - .topic { - flex: 0 0 100%; - - margin-bottom: .2rem; - word-break: break-all; - - @media (min-width: $md) { - flex: 0 0 70%; - padding-right: 3px; - } - } - - - - .categories { - display: flex; - flex: 0 0 100%; - - @media (min-width: $md) { - flex: 0 0 30%; - flex-direction: column; - } - - text-align: right; - } - - .category { - margin: 0 .5rem 0 0; - - @media (min-width: $md) { - margin: 0 0 .5rem 0; - } - } - } - - - - .actions { - display: flex; - justify-content: space-between; - - padding: 10px 20px; - - border-top: none; - - @include transition(background, .1s); - - a { - display: flex; - flex-direction: row; - align-items: center; - - text-decoration: none; - - cursor: pointer; - - color: rgba(#000, .5); - font-size: .9rem; - - @media (min-width: $md) { - overflow: hidden; - margin-right: 1.3rem; - } - - &:hover { - color: $color-green; - font-weight: bold; - } - - span { - display: none; - } - - i { - display: inline-block; - font-size: 1.4rem; - - @media (min-width: $md) { - font-size: 1.1rem; - margin-right: .2rem; - } - } - - &.delete-reply { - &:hover { - color: $color-red; - } - } - - } - - @media (min-width: $md) { - justify-content: flex-end; - padding: 10px 0; - } - } - - &:hover { - .actions { - a { - span { - @media (min-width: $md) { - display: inline-block; - } - } - } - } - } - } - - - .comment-inner { - padding: 15px; - - border-bottom: none; - border-top: none; - @include transition(all, .2s); - - @media (min-width: $md) { - padding: 20px 30px 30px 30px; - } - } - - - .highfive { - position: absolute; - - top: 100%; - left: 0; - right: 0; - - font-size: 1rem; - text-decoration: none; - - padding: 10px 0; - - background: rgba(85, 157, 255, 0.14); - border-right: 1px solid rgba(85, 157, 255, 0.20); - border-left: 1px solid rgba(85, 157, 255, 0.20); - border-bottom: 1px solid rgba(85, 157, 255, 0.20); - color: #5204d4; - - font-weight: bold; - - text-align: center; - - a { - display: block; - } - - .highfive-count, img { - display: none; - } - - @media (min-width: $md) { - right: auto; - top: auto; - - display: block; - - transform: translate(-52px, 6px); - - max-width: 44px; - min-width: 44px; - - background: #fff; - padding: 3px; - border: none; - - font-size: .8rem; - font-weight: normal; - line-height: 1.3; - text-align: center; - color: darken($color-space, 25%); - - - - img { - margin: 0; - } - - a { - margin: 0; - } - - .highfive-count { - display: inline-block; - font-size: 1rem; - font-weight: bold; - padding-top: 3px; - - + a { - margin-top: 10px; - } - } - - img { - display: block; - margin: 0 auto .2rem; - } - } - - - - img { - @include transition(transform, .2s); - max-width: 22px; - height: auto; - } - - a { - display: block; - text-decoration: none; - @include transition(all, .2s); - } - - &:hover { - a { - color: #000; - } - } - } - - - .alert { - background: rgba($color-orange, .1); - padding: 15px; - border-top: 3px solid rgba($color-orange, .25); - color: darken($color-orange, 10%); - } - - - - @media (max-width: $md) { - - .roles { - display: inline-block; - - span { - text-indent: -9999px; - padding: 0; - margin: 0; - border-radius: 50%; - height: 10px; - width: 10px; - } - } - } - - .level-2 { - margin-left: 15px; - - @media(min-width: $md) { - margin-left: 30px; - } - } -} - - -// Reply on forum button -.replybutton { - text-align: center; - width: 100%; - margin: 0 auto; - - .button { - display: inline-block; - margin: 0px auto 50px; - text-align: center; - - &.reply { - font-size: .85rem; - - @media (min-width: $md) { - font-size: 1.2rem; - } - } - } - - &.notloggedin { - background: rgba($color-orange, .1); - border: 2px solid rgba($color-orange, .2); - padding: 30px 0; - margin: 30px auto 30px; - - width: calc(100% - 40px); - - a { - &:hover { - text-decoration: none; - } - } - - @media (min-width: $md) { - padding: 30px 0; - margin: 60px auto 30px; - width: 100%; - } - } -} +.comments { + list-style-type: none; + padding: 0 20px 0 20px; + position: relative; + margin: 0 0 0 10px; + + @media (min-width: $md) { + padding: 0 20px 0 30px; + margin: 0 0 0 30px; + } + + + .comment { + margin-bottom: 75px; + position: relative; + border-radius: 2px; + background: rgba($color-space, 0.08); + border: 1px solid rgba($color-space, 0.15); + + + &.solution { + background: rgba($color-our, .23); + border: 1px solid rgba($color-our, .3); + + .photo { + img { + padding: 2px; + border: 1px solid $color-our; + } + } + + .meta { + border-bottom: none; + } + + .comment-inner { + border-bottom: none; + border-top: none; + } + + .actions { + border-top: none; + + a { + &:hover { + color: #000; + } + } + } + + .body { + a { + color: #000; + word-wrap:break-word; + text-decoration: underline; + + &:hover { + text-decoration: none; + } + } + } + } + + + + .photo { + position: absolute; + left: -22px; + top: 10px; + z-index: 10; + + span { + display: none; + + @media (min-width: $md) { + display: block; + font-size: .7rem; + text-decoration: none; + position: absolute; + left: 50%; + transform: translate(-50%, 4px); + background: #fff; + padding: 3px; + text-align: center; + color: #8e8e8e; + } + } + + @media (min-width: $md) { + left: -52px; + } + + &:hover { + img { + &:hover { + @extend .BoxShadow; + } + } + } + + img { + overflow: hidden; + max-width: 32px; + border-radius: 50%; + height: auto; + @include transition(box-shadow, .2s); + + @media (min-width: $md) { + max-width: 44px; + } + } + } + + + + .body { + white-space: normal; + + p, li { + line-height: 1.5; + font-size: 1rem; + } + + * + * { + margin-top: 15px; + } + + a { + text-decoration: underline; + word-wrap:break-word; + + &:hover { + text-decoration: none; + } + } + } + + + + .meta { + padding: .7rem 20px; + font-size: .9rem; + overflow: hidden; + color: darken($color-space, 15%); + border-bottom: none; + @include transition(all, .2s); + + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + @media (min-width: $md) { + align-items: center; + } + + + + .profile { + width: auto; + flex: 0 0 50%; + flex-direction: column; + + a { + color: darken($color-space, 45%); + text-decoration: none; + display: block; + + @media (min-width: $md) { + display: inline-block; + margin-right: .2rem; + } + + &:hover { + text-decoration: underline; + } + } + + span { + margin-right: .1rem; + } + + .roles { + span { + font-size: .7rem; + line-height: 1; + + @media (min-width: $md) { + padding: 4px 6px; + } + } + } + } + + + .time { + text-decoration: none; + flex: 0 0 50%; + + text-align: right; + } + + & + .body { + padding-top: 1rem; + } + + .gotosolution { + margin-left: 5px; + color: #000; + + &:hover { + text-decoration: none; + } + } + + .hide-xs { + display: none; + + @media (min-width: $md) { + display: inline-block; + } + } + } + + + + &.question { + .topic { + font-size: 1.1rem; + + @media (min-width: $md) { + font-size: 1.35rem; + } + } + } + + + + .body-meta { + margin-bottom: 1rem; + padding-bottom: 1rem; + overflow: hidden; + border-bottom: 1px solid transparent; + + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-items: flex-start; + + .category, .version { + a { + font-size: .7rem; + + @media (min-width: $md) { + font-size: .9rem; + } + } + } + + + .topic { + flex: 0 0 100%; + + margin-bottom: 15px; + + @media (min-width: $md) { + flex: 1 1 70%; + padding-right: 10px; + margin-bottom: 0; + } + } + + + + .categories { + display: flex; + flex: 0 0 100%; + + @media (min-width: $md) { + flex: 1 1 30%; + margin-left: auto; + flex-direction: column; + } + + text-align: right; + } + + .category { + margin: 0 .5rem 0 0; + + @media (min-width: $md) { + margin: 0 0 .5rem auto; + } + } + } + + + + .actions { + display: flex; + justify-content: space-between; + + padding: 10px 20px; + + border-top: none; + + @include transition(background, .1s); + + a { + display: flex; + flex-direction: row; + align-items: center; + + text-decoration: none; + + cursor: pointer; + + color: rgba(#000, .5); + font-size: .9rem; + + @media (min-width: $md) { + overflow: hidden; + margin-right: 1.3rem; + } + + &:hover { + color: $color-green; + font-weight: bold; + } + + span { + display: none; + } + + i { + display: inline-block; + font-size: 1.4rem; + + @media (min-width: $md) { + font-size: 1.1rem; + margin-right: .2rem; + } + } + + &.delete-reply { + &:hover { + color: $color-red; + } + } + + } + + @media (min-width: $md) { + justify-content: flex-end; + padding: 10px 0; + } + } + + &:hover { + .actions { + a { + span { + @media (min-width: $md) { + display: inline-block; + } + } + } + } + } + } + + + .comment-inner { + padding: 15px; + + border-bottom: none; + border-top: none; + @include transition(all, .2s); + + @media (min-width: $md) { + padding: 20px 30px 30px 30px; + } + } + + + .highfive { + position: absolute; + + top: 100%; + left: 0; + right: 0; + + font-size: 1rem; + text-decoration: none; + + padding: 10px 0; + + background: rgba(85, 157, 255, 0.14); + border-right: 1px solid rgba(85, 157, 255, 0.20); + border-left: 1px solid rgba(85, 157, 255, 0.20); + border-bottom: 1px solid rgba(85, 157, 255, 0.20); + color: #5204d4; + + font-weight: bold; + + text-align: center; + + a { + display: block; + } + + .highfive-count, img { + display: none; + } + + @media (min-width: $md) { + right: auto; + top: auto; + + display: block; + + transform: translate(-52px, 6px); + + max-width: 44px; + min-width: 44px; + + background: #fff; + padding: 3px; + border: none; + + font-size: .8rem; + font-weight: normal; + line-height: 1.3; + text-align: center; + color: darken($color-space, 25%); + + + + img { + margin: 0; + } + + a { + margin: 0; + } + + .highfive-count { + display: inline-block; + font-size: 1rem; + font-weight: bold; + padding-top: 3px; + + + a { + margin-top: 10px; + } + } + + img { + display: block; + margin: 0 auto .2rem; + } + } + + + + img { + @include transition(transform, .2s); + max-width: 22px; + height: auto; + } + + a { + display: block; + text-decoration: none; + @include transition(all, .2s); + } + + &:hover { + a { + color: #000; + } + } + } + + + .alert { + background: rgba($color-orange, .1); + padding: 15px; + border-top: 3px solid rgba($color-orange, .25); + color: darken($color-orange, 10%); + } + + + + @media (max-width: $md) { + + .roles { + display: inline-block; + + span { + text-indent: -9999px; + padding: 0; + margin: 0; + border-radius: 50%; + height: 10px; + width: 10px; + } + } + } + + .level-2 { + margin-left: 15px; + + @media(min-width: $md) { + margin-left: 30px; + } + } +} + + +// Reply on forum button +.replybutton { + text-align: center; + width: 100%; + margin: 0 auto; + + .button { + display: inline-block; + margin: 0px auto 50px; + text-align: center; + padding-top: 10px; + + &.reply { + font-size: .85rem; + + @media (min-width: $md) { + font-size: 1.2rem; + } + } + } + + &.notloggedin { + background: rgba($color-orange, .1); + border: 2px solid rgba($color-orange, .2); + padding: 30px 0; + margin: 30px auto 30px; + + width: calc(100% - 40px); + + a { + &:hover { + text-decoration: none; + } + } + + @media (min-width: $md) { + padding: 30px 0; + margin: 60px auto 30px; + width: 100%; + } + } +} diff --git a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss index 04ce68e7..478a1038 100644 --- a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss +++ b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss @@ -1,475 +1,476 @@ -.markdown-editor { - position: fixed; - bottom: -100%; - max-height: 100%; - width: 100%; - padding: .2rem; - background-color: rgba(darken(#fff, 1%), .94); - box-shadow: 0px -2px 6px 0px rgba(0, 0, 0, 0.08); - transition: bottom .6s $cubicSearch, top .6s $cubicSearch; - z-index: 800; - - @media (max-width: $xs) { - top: 100%; - padding: 20px 0 0; - } - - &.write { - bottom:0px; - overflow-y: scroll; - visibility: visible; - @media (max-width: $xs) { - top: 0; - } - } - - &.mobile-preview { - @media (max-width: $md) { - #input-container { - display: none; - } - - #preview-container { - display: block; - } - } - } - - #preview-container { - @media (max-width: $md) { - display: none; - } - } - - input, textarea, select{ - border: 2px solid #E4E8E9; - color: #000; - - &:focus, &:active{ - outline: none; - border-color: $color-green; - } - - &.warning { - border-color: $color-red !important; - } - } - - - .wmd-button { - position: relative; - margin-right: 15px; - left: 0 !important; - font-size: 1.4em; - top: 10px; - cursor: pointer; - float: left; - border-radius: 20px; - transition: top 300ms $cubicSearch, opacity 300ms $cubicSearch; - - } - - .show { - .wmd-button { - @media (min-width: $md){ - top: 10px; - opacity: .9; - } - } - } - - .reply-to { - p { - font-size: 1rem; - overflow: hidden; - color: darken($color-space, 25%); - background: transparent; - } - span { - font-weight: 800; - } - } - - #wmd-button-bar { - position:relative; - height: 30px; - @media (max-width: $xs) { - display:none; - } - } - - .input-row { - label { - display: block; - margin-bottom: 5px; - color: darken($color-space, 10%); - font-size: .9rem; - } - } - .wmd-button-row { - list-style: none; - li { - &:hover { - span { - color:black; - } - } - - span { - background-image: none; - color: #727272; - transition: color .2s ease-in; - &:before { - font-family: "our-umbraco" !important; - content: attr(data-icon); - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - speak: none; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - } - } - } - - #wmd-bold-button { - span { - @extend .our-icon-bold; - } - } - - #wmd-italic-button { - span { - @extend .our-icon-italic; - } - } - - #wmd-bold-button { - span { - @extend .our-icon-bold; - } - } - - #wmd-link-button { - span { - @extend .our-icon-hyperlink; - } - } - - #wmd-quote-button { - span { - @extend .our-icon-quote; - } - } - - #wmd-quote-button { - span { - @extend .our-icon-quote; - } - } - - #wmd-code-button { - span { - @extend .our-icon-code; - } - } - - #wmd-image-button { - span { - @extend .our-icon-picture; - } - } - - #wmd-olist-button { - span { - @extend .our-icon-ol; - } - } - - #wmd-ulist-button { - span { - @extend .our-icon-ul; - } - } - - #wmd-heading-button { - span { - @extend .our-icon-header; - } - } - - #wmd-hr-button { - span { - @extend .our-icon-hr; - } - } - - #wmd-undo-button { - span { - @extend .our-icon-undo; - } - } - - #wmd-redo-button { - span { - @extend .our-icon-redo; - } - } - - } - - .wmd-spacer { - float: left; - position: relative; - width: 27px; - display: block; - opacity: 0; - height: 20px; - @media (max-width:$md) { - display: none; - } - } - - #wmd-input { - height: 300px; - width: 100%; - padding: .5rem; - font-size: 1rem; - color: $color-text; - background: white; - border: 2px solid #E4E8E9; - @include transition(border-color, .2s); - - @media (max-width: $xs) { - height: 152px; - } - - &:focus { - border-color: $color-green; - } - } - - #wmd-preview { - width: 100%; - min-height: 300px; - max-height: 300px; - overflow-y: scroll; - padding: .5rem 20px; - font-size: .8rem; - color: #000; - background: darken(#F5F7F7, 5%); - @media (max-width: $xs) { - max-height: 150px; - min-height: 150px; - margin-bottom: 0; - } - } - - - .markdown-close { - position: absolute; - right: 1.5rem; - top: 2rem; - font-size: 28px; - cursor: pointer; - opacity: .6; - @include transition(opacity, .3s); - - @media (min-width: $md) { - top: 1.5rem; - } - - &:hover { - opacity: 1; - } - } - - .draft { - position: fixed; - bottom: -40px; - right: 30px; - background-color: $color-green; - color:white; - padding: 12px 20px; - cursor: pointer; - opacity: 0; - font-size: .9rem; - font-weight: bold; - transition: opacity .3s $cubicSearch, bottom .6s $cubicSearch, box-shadow .2s ease-in-out; - - &.show { - bottom: 30px; - opacity: 1; - - &:hover { - background: lighten($color-green, 5%); - @extend .BoxShadow; - } - } - } - - .markdown-control { - font-family: $font-family; - font-size: .8rem; - -webkit-appearance: none; - @media (max-width: $xs) { - padding: 5px !important; - } - } - - #topic-title { - padding: .5rem; - font-size: .8rem; - overflow: hidden; - color: #000; - background: #fff; - width: 100%; - } - - select { - position: relative; - border: none; - border-radius: 0; - padding: .5rem; - font-size: .8rem; - overflow: hidden; - color: #000; - background: #fff; - width: 100%; - - border: 2px solid #E4E8E9; - - @media (max-width: $xs) { - margin-top: 20px; - } - - &::after { - position: absolute; - display: block; - top: 0; - right: 0; - content: "<"; - color: black; - } - } - - #topic-category { - - option.frontend { - background: #4ea7ff; - color: #fff; - } - - option.core { - background: #ff661b; - color: #fff; - } - - option.azure { - background: #1ed45c; - color: #fff; - - } - } - - #topic-submit { - border: none; - background: $color-green; - color: white; - padding: 10px; - width: 100%; - max-width: 140px; - font-family: $font-family; - cursor: pointer; - - font-size: 1rem; - - &:hover { - background: lighten($color-green, 5%); - } - } - - #mobile-preview { - border: none; - background: none; - -webkit-appearance:none; - text-align: right; - float: right; - opacity: .4; - cursor: pointer; - @include transition(opacity, .3s); - - i { - font-size: 24px; - display: inline-block; - transform: translate(-3px, 5px); - - } - - span { - font-size: 14px; - } - - &:hover { - opacity: 1; - } - - @media (max-width: $xs) { - margin-bottom: 10px; - } - } - - - &.mobile-preview { - - #wmd-preview { - @media (max-width: $md) { - margin-bottom: 4px; - } - } - - #mobile-preview { - color: $color-our; - opacity: 1; - } - } - -} - -.wmd-prompt-background { - background-color: black; -} - -#insert-image-dialog { - position: fixed; - z-index: 1001; - @extend .copy-link-wrapper; - &.show { - clip: auto; - opacity: 1; - top: 50%; - left: 50%; - } -} - -.wmd-prompt-dialog { - @extend .copy-link-wrapper; - opacity: 1; - clip: auto; - margin: 0 !important; - input[type="text"] { - text-align: left; - } -} - -.markdown-spacer { - position: relative; - height: 0px; - transition: height .6s $cubicSearch; - &.write { - height: 500px; - } +.markdown-editor { + position: fixed; + bottom: -100%; + max-height: 100%; + width: 100%; + padding: .2rem; + background-color: rgba(darken(#fff, 1%), .94); + box-shadow: 0px -2px 6px 0px rgba(0, 0, 0, 0.08); + transition: bottom .6s $cubicSearch, top .6s $cubicSearch; + z-index: 800; + + @media (max-width: $xs) { + top: 100%; + padding: 20px 0 0; + } + + &.write { + bottom:0px; + overflow-y: scroll; + visibility: visible; + @media (max-width: $xs) { + top: 0; + } + } + + &.mobile-preview { + @media (max-width: $md) { + #input-container { + display: none; + } + + #preview-container { + display: block; + } + } + } + + #preview-container { + @media (max-width: $md) { + display: none; + } + } + + input, textarea, select{ + border: 2px solid #E4E8E9; + color: #000; + + &:focus, &:active{ + outline: none; + border-color: $color-green; + } + + &.warning { + border-color: $color-red !important; + } + } + + + .wmd-button { + position: relative; + margin-right: 15px; + left: 0 !important; + font-size: 1.4em; + top: 10px; + cursor: pointer; + float: left; + border-radius: 20px; + transition: top 300ms $cubicSearch, opacity 300ms $cubicSearch; + + } + + .show { + .wmd-button { + @media (min-width: $md){ + top: 10px; + opacity: .9; + } + } + } + + .reply-to { + p { + font-size: 1rem; + overflow: hidden; + color: darken($color-space, 25%); + background: transparent; + } + span { + font-weight: 800; + } + } + + #wmd-button-bar { + position:relative; + height: 30px; + @media (max-width: $xs) { + display:none; + } + } + + .input-row { + label { + display: block; + margin-bottom: 5px; + color: darken($color-space, 10%); + font-size: .9rem; + } + } + .wmd-button-row { + list-style: none; + li { + &:hover { + span { + color:black; + } + } + + span { + background-image: none; + color: #727272; + transition: color .2s ease-in; + &:before { + font-family: "our-umbraco" !important; + content: attr(data-icon); + font-style: normal !important; + font-weight: normal !important; + font-variant: normal !important; + text-transform: none !important; + speak: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + } + } + } + + #wmd-bold-button { + span { + @extend .our-icon-bold; + } + } + + #wmd-italic-button { + span { + @extend .our-icon-italic; + } + } + + #wmd-bold-button { + span { + @extend .our-icon-bold; + } + } + + #wmd-link-button { + span { + @extend .our-icon-hyperlink; + } + } + + #wmd-quote-button { + span { + @extend .our-icon-quote; + } + } + + #wmd-quote-button { + span { + @extend .our-icon-quote; + } + } + + #wmd-code-button { + span { + @extend .our-icon-code; + } + } + + #wmd-image-button { + span { + @extend .our-icon-picture; + } + } + + #wmd-olist-button { + span { + @extend .our-icon-ol; + } + } + + #wmd-ulist-button { + span { + @extend .our-icon-ul; + } + } + + #wmd-heading-button { + span { + @extend .our-icon-header; + } + } + + #wmd-hr-button { + span { + @extend .our-icon-hr; + } + } + + #wmd-undo-button { + span { + @extend .our-icon-undo; + } + } + + #wmd-redo-button { + span { + @extend .our-icon-redo; + } + } + + } + + .wmd-spacer { + float: left; + position: relative; + width: 27px; + display: block; + opacity: 0; + height: 20px; + @media (max-width:$md) { + display: none; + } + } + + #wmd-input { + height: 300px; + width: 100%; + padding: .5rem; + font-size: 1rem; + color: $color-text; + background: white; + border: 2px solid #E4E8E9; + @include transition(border-color, .2s); + + @media (max-width: $xs) { + height: 152px; + } + + &:focus { + border-color: $color-green; + } + } + + #wmd-preview { + width: 100%; + min-height: 300px; + max-height: 300px; + overflow-y: scroll; + padding: .5rem 20px; + font-size: .8rem; + color: #000; + background: darken(#F5F7F7, 5%); + @media (max-width: $xs) { + max-height: 150px; + min-height: 150px; + margin-bottom: 0; + } + } + + + .markdown-close { + position: absolute; + right: 1.5rem; + top: 2rem; + font-size: 28px; + cursor: pointer; + opacity: .6; + @include transition(opacity, .3s); + + @media (min-width: $md) { + top: 1.5rem; + } + + &:hover { + opacity: 1; + } + } + + .draft { + position: fixed; + bottom: -40px; + right: 30px; + background-color: $color-green; + color:white; + padding: 12px 20px; + cursor: pointer; + opacity: 0; + font-size: .9rem; + font-weight: bold; + transition: opacity .3s $cubicSearch, bottom .6s $cubicSearch, box-shadow .2s ease-in-out; + + &.show { + bottom: 30px; + opacity: 1; + + &:hover { + background: lighten($color-green, 5%); + @extend .BoxShadow; + } + } + } + + .markdown-control { + font-family: $font-family; + font-size: .8rem; + -webkit-appearance: none; + @media (max-width: $xs) { + padding: 5px !important; + } + } + + #topic-title { + padding: .5rem; + font-size: .8rem; + overflow: hidden; + color: #000; + background: #fff; + width: 100%; + } + + select { + position: relative; + border: none; + border-radius: 0; + padding: .5rem; + font-size: .8rem; + overflow: hidden; + color: #000; + background: #fff; + width: 100%; + + border: 2px solid #E4E8E9; + + @media (max-width: $xs) { + margin-top: 20px; + } + + &::after { + position: absolute; + display: block; + top: 0; + right: 0; + content: "<"; + color: black; + } + } + + #topic-category { + + option.frontend { + background: #4ea7ff; + color: #fff; + } + + option.core { + background: #ff661b; + color: #fff; + } + + option.azure { + background: #1ed45c; + color: #fff; + + } + } + + #topic-submit { + border: none; + background: $color-green; + color: white; + padding: 10px !important; + padding-left: 32px; + width: 100%; + max-width: 140px; + font-family: $font-family; + cursor: pointer; + + font-size: 1rem; + + &:hover { + background: lighten($color-green, 5%); + } + } + + #mobile-preview { + border: none; + background: none; + -webkit-appearance:none; + text-align: right; + float: right; + opacity: .4; + cursor: pointer; + @include transition(opacity, .3s); + + i { + font-size: 24px; + display: inline-block; + transform: translate(-3px, 5px); + + } + + span { + font-size: 14px; + } + + &:hover { + opacity: 1; + } + + @media (max-width: $xs) { + margin-bottom: 10px; + } + } + + + &.mobile-preview { + + #wmd-preview { + @media (max-width: $md) { + margin-bottom: 4px; + } + } + + #mobile-preview { + color: $color-our; + opacity: 1; + } + } + +} + +.wmd-prompt-background { + background-color: black; +} + +#insert-image-dialog { + position: fixed; + z-index: 1001; + @extend .copy-link-wrapper; + &.show { + clip: auto; + opacity: 1; + top: 50%; + left: 50%; + } +} + +.wmd-prompt-dialog { + @extend .copy-link-wrapper; + opacity: 1; + clip: auto; + margin: 0 !important; + input[type="text"] { + text-align: left; + } +} + +.markdown-spacer { + position: relative; + height: 0px; + transition: height .6s $cubicSearch; + &.write { + height: 500px; + } } \ No newline at end of file diff --git a/OurUmbraco.Client/src/scss/elements/_search-big.scss b/OurUmbraco.Client/src/scss/elements/_search-big.scss index 3bfefe8d..2b5cb855 100644 --- a/OurUmbraco.Client/src/scss/elements/_search-big.scss +++ b/OurUmbraco.Client/src/scss/elements/_search-big.scss @@ -7,9 +7,9 @@ input { -webkit-appearance: none; border-radius: 0; - + border: 1px solid darken(whitesmoke, 15%); - padding: 20px 6px 20px 6px; + padding: 20px 10px 20px 10px; outline: none; display: block; width: 100%; diff --git a/OurUmbraco.Client/src/scss/elements/_search-results.scss b/OurUmbraco.Client/src/scss/elements/_search-results.scss index 7e36313a..4251bc08 100644 --- a/OurUmbraco.Client/src/scss/elements/_search-results.scss +++ b/OurUmbraco.Client/src/scss/elements/_search-results.scss @@ -529,6 +529,8 @@ font-size: .7rem; letter-spacing: .5px; + text-align: center; + transform: translate(-50%, -50%); cursor: pointer; diff --git a/OurUmbraco.Client/src/scss/elements/_sidebar.scss b/OurUmbraco.Client/src/scss/elements/_sidebar.scss index 9d47c1ea..5673a833 100644 --- a/OurUmbraco.Client/src/scss/elements/_sidebar.scss +++ b/OurUmbraco.Client/src/scss/elements/_sidebar.scss @@ -63,11 +63,11 @@ html { display: inline-block; overflow: hidden; width: 100%; - max-width: $sb-desktop / 100% * $sb-width; text-align: center; @media (min-width: $md) { float: right; + max-width: $sb-desktop / 100% * $sb-width; } } } @@ -80,7 +80,7 @@ html { padding-bottom: 200px; @media (max-width:992px) { - + display: block; width: 100%; @@ -96,10 +96,10 @@ html { @media (min-width: 2100px) { width:100% - $sb-retina-width; } - + .main-content { display: block; - width: 100%; + width: 100%; padding-left: 20px; padding-right: 20px; padding-top: 20px; @@ -173,7 +173,7 @@ html { cursor: pointer; } @media (max-width: 992px) { - border-left: none; + border-left: none; background-color: lighten($color-our,10%); padding-top: 10px; padding-bottom: 10px; diff --git a/OurUmbraco.Client/src/scss/elements/_utilities.scss b/OurUmbraco.Client/src/scss/elements/_utilities.scss index 59053ac6..9830a8ad 100644 --- a/OurUmbraco.Client/src/scss/elements/_utilities.scss +++ b/OurUmbraco.Client/src/scss/elements/_utilities.scss @@ -50,6 +50,11 @@ @media (min-width: $md) { margin-bottom: 0; } + + span { + padding-top: 5px; + padding-left: 5px; + } } } diff --git a/OurUmbraco.Client/src/scss/pages/_forum.scss b/OurUmbraco.Client/src/scss/pages/_forum.scss index ef22a617..f69bf66a 100644 --- a/OurUmbraco.Client/src/scss/pages/_forum.scss +++ b/OurUmbraco.Client/src/scss/pages/_forum.scss @@ -91,16 +91,20 @@ &-head { - flex-direction: row; + display: none; - padding: 20px 15px; - border-bottom: 1px solid whitesmoke; + @media (min-width: $md) { + display: flex; - font-size: .8rem; - text-transform: uppercase; - font-weight: bold; + padding: 20px 15px; + border-bottom: 1px solid whitesmoke; - letter-spacing: .5px; + font-size: .8rem; + text-transform: uppercase; + font-weight: bold; + + letter-spacing: .5px; + } } @@ -112,19 +116,6 @@ display: flex; flex-direction: column; - - small { - color: darken($color-space, 25%); - font-size: 1rem; - - margin-bottom: .2rem; - } - - span { - font-size: .8rem; - color: $color-space; - } - } } @@ -135,18 +126,25 @@ padding: 25px 15px; display: flex; - flex-direction: row; - align-items: center; + flex-direction: column; + align-items: flex-start; border-bottom: 1px solid rgba($color-space, .11); + @media (min-width: $md) { + flex-direction: row; + align-items: center; + } + .topic { - font-size: .95rem; + font-size: 1.15rem; line-height: 1.3; + order: 2; + h3 { - word-break: break-all; + font-weight: 600; } a { @@ -181,8 +179,9 @@ @media (min-width: $md) { - font-size: 1.15rem; - line-height: 1.3; + h3 { + font-weight: 100; + } span { font-size: .9rem; @@ -220,35 +219,62 @@ .topic { - flex: 0 0 50%; - margin-right: 5%; + order: 2; + + margin: 10px 0; @media (min-width: $md) { flex: 0 0 50%; - margin-right: 10%; + margin: 0 10% 0 0; + + order: 1; } } .category { - flex: 0 0 30%; - margin-right: 5%; + order: 1; @media (min-width: $md) { flex: 0 0 28%; margin-right: 2%; + + order: 2; } } .posts { - flex: 0 0 10%; - text-align: center; + order: 3; - @media (max-width: $md) { - transform: translate(-6px, 0); + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + + font-size: .8rem; + + small { + margin-right: 3px; + margin-bottom: 0; + font-weight: normal; + font-size: .8rem; + color: $color-black; + } + + @media (min-width: $md) { + text-align: center; + + flex-direction: column; + + small { + margin-right: 0px; + margin-bottom: 5px; + font-weight: bold; + font-size: 1rem; + } } } } @@ -295,10 +321,14 @@ color: #4f5f63; text-transform: uppercase; font-weight: 700; - letter-spacing: .2px; display: block; margin-bottom: .5rem; text-align: left; + line-height: 1.2; + + @media (min-width: $md) { + letter-spacing: .2px; + } } .options { @@ -352,7 +382,6 @@ span { position: relative; flex: 1 1 auto; - margin-right: 20px; display: flex; justify-content: center; @@ -373,6 +402,8 @@ transition: color 150ms ease; font-size: .7rem; + text-align: center; + @media(min-width: $md) { font-size: .9rem; } diff --git a/OurUmbraco.Client/src/scss/pages/_release.scss b/OurUmbraco.Client/src/scss/pages/_release.scss index 156f8270..cc9fd789 100644 --- a/OurUmbraco.Client/src/scss/pages/_release.scss +++ b/OurUmbraco.Client/src/scss/pages/_release.scss @@ -1,39 +1,31 @@ -.download { +.download.latest .dot { + margin-top: 2rem; +} - - .dot.progress { +.download .dot.progress { text-indent: .3rem; text-align: center; line-height: 2.8rem; +} - - .counter { - font-size: 1.1rem;; - } - } - - - &.latest { - - - .dot { - margin-top: 2rem; - } - } +.download .dot.progress .counter { + font-size: 1.1rem; } .explain { + flex-direction: column; - - .changes { - small { - line-height: .5rem; - } + @media (min-width: 768px) { + flex-direction: row; } } +.explain .changes small { + line-height: .5rem; +} + .chart { @@ -41,171 +33,100 @@ top: -4px; left: -8px; z-index: 1; - - - .percentage { - display: inline-block; - position: absolute; - top: 9px; - left: 16px; - font-size: 1.1rem; - color: darken($color-our, 30%); - } - - - canvas { - top: 1px; - position: absolute; - left: 5px; - } - } +.chart .percentage { + display: inline-block; + position: absolute; + top: 9px; + left: 16px; + font-size: 1.1rem; + color: darken($color-our, 30%); +} +.chart canvas { + top: 1px; + position: absolute; + left: 5px; +} -.get-release { - - - i { - font-size: 2.5rem; - line-height: 5rem; - } +.chart { + position: absolute; + top: -4px; + left: -8px; + z-index: 1; } .get-release { line-height: 1.5; - padding: 2.5rem 0; - margin: 2.5rem 0; + padding: 3rem 0; + margin: 0 0 3.5rem ; border-bottom: 1px solid darken(whitesmoke, 5%); - border-top: 1px solid darken(whitesmoke, 5%); +} +.get-release i { + font-size: 2.5rem; + line-height: 5rem; +} - h3 { - font-size: 1.1rem; - margin-bottom: .3rem; - color: $color-headline; +.get-release h3 { + font-size: 1.1rem; + margin-bottom: .3rem; + color: $color-headline; +} +.get-release h3 a { + text-decoration: none; - a { - text-decoration: none; - - - &:hover { - color: $color-our; - } - } - } - - - p { - color: $color-headline; - font-size: .95rem; - line-height: 1.3; - margin-bottom: .5rem; - } - - - small { - font-size: .7rem; - color: $color-text; + &:hover { + color: $color-our; } } - - -.release { - min-height: 160px; - - - &.zip { - - - i { - color: $color-headline; - } - } - - - &.bin { - - - i { - color: rgba(#000, .4); - font-size: 1.6rem; - } - - - h4 { - font-size: .9rem; - margin-bottom: .3rem; - color: $color-headline; - - - a { - text-decoration: none; - - - &:hover { - color: $color-our; - } - } - } - - - &.col-sm-5 { - padding-top: 18px; - } - } - - - &.col-sm-1 { - text-align: center; - } +.get-release p { + color: $color-headline; + font-size: .95rem; + line-height: 1.3; + margin-bottom: .5rem; } - - -.latest { - - - .dot.big { - margin-bottom: 30px; - } - - - .explain { - - - h4 { - font-size: 2.5rem; - } - - - p { - font-size: 1.1rem; - color: $color-text -; - } - - .col-xs-12 { - min-height: 0; - } - } +.get-release small { + font-size: .8rem; + color: rgba($color-text, .6); } +.latest .dot.big { + margin-bottom: 30px; +} + + +.latest .explain h4 { + font-size: 2.5rem; +} + + +.latest .explain p { + font-size: 1.1rem; + color: $color-text; +} + +.latest .explain .col-xs-12 { + min-height: 0; +} + + + // Single release page -.release{ - +.release { .markdown-syntax { - - p, li, ul, a { + p, li, ul { color: $color-headline; font-size: .95rem; } @@ -216,7 +137,7 @@ } - a { + a { text-decoration: underline; font-family: $font-family; } @@ -253,12 +174,12 @@ } } } + + .releaseTable { - .col-xs-3 { - &:first-child { .progress { .top { @@ -282,6 +203,7 @@ } } + // Progress page .inprogress { @@ -324,11 +246,12 @@ } } + // Roadmap page .plannedreleases { .dot.big { text-indent: 0; - line-height: 3rem; + line-height: 3rem; } .chart { top: 0px; @@ -342,3 +265,194 @@ } } } + + +.release-page .explain h2 { + margin: 0; + font-size: 2em; + color: rgba(0,0,0,.8); +} + +.release-page .explain small { + margin-bottom: 0; +} + +.release-page .dot { + border: none; +} + +.release-page .dot.big { + position: relative; + text-indent: 0; + margin: 0; +} + +.release-page .chart { + height: 60px; + width: 60px; + top: initial; + left: initial; + text-align: center; +} + +.release-page .chart p { + vertical-align: middle; + line-height: 3.7rem; + display: inline-block; +} + +.release-page .chart canvas { + top: 0px; + left: 0px; +} + +.statuses ul { + list-style-type: none; +} +.statuses ul li { + position: relative; + margin-bottom: 10px; + padding-left: 10px; +} +.statuses li:before { + position: absolute; + top: -4px; + left: -25px; + font-size: 1.5em; +} + + + + +.release-progress-indicator { + flex: 1 1 auto; +} + +.release-progress-action { + flex: 1 1 auto; + + margin-top: 30px; +} + +.release-progress-version { + margin-left: 15px; +} + + +.release-section-group { + flex: 1 1 100%; + padding: 0; + + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + + @media (min-width: 768px) { + flex: 1 1 47%; + padding: 0 3% 0 0; + align-items: flex-start; + text-align: left; + } +} + +.release-section-group:nth-child(even) { + flex: 1 1 100%; + padding: 0; + + @media (min-width: 768px) { + flex: 1 1 47%; + padding: 0 0 0 3%; + } +} + +.release-section-action { + height: 80px; + + display: flex; + justify-content: flex-start; + align-items: center; + + box-sizing: border-box; +} + + +.release-section code { + overflow: auto; + + background-color: #333; + background-clip: padding-box; + + color: #fff; + font-size: 12px; + line-height: 1.4em; + text-align: center; + text-decoration: none; + + + padding: 14px 16px 14px 16px; + + width: auto; + border-radius: 5px; + border: none; +} +.release-section code a { + text-decoration: none; +} + +.release-section + .release-section { + margin-top: 30px; +} + +.release-section-group + .release-section-group { + margin-top: 30px; + + @media (min-width: 768px) { + margin-top: 0; + } +} + +.release-page h2 { + font-size: 1.4rem; + font-weight: bold; + margin-bottom: 0; +} + +.release-page h3 { + font-size: 1.1rem; + font-weight: bold; + margin-bottom: 0; +} + + + +// Other files +.release-other-files { + margin-top: 3rem; +} + +.release-other-files h3 { + font-size: 1.1rem; + margin-bottom: 5px; +} + +.release-other-files small { + font-size: .8rem; + color: rgba($color-text, .5); +} + + +.release-other-files .release { + min-height: auto; + margin-bottom: 30px; +} + +.release-other-files .release a { + display: inline-block; + margin-bottom: 10px; + margin-top: 10px; +} + +.release-other-files .release p { + margin-top: 0; +} diff --git a/OurUmbraco.Client/src/scss/sections/_forum.scss b/OurUmbraco.Client/src/scss/sections/_forum.scss index fb30995f..d6e23232 100644 --- a/OurUmbraco.Client/src/scss/sections/_forum.scss +++ b/OurUmbraco.Client/src/scss/sections/_forum.scss @@ -45,6 +45,7 @@ section.forum { .forum-thread { flex: 0 0 100%; display: flex; + overflow: hidden; @media (min-width: $md) { flex: 1 0 49%; @@ -77,6 +78,8 @@ section.forum { flex-direction: column; flex: 1 0 75%; + overflow: hidden; + padding: 0 10px 0 0; @media (min-width: $md) { @@ -89,6 +92,7 @@ section.forum { .category { margin: .5rem 0 0; + max-width: 95%; span { font-size: .75rem; @@ -132,14 +136,14 @@ section.forum { padding: 25px; margin-bottom: 30px; border: 1px solid darken(#f6f6f6, 5%); - transition: box-shadow .2s; + transition: box-shadow .2s ease, border-color .2s ease; text-decoration: none; display: flex; align-items: center; &:hover { - border-color: transparent; + border-color: white; @include box_shadow(2); } @@ -182,7 +186,6 @@ section.forum { color: #000; line-height: 1.3; font-size: 1rem; - word-break: break-all; @media (min-width: $md) { font-size: 1.1rem; diff --git a/OurUmbraco.Client/src/scss/style.scss b/OurUmbraco.Client/src/scss/style.scss index 4f330a15..c9b8564e 100644 --- a/OurUmbraco.Client/src/scss/style.scss +++ b/OurUmbraco.Client/src/scss/style.scss @@ -15,6 +15,11 @@ @import 'playground'; +/** +/* Utilities +**/ +@import 'utilities/flexbox'; + /** /* Elements **/ diff --git a/OurUmbraco.Client/src/scss/utilities/_flexbox.scss b/OurUmbraco.Client/src/scss/utilities/_flexbox.scss new file mode 100644 index 00000000..f83b0bcf --- /dev/null +++ b/OurUmbraco.Client/src/scss/utilities/_flexbox.scss @@ -0,0 +1,67 @@ +/* + + Flexbox + +*/ + +.flex { display: flex; } +.flex-inline { display: inline-flex; } + +.flex-column { flex-direction: column; } +.flex-wrap { flex-wrap: wrap; } + +.items-start { align-items: flex-start; } +.items-end { align-items: flex-end; } +.items-center { align-items: center; } +.items-baseline { align-items: baseline; } +.items-stretch { align-items: stretch; } + +.self-start { align-self: flex-start; } +.self-end { align-self: flex-end; } +.self-center { align-self: center; } +.self-baseline { align-self: baseline; } +.self-stretch { align-self: stretch; } + +.justify-start { justify-content: flex-start; } +.justify-end { justify-content: flex-end; } +.justify-center { justify-content: center; } +.justify-between { justify-content: space-between; } +.justify-around { justify-content: space-around; } + +.content-start { align-content: flex-start; } +.content-end { align-content: flex-end; } +.content-center { align-content: center; } +.content-between { align-content: space-between; } +.content-around { align-content: space-around; } +.content-stretch { align-content: stretch; } + +.flx-i { + flex: 1; +} +.flx-g0 { + flex-grow: 0; +} +.flx-s0 { + flex-shrink: 0; +} +.flx-b0 { + flex-basis: 0%; +} +.flx-g1 { + flex-grow: 1; +} +.flx-s1 { + flex-shrink: 1; +} +.flx-b1 { + flex-basis: 100%; +} + +/* 1. Fix for Chrome 44 bug. https://code.google.com/p/chromium/issues/detail?id=506893 */ +.flex-auto { + flex: 1 1 auto; + min-width: 0; /* 1 */ + min-height: 0; /* 1 */ +} + +.flex-none { flex: none; } diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js index 942b79ea..3d4b141c 100644 --- a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js +++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js @@ -1,31 +1,31 @@ -function modelsBuilderController($scope, umbRequestHelper, $log, $http, modelsBuilderResource) { - - $scope.generate = function() { - $scope.generating = true; - umbRequestHelper.resourcePromise( - $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")), - 'Failed to generate.') - .then(function (result) { - $scope.generating = false; - $scope.dashboard = result; - }); - }; - - $scope.reload = function () { - $scope.ready = false; - modelsBuilderResource.getDashboard().then(function (result) { - $scope.dashboard = result; - $scope.ready = true; - }); - }; - - function init() { - modelsBuilderResource.getDashboard().then(function(result) { - $scope.dashboard = result; - $scope.ready = true; - }); - } - - init(); -} +function modelsBuilderController($scope, umbRequestHelper, $log, $http, modelsBuilderResource) { + + $scope.generate = function() { + $scope.generating = true; + umbRequestHelper.resourcePromise( + $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")), + 'Failed to generate.') + .then(function (result) { + $scope.generating = false; + $scope.dashboard = result; + }); + }; + + $scope.reload = function () { + $scope.ready = false; + modelsBuilderResource.getDashboard().then(function (result) { + $scope.dashboard = result; + $scope.ready = true; + }); + }; + + function init() { + modelsBuilderResource.getDashboard().then(function(result) { + $scope.dashboard = result; + $scope.ready = true; + }); + } + + init(); +} angular.module("umbraco").controller("Umbraco.Dashboard.ModelsBuilderController", modelsBuilderController); \ No newline at end of file diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm index 5049e5f1..a5615718 100644 --- a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm +++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm @@ -1,41 +1,41 @@ -
- -
- -
- -

Models Builder

- -
- Loading... -
- -
-
- -
-

Models are out-of-date. -

-
- -
-
-

Generating models will restart the application.

-
-
- -
-
-
-
-
- -
- Last generation failed with the following error: -
{{dashboard.lastError}}
-
-
- -
+
+ +
+ +
+ +

Models Builder

+ +
+ Loading... +
+ +
+
+ +
+

Models are out-of-date. +

+
+ +
+
+

Generating models will restart the application.

+
+
+ +
+
+
+
+
+ +
+ Last generation failed with the following error: +
{{dashboard.lastError}}
+
+
+ +
diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.resource.js b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.resource.js index 58ca77cb..0690070c 100644 --- a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.resource.js +++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.resource.js @@ -1,23 +1,23 @@ -function modelsBuilderResource($q, $http, umbRequestHelper) { - - return { - getModelsOutOfDateStatus: function () { - return umbRequestHelper.resourcePromise( - $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetModelsOutOfDateStatus")), - "Failed to get models out-of-date status"); - }, - - buildModels: function () { - return umbRequestHelper.resourcePromise( - $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")), - "Failed to build models"); - }, - - getDashboard: function () { - return umbRequestHelper.resourcePromise( - $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")), - "Failed to get dashboard"); - } - }; -} -angular.module("umbraco.resources").factory("modelsBuilderResource", modelsBuilderResource); +function modelsBuilderResource($q, $http, umbRequestHelper) { + + return { + getModelsOutOfDateStatus: function () { + return umbRequestHelper.resourcePromise( + $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetModelsOutOfDateStatus")), + "Failed to get models out-of-date status"); + }, + + buildModels: function () { + return umbRequestHelper.resourcePromise( + $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")), + "Failed to build models"); + }, + + getDashboard: function () { + return umbRequestHelper.resourcePromise( + $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")), + "Failed to get dashboard"); + } + }; +} +angular.module("umbraco.resources").factory("modelsBuilderResource", modelsBuilderResource); diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/package.manifest b/OurUmbraco.Site/App_Plugins/ModelsBuilder/package.manifest index d8352351..90d253d3 100644 --- a/OurUmbraco.Site/App_Plugins/ModelsBuilder/package.manifest +++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/package.manifest @@ -1,7 +1,7 @@ -{ - //array of files we want to inject into the application on app_start - javascript: [ - '~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js', - '~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js' - ] +{ + //array of files we want to inject into the application on app_start + javascript: [ + '~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js', + '~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js' + ] } \ No newline at end of file diff --git a/OurUmbraco.Site/Global.asax b/OurUmbraco.Site/Global.asax index 53d2d540..9036e4ac 100644 --- a/OurUmbraco.Site/Global.asax +++ b/OurUmbraco.Site/Global.asax @@ -1,2 +1,2 @@ -<%@ Application Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %> +<%@ Application Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %> \ No newline at end of file diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 5b2051e7..e8a0e7dc 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -1,6 +1,6 @@  - + Debug @@ -47,16 +47,16 @@ false - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll True - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\businesslogic.dll True @@ -67,12 +67,12 @@ ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\cms.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\controls.dll True @@ -83,8 +83,8 @@ ..\packages\EasyHttp.1.6.29.0\lib\net40\EasyHttp.dll True - - ..\packages\Examine.0.1.69.0\lib\Examine.dll + + ..\packages\Examine.0.1.70.0\lib\Examine.dll True @@ -95,20 +95,20 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - - ..\packages\ImageProcessor.2.4.4.0\lib\net45\ImageProcessor.dll + + ..\packages\ImageProcessor.2.4.5.0\lib\net45\ImageProcessor.dll True - - ..\packages\ImageProcessor.Web.4.6.4.0\lib\net45\ImageProcessor.Web.dll + + ..\packages\ImageProcessor.Web.4.6.6.0\lib\net45\ImageProcessor.Web.dll True ..\packages\UrlTracker.3.11\lib\InfoCaster.Umbraco.UrlTracker.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\interfaces.dll True @@ -116,7 +116,7 @@ ..\packages\JsonFx.2.0.1209.2802\lib\net40\JsonFx.dll - ..\packages\UmbracoCms.Core.7.5.3\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\log4net.dll True @@ -128,7 +128,7 @@ True - ..\packages\UmbracoCms.Core.7.5.3\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\Microsoft.ApplicationBlocks.Data.dll True @@ -204,8 +204,8 @@ ..\packages\semver.1.1.2\lib\net451\Semver.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\SQLCE4Umbraco.dll True @@ -214,11 +214,11 @@ - ..\packages\UmbracoCms.Core.7.5.3\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.5.3\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\System.Data.SqlServerCe.Entity.dll True @@ -282,47 +282,47 @@ - ..\packages\UmbracoCms.Core.7.5.3\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\TidyNet.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\Umbraco.Core.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.DataLayer.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.editorControls.dll True ..\packages\UmbracoCms.IdentityExtensions.1.0.0\lib\net45\Umbraco.IdentityExtensions.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.MacroEngines.dll True ..\packages\Umbraco.ModelsBuilder.3.0.4\lib\Umbraco.ModelsBuilder.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.providers.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\Umbraco.Web.UI.dll True - - ..\packages\UmbracoCms.Core.7.5.3\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\UmbracoExamine.dll True @@ -4364,10 +4364,11 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + + - + - - -
+
+ + + + + + + +
diff --git a/OurUmbraco.Site/umbraco/Views/components/application/umb-sections.html b/OurUmbraco.Site/umbraco/Views/components/application/umb-sections.html index 9dcedfe5..e4fde787 100644 --- a/OurUmbraco.Site/umbraco/Views/components/application/umb-sections.html +++ b/OurUmbraco.Site/umbraco/Views/components/application/umb-sections.html @@ -1,66 +1,66 @@ -
- - - - - - - - - - -
+
+ + + + + + + + + + +
diff --git a/OurUmbraco.Site/umbraco/Views/components/html/umb-control-group.html b/OurUmbraco.Site/umbraco/Views/components/html/umb-control-group.html index 342c96e9..b07c2b9c 100644 --- a/OurUmbraco.Site/umbraco/Views/components/html/umb-control-group.html +++ b/OurUmbraco.Site/umbraco/Views/components/html/umb-control-group.html @@ -1,13 +1,13 @@ -
-
-
- - -
-
-
-
+
+
+
+ + +
+
+
+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/components/html/umb-pane.html b/OurUmbraco.Site/umbraco/Views/components/html/umb-pane.html index 7c94769d..b9cda6bb 100644 --- a/OurUmbraco.Site/umbraco/Views/components/html/umb-pane.html +++ b/OurUmbraco.Site/umbraco/Views/components/html/umb-pane.html @@ -1,3 +1,3 @@ -
- +
+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/components/html/umb-panel.html b/OurUmbraco.Site/umbraco/Views/components/html/umb-panel.html index a963eff3..62460be6 100644 --- a/OurUmbraco.Site/umbraco/Views/components/html/umb-panel.html +++ b/OurUmbraco.Site/umbraco/Views/components/html/umb-panel.html @@ -1,3 +1,3 @@ -
- -
+
+ +
diff --git a/OurUmbraco.Site/umbraco/Views/components/notifications/umb-notifications.html b/OurUmbraco.Site/umbraco/Views/components/notifications/umb-notifications.html index d8245abb..9962e2dd 100644 --- a/OurUmbraco.Site/umbraco/Views/components/notifications/umb-notifications.html +++ b/OurUmbraco.Site/umbraco/Views/components/notifications/umb-notifications.html @@ -1,21 +1,21 @@ -
- -
+
+ +
diff --git a/OurUmbraco.Site/umbraco/Views/components/tabs/umb-tab.html b/OurUmbraco.Site/umbraco/Views/components/tabs/umb-tab.html index 8ee6fb4c..3696b819 100644 --- a/OurUmbraco.Site/umbraco/Views/components/tabs/umb-tab.html +++ b/OurUmbraco.Site/umbraco/Views/components/tabs/umb-tab.html @@ -1,5 +1,5 @@ -
-
-
-
-
+
+
+
+
+
diff --git a/OurUmbraco.Site/umbraco/Views/components/umb-confirm.html b/OurUmbraco.Site/umbraco/Views/components/umb-confirm.html index 1460e383..50412201 100644 --- a/OurUmbraco.Site/umbraco/Views/components/umb-confirm.html +++ b/OurUmbraco.Site/umbraco/Views/components/umb-confirm.html @@ -1,10 +1,10 @@ -
-

{{caption}}

- -
-
- Cancel - Ok -
-
+
+

{{caption}}

+ +
+
+ Cancel + Ok +
+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/components/umb-media-grid.html b/OurUmbraco.Site/umbraco/Views/components/umb-media-grid.html index b680ec9d..f30851e6 100644 --- a/OurUmbraco.Site/umbraco/Views/components/umb-media-grid.html +++ b/OurUmbraco.Site/umbraco/Views/components/umb-media-grid.html @@ -12,10 +12,10 @@
- {{item.name}} + {{item.name}} - {{item.name}} + {{item.name}} {{item.name}} diff --git a/OurUmbraco.Site/umbraco/Views/components/umb-table.html b/OurUmbraco.Site/umbraco/Views/components/umb-table.html index f7d5caa0..9b60e5e9 100644 --- a/OurUmbraco.Site/umbraco/Views/components/umb-table.html +++ b/OurUmbraco.Site/umbraco/Views/components/umb-table.html @@ -1,60 +1,60 @@ -
-
- -
-
-
- -
- - -
-
- -
-
- -
- - -
-
- - -
-
- {{item[column.alias]}} -
-
-
-
- - - There are no items show in the list. - -
+
+
+ +
+
+
+ +
+ + +
+
+ +
+
+ +
+ + +
+
+ + +
+
+ {{item[column.alias]}} +
+
+
+
+ + + There are no items show in the list. + +
diff --git a/OurUmbraco.Site/umbraco/Views/content/copy.html b/OurUmbraco.Site/umbraco/Views/content/copy.html index 1c179cd4..3f2bfcdd 100644 --- a/OurUmbraco.Site/umbraco/Views/content/copy.html +++ b/OurUmbraco.Site/umbraco/Views/content/copy.html @@ -1,77 +1,77 @@ -
-
-
-

- Choose where to copy {{currentNode.name}} to in the tree structure below -

- -
-
-
- -
-
{{error.errorMsg}}
-

{{error.data.message}}

-
- -
-

- {{currentNode.name}} was copied to - {{target.name}} -

- - -
- -
- - - - -
- - - - -
- - -
- - - - - - - - - - - - - -
-
-
- - +
+
+
+

+ Choose where to copy {{currentNode.name}} to in the tree structure below +

+ +
+
+
+ +
+
{{error.errorMsg}}
+

{{error.data.message}}

+
+ +
+

+ {{currentNode.name}} was copied to + {{target.name}} +

+ + +
+ +
+ + + + +
+ + + + +
+ + +
+ + + + + + + + + + + + + +
+
+
+ +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/content/create.html b/OurUmbraco.Site/umbraco/Views/content/create.html index 22040ff1..c40fb393 100644 --- a/OurUmbraco.Site/umbraco/Views/content/create.html +++ b/OurUmbraco.Site/umbraco/Views/content/create.html @@ -1,45 +1,45 @@ - - - diff --git a/OurUmbraco.Site/umbraco/Views/dashboard/media/mediadashboardvideos.html b/OurUmbraco.Site/umbraco/Views/dashboard/media/mediadashboardvideos.html index 2135c378..ec55790b 100644 --- a/OurUmbraco.Site/umbraco/Views/dashboard/media/mediadashboardvideos.html +++ b/OurUmbraco.Site/umbraco/Views/dashboard/media/mediadashboardvideos.html @@ -1,18 +1,18 @@ -

Hours of Umbraco training videos are only a click away

-

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

- -

To get you started:

-
- - +

Hours of Umbraco training videos are only a click away

+

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+ +

To get you started:

+
+ +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/dashboard/settings/settingsdashboardvideos.html b/OurUmbraco.Site/umbraco/Views/dashboard/settings/settingsdashboardvideos.html index 2135c378..ec55790b 100644 --- a/OurUmbraco.Site/umbraco/Views/dashboard/settings/settingsdashboardvideos.html +++ b/OurUmbraco.Site/umbraco/Views/dashboard/settings/settingsdashboardvideos.html @@ -1,18 +1,18 @@ -

Hours of Umbraco training videos are only a click away

-

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

- -

To get you started:

-
- - +

Hours of Umbraco training videos are only a click away

+

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+ +

To get you started:

+
+ +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/datatypes/edit.html b/OurUmbraco.Site/umbraco/Views/datatypes/edit.html index 7d5daf34..fc53982b 100644 --- a/OurUmbraco.Site/umbraco/Views/datatypes/edit.html +++ b/OurUmbraco.Site/umbraco/Views/datatypes/edit.html @@ -1,71 +1,71 @@ -
- - - -
- - - - - - - - - - -
- - Required -
- -
- - -
{{content.selectedEditor}}
-
- - - - - - - -
- - - - - - - - - - - - - - -
- -
-
+
+ + + +
+ + + + + + + + + + +
+ + Required +
+ +
+ + +
{{content.selectedEditor}}
+
+ + + + + + + +
+ + + + + + + + + + + + + + +
+ +
+
diff --git a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-content-name.html b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-content-name.html index 46ad6e5e..4dcabd89 100644 --- a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-content-name.html +++ b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-content-name.html @@ -1,19 +1,19 @@ - -
- - - - Required - {{contentNameForm.name.errorMsg}} - -
+ +
+ + + + Required + {{contentNameForm.name.errorMsg}} + +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-header.html b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-header.html index c65b3737..383b52f8 100644 --- a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-header.html +++ b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-header.html @@ -1,14 +1,14 @@ -
-
- -
- - -
-
+
+
+ +
+ + +
+
diff --git a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-item-sorter.html b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-item-sorter.html index 569a678d..7d725dba 100644 --- a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-item-sorter.html +++ b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-item-sorter.html @@ -1,38 +1,38 @@ -
- -
-
-

Sort children of {{viewModel.name}}

- - - - - - - - - - - - - - - -
NameLast UpdateIndex
{{item.column1}}{{item.column2}}{{item.column3}}
- -
-
- - -
-
-
-
- {{model.successMsg}} -
- -
- -
-
-
+
+ +
+
+

Sort children of {{viewModel.name}}

+ + + + + + + + + + + + + + + +
NameLast UpdateIndex
{{item.column1}}{{item.column2}}{{item.column3}}
+ +
+
+ + +
+
+
+
+ {{model.successMsg}} +
+ +
+ +
+
+
diff --git a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-login.html b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-login.html index 3bf8332a..8c4f7060 100644 --- a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-login.html +++ b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-login.html @@ -1,12 +1,12 @@ -
-
-

Happy {{today}}!, log in below

-
- -
-
- -
- -
-
+
+
+

Happy {{today}}!, log in below

+
+ +
+
+ +
+ +
+
diff --git a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-tab-view.html b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-tab-view.html index 93b520cb..6fda65e3 100644 --- a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-tab-view.html +++ b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-tab-view.html @@ -1,5 +1,5 @@ -
-
- -
-
+
+
+ +
+
diff --git a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-upload-dropzone.html b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-upload-dropzone.html index 20a8f9d7..82f2b9b9 100644 --- a/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-upload-dropzone.html +++ b/OurUmbraco.Site/umbraco/Views/directives/_obsolete/umb-upload-dropzone.html @@ -1,8 +1,8 @@ -
-
- -

- Drop your files here... -

-
+
+
+ +

+ Drop your files here... +

+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/documenttypes/views/design/design.html b/OurUmbraco.Site/umbraco/Views/documenttypes/views/design/design.html index 805be7bd..cd6b629b 100644 --- a/OurUmbraco.Site/umbraco/Views/documenttypes/views/design/design.html +++ b/OurUmbraco.Site/umbraco/Views/documenttypes/views/design/design.html @@ -1,4 +1,4 @@ - - + + diff --git a/OurUmbraco.Site/umbraco/Views/media/create.html b/OurUmbraco.Site/umbraco/Views/media/create.html index db1810fa..0fffcf08 100644 --- a/OurUmbraco.Site/umbraco/Views/media/create.html +++ b/OurUmbraco.Site/umbraco/Views/media/create.html @@ -1,50 +1,50 @@ - - - - + + + + diff --git a/OurUmbraco.Site/umbraco/Views/media/edit.html b/OurUmbraco.Site/umbraco/Views/media/edit.html index 8b478eff..8929d143 100644 --- a/OurUmbraco.Site/umbraco/Views/media/edit.html +++ b/OurUmbraco.Site/umbraco/Views/media/edit.html @@ -1,75 +1,75 @@ -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/OurUmbraco.Site/umbraco/Views/media/move.html b/OurUmbraco.Site/umbraco/Views/media/move.html index 7618acf7..95c30dfc 100644 --- a/OurUmbraco.Site/umbraco/Views/media/move.html +++ b/OurUmbraco.Site/umbraco/Views/media/move.html @@ -1,38 +1,38 @@ -
-
-
- -

- Choose where to move {{currentNode.name}} to in the tree structure below -

- -
-

{{error.errorMsg}}

-

{{error.data.Message}}

-
- -
-

{{currentNode.name}} was moved underneath - {{target.name}}

- - -
- -
- - -
-
-
- - - -
+
+
+
+ +

+ Choose where to move {{currentNode.name}} to in the tree structure below +

+ +
+

{{error.errorMsg}}

+

{{error.data.Message}}

+
+ +
+

{{currentNode.name}} was moved underneath + {{target.name}}

+ + +
+ +
+ + +
+
+
+ + + +
diff --git a/OurUmbraco.Site/umbraco/Views/member/create.html b/OurUmbraco.Site/umbraco/Views/member/create.html index c5693adf..aa0e6c0f 100644 --- a/OurUmbraco.Site/umbraco/Views/member/create.html +++ b/OurUmbraco.Site/umbraco/Views/member/create.html @@ -1,27 +1,27 @@ - - - - + + + + diff --git a/OurUmbraco.Site/umbraco/Views/member/delete.html b/OurUmbraco.Site/umbraco/Views/member/delete.html index ce7a118d..d5d9fa77 100644 --- a/OurUmbraco.Site/umbraco/Views/member/delete.html +++ b/OurUmbraco.Site/umbraco/Views/member/delete.html @@ -1,12 +1,12 @@ -
-
- -

- Are you sure you want to delete {{currentNode.name}} ? -

- - - - -
-
+
+
+ +

+ Are you sure you want to delete {{currentNode.name}} ? +

+ + + + +
+
diff --git a/OurUmbraco.Site/umbraco/Views/member/edit.html b/OurUmbraco.Site/umbraco/Views/member/edit.html index 3b96c2de..51b937cd 100644 --- a/OurUmbraco.Site/umbraco/Views/member/edit.html +++ b/OurUmbraco.Site/umbraco/Views/member/edit.html @@ -1,70 +1,70 @@ -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
diff --git a/OurUmbraco.Site/umbraco/Views/packager/views/repo.html b/OurUmbraco.Site/umbraco/Views/packager/views/repo.html index b19eb632..3975dc96 100644 --- a/OurUmbraco.Site/umbraco/Views/packager/views/repo.html +++ b/OurUmbraco.Site/umbraco/Views/packager/views/repo.html @@ -199,7 +199,7 @@
Created:
-
{{vm.package.created}}
+
{{vm.package.created | date:'yyyy-MM-dd HH:mm:ss'}}
diff --git a/OurUmbraco.Site/umbraco/Views/prevalueeditors/multivalues.html b/OurUmbraco.Site/umbraco/Views/prevalueeditors/multivalues.html index f89efcf5..561872cb 100644 --- a/OurUmbraco.Site/umbraco/Views/prevalueeditors/multivalues.html +++ b/OurUmbraco.Site/umbraco/Views/prevalueeditors/multivalues.html @@ -1,13 +1,13 @@ -
-
- - -
-
-
- - - -
-
-
+
+
+ + +
+
+
+ + + +
+
+
diff --git a/OurUmbraco.Site/umbraco/Views/prevalueeditors/number.html b/OurUmbraco.Site/umbraco/Views/prevalueeditors/number.html index fcdb0678..e7490e27 100644 --- a/OurUmbraco.Site/umbraco/Views/prevalueeditors/number.html +++ b/OurUmbraco.Site/umbraco/Views/prevalueeditors/number.html @@ -1,11 +1,11 @@ -
- - - Not a number - {{propertyForm.requiredField.errorMsg}} - +
+ + + Not a number + {{propertyForm.requiredField.errorMsg}} +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/prevalueeditors/radiobuttonlist.html b/OurUmbraco.Site/umbraco/Views/prevalueeditors/radiobuttonlist.html index a9e07206..b82eb88a 100644 --- a/OurUmbraco.Site/umbraco/Views/prevalueeditors/radiobuttonlist.html +++ b/OurUmbraco.Site/umbraco/Views/prevalueeditors/radiobuttonlist.html @@ -1,7 +1,7 @@
  • - +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/prevalueeditors/readonlykeyvalues.html b/OurUmbraco.Site/umbraco/Views/prevalueeditors/readonlykeyvalues.html index a9a55588..66faad24 100644 --- a/OurUmbraco.Site/umbraco/Views/prevalueeditors/readonlykeyvalues.html +++ b/OurUmbraco.Site/umbraco/Views/prevalueeditors/readonlykeyvalues.html @@ -1,7 +1,7 @@ -
-
    -
  • - {{preVal.Key}} : {{preVal.Value}} -
  • -
+
+
    +
  • + {{preVal.Key}} : {{preVal.Value}} +
  • +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/prevalueeditors/requiredfield.html b/OurUmbraco.Site/umbraco/Views/prevalueeditors/requiredfield.html index 2d24c355..ebd4c396 100644 --- a/OurUmbraco.Site/umbraco/Views/prevalueeditors/requiredfield.html +++ b/OurUmbraco.Site/umbraco/Views/prevalueeditors/requiredfield.html @@ -1,9 +1,9 @@ -
- - - Required - {{propertyForm.requiredField.errorMsg}} -
+
+ + + Required + {{propertyForm.requiredField.errorMsg}} +
diff --git a/OurUmbraco.Site/umbraco/Views/prevalueeditors/treepicker.html b/OurUmbraco.Site/umbraco/Views/prevalueeditors/treepicker.html index 8420ee0d..fc7a388c 100644 --- a/OurUmbraco.Site/umbraco/Views/prevalueeditors/treepicker.html +++ b/OurUmbraco.Site/umbraco/Views/prevalueeditors/treepicker.html @@ -1,30 +1,30 @@ -
- - - - - - - - -
+
+ + + + + + + + +
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/boolean/boolean.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/boolean/boolean.html index 2d302d0f..b2373f2d 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/boolean/boolean.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/boolean/boolean.html @@ -1,3 +1,3 @@ -
- +
+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/changepassword/changepassword.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/changepassword/changepassword.html index aee42119..78ae6afa 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/changepassword/changepassword.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/changepassword/changepassword.html @@ -1,62 +1,62 @@ -
-
- Password has been reset to: -
- {{model.value.generatedPassword}} -
-
- -
- - - - - - - - - - Required - - - - - - Required - Minimum {{$parent.model.config.minPasswordLength}} characters - - - - - - - - The confirmed password doesn't match the new password! - - - - - Cancel - -
-
-
+
+
+ Password has been reset to: +
+ {{model.value.generatedPassword}} +
+
+ +
+ + + + + + + + + + Required + + + + + + Required + Minimum {{$parent.model.config.minPasswordLength}} characters + + + + + + + + The confirmed password doesn't match the new password! + + + + + Cancel + +
+
+
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/checkboxlist/checkboxlist.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/checkboxlist/checkboxlist.html index e6407bd5..ae691215 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/checkboxlist/checkboxlist.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/checkboxlist/checkboxlist.html @@ -1,14 +1,14 @@ -
- -
    -
  • - -
  • -
- -
+
+ +
    +
  • + +
  • +
+ +
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/colorpicker/colorpicker.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/colorpicker/colorpicker.html index 4709e24f..a493fffd 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/colorpicker/colorpicker.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/colorpicker/colorpicker.html @@ -1,17 +1,17 @@ -
- -
- You haven't defined any colors -
- - - - - -
+
+ +
+ You haven't defined any colors +
+ + + + + +
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/contentpicker/contentpicker.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/contentpicker/contentpicker.html index 0733b485..9f5f3fb6 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/contentpicker/contentpicker.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/contentpicker/contentpicker.html @@ -1,54 +1,54 @@ -
- - - - - - - - - - - -
- You need to add at least {{model.config.minNumber}} items -
- -
- You can only have {{model.config.maxNumber}} items selected -
- - -
- - - - -
+
+ + + + + + + + + + + +
+ You need to add at least {{model.config.minNumber}} items +
+ +
+ You can only have {{model.config.maxNumber}} items selected +
+ + +
+ + + + +
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/datepicker/datepicker.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/datepicker/datepicker.html index 79ea4ee9..003e2ada 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/datepicker/datepicker.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/datepicker/datepicker.html @@ -1,30 +1,30 @@ -
- -
- - - - - - - -
- - Required - {{datePickerForm.datepicker.errorMsg}} - Invalid date - -

- This translates to the following time on the server: {{serverTime}}
- What does this mean? -

-

- Clear date -

- -
-
+
+ +
+ + + + + + + +
+ + Required + {{datePickerForm.datepicker.errorMsg}} + Invalid date + +

+ This translates to the following time on the server: {{serverTime}}
+ What does this mean? +

+

+ Clear date +

+ +
+
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/dropdown/dropdown.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/dropdown/dropdown.html index e728b3d6..1459400f 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/dropdown/dropdown.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/dropdown/dropdown.html @@ -1,20 +1,20 @@ -
- - - - - - +
+ + + + + +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/email/email.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/email/email.html index 29c2a1bc..8ccf5a6d 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/email/email.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/email/email.html @@ -1,13 +1,13 @@ -
- - - Required - Invalid email - +
+ + + Required + Invalid email +
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/entitypicker/entitypicker.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/entitypicker/entitypicker.html index 274710b1..34408439 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/entitypicker/entitypicker.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/entitypicker/entitypicker.html @@ -1,19 +1,19 @@ -
- - - - - - -
+
+ + + + + + +
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/fileupload/fileupload.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/fileupload/fileupload.html index 1778b7bc..0905de07 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/fileupload/fileupload.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/fileupload/fileupload.html @@ -1,36 +1,36 @@ -
- -
- - - - -
-
- -
-
- -
-
    -
  • {{file.file.name}}
  • -
-
- - - -
+
+ +
+ + + + +
+
+ +
+
+ +
+
    +
  • {{file.file.name}}
  • +
+
+ + + +
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/folderbrowser/folderbrowser.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/folderbrowser/folderbrowser.html index 8bf860b9..76b362f2 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/folderbrowser/folderbrowser.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/folderbrowser/folderbrowser.html @@ -1,3 +1,3 @@ -
- -
+
+ +
diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/googlemaps/googlemaps.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/googlemaps/googlemaps.html index 7fa8ef8c..972108ed 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/googlemaps/googlemaps.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/googlemaps/googlemaps.html @@ -1,3 +1,3 @@ -
-
+
+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/layoutconfig.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/layoutconfig.html index 9cbe74ba..f87262da 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/layoutconfig.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/layoutconfig.html @@ -35,17 +35,24 @@
-
+
- + {{currentSection.grid}} - +
+ + + + Delete + + +
    diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowconfig.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowconfig.html index 093afd3c..421aaf0d 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowconfig.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowconfig.html @@ -6,9 +6,14 @@

    - Modifying a row configuration name will result in loss of - data for any existing content that is based on this configuration. +

    Modifying a row configuration name will result in loss of + data for any existing content that is based on this configuration.

    +

    Modifying only the label will not result in data loss.

    + + + + @@ -39,19 +44,23 @@
    -
    -
    - - - +
    + + + {{currentCell.grid}} - - - -
    -
    + + + +
    + + + + Delete + +
      diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.html index feaed67e..4ddca474 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.html @@ -80,7 +80,7 @@
      -
      {{row.name}}
      +
      {{row.label || row.name}}
      @@ -282,7 +282,7 @@
      - {{layout.name}} + {{layout.label || layout.name}}
      diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.prevalues.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.prevalues.html index 9d962669..eaffa56d 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.prevalues.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.prevalues.html @@ -72,7 +72,7 @@
        diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/integer/integer.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/integer/integer.html index 80c6a1e6..2108340d 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/integer/integer.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/integer/integer.html @@ -1,13 +1,13 @@ -
        - - - Not a number - {{propertyForm.requiredField.errorMsg}} +
        + + + Not a number + {{propertyForm.requiredField.errorMsg}}
        \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/listview.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/listview.html index 706c7e9d..39694837 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/listview.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/listview.html @@ -1,199 +1,199 @@ -
        - -
        - -
        - -
        - - - - - - - - - - - - - - - - - {{ selectedItemsCount() }} of {{ listViewResultSet.items.length }} selected - - -
        -
        -
        -
        - -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        - - - - - - -
        - - -
        - -
        - - - - - - - - - - -
        +
        + +
        + +
        + +
        + + + + + + + + + + + + + + + + + {{ selectedItemsCount() }} of {{ listViewResultSet.items.length }} selected + + +
        +
        +
        +
        + +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + + + + + + +
        + + +
        + +
        + + + + + + + + + + +
        diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/orderDirection.prevalues.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/orderDirection.prevalues.html index 6e8ecd4f..6089990f 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/orderDirection.prevalues.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/listview/orderDirection.prevalues.html @@ -1,12 +1,12 @@ -
        - - - - Required +
        + + + + Required
        \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/markdowneditor/markdowneditor.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/markdowneditor/markdowneditor.html index 6b86bf7c..64ea1e8e 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/markdowneditor/markdowneditor.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/markdowneditor/markdowneditor.html @@ -1,15 +1,15 @@ -
        -
        - - - -
        - - - - -
        +
        +
        + + + +
        + + + + +
        diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/mediapicker/mediapicker.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/mediapicker/mediapicker.html index 3b7eb348..68d2fc6f 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/mediapicker/mediapicker.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/mediapicker/mediapicker.html @@ -1,47 +1,47 @@ -
        - -
          -
        • - - - - - - - - - - - - {{image.name}} - - - - -
        • -
        - - - - - - - -
        +
        + +
          +
        • + + + + + + + + + + + + {{image.name}} + + + + +
        • +
        + + + + + + + +
        diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/membergrouppicker/membergrouppicker.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/membergrouppicker/membergrouppicker.html index 72f1f9ea..5258968c 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/membergrouppicker/membergrouppicker.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/membergrouppicker/membergrouppicker.html @@ -1,33 +1,33 @@ -
        - - - - - - - - - -
        +
        + + + + + + + + + +
        diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/membergroups/membergroups.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/membergroups/membergroups.html index 3448f1b3..bffe8682 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/membergroups/membergroups.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/membergroups/membergroups.html @@ -1,18 +1,18 @@ -
        -
        -
        Not a member of group(s)
        - -
        -
        -
        Member of group(s)
        - -
        +
        +
        +
        Not a member of group(s)
        + +
        +
        +
        Member of group(s)
        + +
        \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/memberpicker/memberpicker.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/memberpicker/memberpicker.html index f866bebc..b537a801 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/memberpicker/memberpicker.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/memberpicker/memberpicker.html @@ -1,33 +1,33 @@ -
        - - - - - - - - -
        +
        + + + + + + + + +
        diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/multipletextbox/multipletextbox.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/multipletextbox/multipletextbox.html index 27731155..447af77b 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/multipletextbox/multipletextbox.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/multipletextbox/multipletextbox.html @@ -1,20 +1,20 @@ -
        - -
        -
        - - - - - -
        -
        - - - - +
        + +
        +
        + + + + + +
        +
        + + + +
        \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/radiobuttons/radiobuttons.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/radiobuttons/radiobuttons.html index 2e5ce96e..cdb5a37a 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/radiobuttons/radiobuttons.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/radiobuttons/radiobuttons.html @@ -1,12 +1,12 @@ -
        -
          -
        • - -
        • -
        +
        +
          +
        • + +
        • +
        \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/readonlyvalue/readonlyvalue.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/readonlyvalue/readonlyvalue.html index 449fa53a..2dcf1b3d 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/readonlyvalue/readonlyvalue.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/readonlyvalue/readonlyvalue.html @@ -1,3 +1,3 @@ -
        - +
        +
        \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/propertyeditors/relatedlinks/relatedlinks.html b/OurUmbraco.Site/umbraco/Views/propertyeditors/relatedlinks/relatedlinks.html index 5440d0c3..c6e02976 100644 --- a/OurUmbraco.Site/umbraco/Views/propertyeditors/relatedlinks/relatedlinks.html +++ b/OurUmbraco.Site/umbraco/Views/propertyeditors/relatedlinks/relatedlinks.html @@ -1,98 +1,98 @@ -