dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Settings cards layout improvement.

Browse Source
This commit is contained in:
Igor Kulikov 2019-03-28 09:51:43 +02:00
parent 080b0663ca
commit bb68e575e7
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/app/admin/admin.controller.js
View File

@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import './settings-card.scss';
/*@ngInject*/ /*@ngInject*/
export default function AdminController(adminService, toast, $scope, $rootScope, $state, $translate) { export default function AdminController(adminService, toast, $scope, $rootScope, $state, $translate) {

4
ui/src/app/admin/general-settings.tpl.html
View File

@ -15,8 +15,8 @@
limitations under the License. limitations under the License.
--> -->
<div layout="row" width="100%" layout-wrap> <div>
<md-card flex-gt-sm="60" flex="100" style="height: 100%;"> <md-card class="settings-card">
<md-card-title> <md-card-title>
<md-card-title-text> <md-card-title-text>
<span translate class="md-headline">admin.general-settings</span> <span translate class="md-headline">admin.general-settings</span>

4
ui/src/app/admin/outgoing-mail-settings.tpl.html
View File

@ -15,8 +15,8 @@
limitations under the License. limitations under the License.
--> -->
<div layout="row" width="100%" layout-wrap tb-help="'outgoingMailSettings'" help-container-id="help-container"> <div tb-help="'outgoingMailSettings'" help-container-id="help-container">
<md-card flex-gt-sm="60" flex="100" style="height: 100%;"> <md-card class="settings-card">
<md-card-title> <md-card-title>
<md-card-title-text layout="row"> <md-card-title-text layout="row">
<span translate class="md-headline">admin.outgoing-mail-settings</span> <span translate class="md-headline">admin.outgoing-mail-settings</span>

23
ui/src/app/admin/settings-card.scss Normal file
View File

@ -0,0 +1,23 @@
/**
* Copyright © 2016-2019 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";
md-card.settings-card {
@media (min-width: $layout-breakpoint-sm) {
width: 60%;
}
}