diff --git a/ui/src/app/components/details-sidenav.scss b/ui/src/app/components/details-sidenav.scss index 54a029dc37..159162a50e 100644 --- a/ui/src/app/components/details-sidenav.scss +++ b/ui/src/app/components/details-sidenav.scss @@ -16,7 +16,10 @@ @import '../../scss/constants'; .tb-details-title { - font-size: 1.600rem; + font-size: 1.000rem; + @media (min-width: $layout-breakpoint-gt-sm) { + font-size: 1.600rem; + } font-weight: 400; text-transform: uppercase; margin: 20px 8px 0 0; diff --git a/ui/src/app/components/js-func.scss b/ui/src/app/components/js-func.scss index 7c36b8101e..3124dc12d3 100644 --- a/ui/src/app/components/js-func.scss +++ b/ui/src/app/components/js-func.scss @@ -22,7 +22,7 @@ tb-js-func { border: 1px solid #C0C0C0; height: 100%; #tb-javascript-input { - min-width: 400px; + min-width: 200px; min-height: 200px; width: 100%; height: 100%; diff --git a/ui/src/app/components/js-func.tpl.html b/ui/src/app/components/js-func.tpl.html index ee3c2e0947..bec7991af9 100644 --- a/ui/src/app/components/js-func.tpl.html +++ b/ui/src/app/components/js-func.tpl.html @@ -19,7 +19,7 @@
function({{ functionArgsString }}) { - +
- +
diff --git a/ui/src/app/home/home-links.controller.js b/ui/src/app/home/home-links.controller.js index 273433ba23..799a0bc0b2 100644 --- a/ui/src/app/home/home-links.controller.js +++ b/ui/src/app/home/home-links.controller.js @@ -13,6 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +import './home-links.scss'; + /*@ngInject*/ export default function HomeLinksController($scope, menu) { var vm = this; diff --git a/ui/src/app/home/home-links.scss b/ui/src/app/home/home-links.scss new file mode 100644 index 0000000000..e210334a88 --- /dev/null +++ b/ui/src/app/home/home-links.scss @@ -0,0 +1,26 @@ +/** + * Copyright © 2016-2017 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@import "../../scss/constants"; + +.tb-home-links { + .md-headline { + font-size: 20px; + @media (min-width: $layout-breakpoint-xmd) { + font-size: 24px; + } + } +} \ No newline at end of file diff --git a/ui/src/app/home/home-links.tpl.html b/ui/src/app/home/home-links.tpl.html index 5eac69fe48..e27f20a820 100644 --- a/ui/src/app/home/home-links.tpl.html +++ b/ui/src/app/home/home-links.tpl.html @@ -15,7 +15,7 @@ limitations under the License. --> - + diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss index 076dbef296..93418b27fe 100644 --- a/ui/src/scss/main.scss +++ b/ui/src/scss/main.scss @@ -494,11 +494,15 @@ md-tabs.tb-headless { height: 100%; max-width: 240px; span { - padding: 10px 10px 20px 10px; + padding: 0 0 20px 0; font-size: 18px; font-weight: 400; white-space: normal; line-height: 18px; + max-height: 18px; + min-height: 18px; + height: 18px; + margin: auto; } }