Commit bb68e575e7e0ba95dccbfea3562fcd2d9c4481c3

Authored by Igor Kulikov
1 parent 080b0663

UI: Settings cards layout improvement.

@@ -13,6 +13,9 @@ @@ -13,6 +13,9 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
  16 +
  17 +import './settings-card.scss';
  18 +
16 /*@ngInject*/ 19 /*@ngInject*/
17 export default function AdminController(adminService, toast, $scope, $rootScope, $state, $translate) { 20 export default function AdminController(adminService, toast, $scope, $rootScope, $state, $translate) {
18 21
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 limitations under the License. 15 limitations under the License.
16 16
17 --> 17 -->
18 -<div layout="row" width="100%" layout-wrap>  
19 - <md-card flex-gt-sm="60" flex="100" style="height: 100%;"> 18 +<div>
  19 + <md-card class="settings-card">
20 <md-card-title> 20 <md-card-title>
21 <md-card-title-text> 21 <md-card-title-text>
22 <span translate class="md-headline">admin.general-settings</span> 22 <span translate class="md-headline">admin.general-settings</span>
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 limitations under the License. 15 limitations under the License.
16 16
17 --> 17 -->
18 -<div layout="row" width="100%" layout-wrap tb-help="'outgoingMailSettings'" help-container-id="help-container">  
19 - <md-card flex-gt-sm="60" flex="100" style="height: 100%;"> 18 +<div tb-help="'outgoingMailSettings'" help-container-id="help-container">
  19 + <md-card class="settings-card">
20 <md-card-title> 20 <md-card-title>
21 <md-card-title-text layout="row"> 21 <md-card-title-text layout="row">
22 <span translate class="md-headline">admin.outgoing-mail-settings</span> 22 <span translate class="md-headline">admin.outgoing-mail-settings</span>
  1 +/**
  2 + * Copyright © 2016-2019 The Thingsboard Authors
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +
  17 +@import "../../scss/constants";
  18 +
  19 +md-card.settings-card {
  20 + @media (min-width: $layout-breakpoint-sm) {
  21 + width: 60%;
  22 + }
  23 +}