diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less b/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less index 59c58c914e..426ffcb5e2 100644 --- a/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less +++ b/src/Umbraco.Web.UI.Client/src/less/pages/welcome-dashboard.less @@ -39,21 +39,20 @@ text-decoration: none; display: block; margin: 10px; -} -.welcome-dashboard__info-box:hover { - border: 2px solid @turquoise; - cursor: pointer; - transition: border-color 150ms ease-in-out; - text-decoration: none; -} + &:hover { + border: 2px solid @turquoise; + cursor: pointer; + transition: border-color 150ms ease-in-out; + text-decoration: none; + } -.welcome-dashboard__info-box:active, -.welcome-dashboard__info-box:focus { - text-decoration: none; + &:active, + &:focus { + text-decoration: none; + } } - .welcome-dashboard__info-box-title { color: @turquoise-d1; font-size: 16px; @@ -74,7 +73,7 @@ } .welcome-dashboard__card { - background-color: @gray-10; + background-color: @grayLighter; border-radius: 3px; margin: 10px; display: flex; @@ -113,6 +112,6 @@ } .welcome-dashboard__card-teaser { - font-size: 14px; + font-size: 13px; margin-bottom: 15px; -} \ No newline at end of file +} diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index cdabb05fd4..534b60c120 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -70,7 +70,7 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource { title: "Umbraco.TV - Learn from the source!", description: "Umbraco.TV will help you go from zero to Umbraco hero at a pace that suits you. Our easy to follow online training videos will give you the fundamental knowledge to start building awesome Umbraco websites.", - img: "views/dashboard/default/umbracotv.jpg", + img: "views/dashboard/default/umbracotv.png", url: "https://umbraco.tv/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=tv", altText: "Umbraco.TV - Hours of Umbraco Video Tutorials", buttonText: "Visit Umbraco.TV" @@ -78,7 +78,7 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource { title: "Our Umbraco - The Friendliest Community", description: "Our Umbraco - the official community site is your one stop for everything Umbraco. Whether you need a question answered or looking for cool plugins, the world's best and friendliest community is just a click away.", - img: "views/dashboard/default/ourumbraco.jpg", + img: "views/dashboard/default/ourumbraco.png", url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our", altText: "Our Umbraco", buttonText: "Visit Our Umbraco" @@ -109,19 +109,16 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource //we capture it like this, so we avoid UI errors - which automatically triggers ui based on http response code if (data && data.sections) { vm.dashboard = data; - } else{ + } else { vm.showDefault = true; } - }, - function (exception) { console.error(exception); vm.loading = false; vm.showDefault = true; }); - onInit(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html index 17a4dcdb65..330548bedd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardIntro.html @@ -35,7 +35,6 @@ -
@@ -49,27 +48,27 @@
- -
{{ infoBox.title }}
-
{{ infoBox.description }}
+
+
{{infoBox.title}}
+
{{infoBox.description}}
-

{{ article.title }}

-
{{ article.description }}
- {{article.buttonText}} +

{{article.title}}

+
{{article.description}}
+ {{article.buttonText}}
- \ No newline at end of file + diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.jpg b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.jpg deleted file mode 100644 index 5d5324e3de..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.jpg and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png new file mode 100644 index 0000000000..d0fb4e6235 Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png differ diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg deleted file mode 100644 index 22ae3653e2..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png new file mode 100644 index 0000000000..173d2f36d0 Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png differ