зеркало из https://github.com/mozilla/smarthome.git
Resolved responsivness issues (#1430)
* Resolved responsivness issues Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
This commit is contained in:
aounhaider1
Kai Kreuzer
Родитель
6a557849f2
Коммит
34fa968a99
|
|
@ -652,14 +652,10 @@ md-progress-circular.md-default-theme .md-inner .md-left .md-half-circle
|
|||
}
|
||||
|
||||
.rules-input {
|
||||
padding: 0 0 12px 10px;
|
||||
padding: 0 0 12px 0px;
|
||||
margin-right: 3%;
|
||||
}
|
||||
|
||||
.no-padding {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.drag-handle {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
<form name="myForm">
|
||||
|
||||
<md-input-container class="col-md-12 col-sm-12 configContainer" ng-show="step==2"> <label>Name</label> <input ng-model="name"> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding" ng-show="step==2"> <label>Name</label> <input ng-model="name"> </md-input-container>
|
||||
<input type="hidden" ng-value="id">
|
||||
|
||||
<md-select ng-invalid="" required ng-show="step==1" placeholder="{{type}} type" aria-label="Select module" ng-model="module"> <md-option ng-repeat="item in moduleData" value="{{item.uid}}"> {{item.label}} </md-option> </md-select>
|
||||
</form>
|
||||
<div>
|
||||
<div ng-show="step==2">
|
||||
<md-input-container class="col-md-12 col-sm-12 configContainer" style=" margin-right:3%;"> <label>Description</label> <textarea rows="1" ng-model="description"></textarea> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding" style=" margin-right:3%;"> <label>Description</label> <textarea rows="1" ng-model="description"></textarea> </md-input-container>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-show="step==2">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
You are about to add a new thing <strong>{{discoveryResult.label}}</strong> ({{discoveryResult.thingUID}}) from the inbox.
|
||||
</p>
|
||||
<div>
|
||||
<md-input-container class="col-md-12 col-sm-12 noPadding"> <label>Name</label> <input ng-model="label"> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding"> <label>Name</label> <input ng-model="label"> </md-input-container>
|
||||
</div>
|
||||
</md-dialog-content>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
Configure {{service.label}} <small>{{service.id}}</small>
|
||||
</h1>
|
||||
<h1 ng-show="newConfig">New Configuration</h1>
|
||||
<md-input-container class="col-md-12 col-sm-12 noPadding" ng-show="newConfig"> <label>Service ID</label> <input ng-model="serviceId" type="text"> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding" ng-show="newConfig"> <label>Service ID</label> <input ng-model="serviceId" type="text"> </md-input-container>
|
||||
|
||||
<div ng-init="form={}">
|
||||
<div ng-include="'partials/include.config.html'"></div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<h1>Link channel</h1>
|
||||
<p>Please select the item to link:</p>
|
||||
<form name="linkForm">
|
||||
<md-input-container class="col-md-12 col-sm-12 noPadding"> <label>Item</label> <md-select required="true" ng-model="itemName"> <md-option ng-repeat="item in items | orderBy: 'name'" value="{{item.name}}" ng-show="acceptedItemType === item.type"> {{item.name}} </md-option> </md-select> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding"> <label>Item</label> <md-select required="true" ng-model="itemName"> <md-option ng-repeat="item in items | orderBy: 'name'" value="{{item.name}}" ng-show="acceptedItemType === item.type"> {{item.name}} </md-option> </md-select> </md-input-container>
|
||||
</form>
|
||||
</md-dialog-content>
|
||||
<div class="md-actions" layout="row">
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<md-select ng-invalid="" required placeholder="rule template" aria-label="Select template" ng-model="templateIndex"> <md-option ng-repeat="item in templateData" value="{{$index}}"> {{item.label?item.label:item.description}} </md-option> </md-select>
|
||||
</form>
|
||||
<div ng-show="templateStep==2">
|
||||
<md-input-container class="col-md-12 col-sm-12 configContainer"> <label>Name</label> <input ng-model="name"> </md-input-container>
|
||||
<md-input-container class="col-md-12 col-sm-12 configContainer"> <label>Description</label> <textarea rows="1" ng-model="description"></textarea> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding"> <label>Name</label> <input ng-model="name"> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding"> <label>Description</label> <textarea rows="1" ng-model="description"></textarea> </md-input-container>
|
||||
<h3 class="md-title-nospace">Configurations</h3>
|
||||
<div ng-include="'partials/include.config.html'"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<div ng-switch-when="input">
|
||||
<div ng-if="parameter.type=='INTEGER'">
|
||||
<label class="config-textInput" for="{{parameter.name}}">{{parameter.label}}</label>
|
||||
<md-input-container class="col-md-12 col-sm-12 configContainer"> <input ng-init="focus=false" name="{{parameter.name}}" type="number" min="{{parameter.min}}" max="{{parameter.max}}" ng-model="configuration[parameter.name]" ng-required="parameter.required" type="{{parameter.inputType}}" ng-focus="focus=true" ng-blur="focus=false">
|
||||
<md-input-container class="col-xs-12 configContainer"> <input ng-init="focus=false" name="{{parameter.name}}" type="number" min="{{parameter.min}}" max="{{parameter.max}}" ng-model="configuration[parameter.name]" ng-required="parameter.required" type="{{parameter.inputType}}" ng-focus="focus=true" ng-blur="focus=false">
|
||||
<div ng-messages="form.configForm[parameter.name].$error" ng-show="focus">
|
||||
<div ng-message="min">Minimum allowed number is {{parameter.min}}</div>
|
||||
<div ng-message="max">Maximum allowed number is {{parameter.max}}</div>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
</div>
|
||||
<div ng-if="parameter.type=='TEXT'">
|
||||
<label class="config-textInput" for="{{parameter.name}}">{{parameter.label}}</label>
|
||||
<md-input-container class="col-md-12 col-sm-12 configContainer"> <input ng-init="focus=false" name="{{parameter.name}}" ng-minlength="parameter.min" ng-maxlength="parameter.max" ng-model="configuration[parameter.name]" ng-required="parameter.required" type="{{parameter.inputType}}" ng-focus="focus=true" ng-blur="focus=false">
|
||||
<md-input-container class="col-xs-12 configContainer"> <input ng-init="focus=false" name="{{parameter.name}}" ng-minlength="parameter.min" ng-maxlength="parameter.max" ng-model="configuration[parameter.name]" ng-required="parameter.required" type="{{parameter.inputType}}" ng-focus="focus=true" ng-blur="focus=false">
|
||||
<div ng-messages="form.configForm[parameter.name].$error" ng-show="focus">
|
||||
<div ng-message="minlength">Minimum length is {{parameter.min}}</div>
|
||||
<div ng-message="maxlength">Maximum length is {{parameter.max}}</div>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
</div>
|
||||
<div ng-switch-when="select">
|
||||
<label class="config-textInput">{{parameter.label}}</label>
|
||||
<md-input-container class="col-md-12 col-sm-12 configContainer"> <md-select class="config-select" isrequired="parameter.required" ng-init="focus=false" name="{{parameter.name}}" ng-model="configuration[parameter.name]" placeholder="Select a value" ng-focus="focus=true" ng-blur="focus=false" ng-required="parameter.required"> <md-option ng-value="option.value?option.value:option.name" ng-repeat="option in parameter.options"> <span style="display: inline-block;" ng-if="parameter.context=='item'">
|
||||
<md-input-container class="col-xs-12 configContainer"> <md-select class="config-select" isrequired="parameter.required" ng-init="focus=false" name="{{parameter.name}}" ng-model="configuration[parameter.name]" placeholder="Select a value" ng-focus="focus=true" ng-blur="focus=false" ng-required="parameter.required"> <md-option ng-value="option.value?option.value:option.name" ng-repeat="option in parameter.options"> <span style="display: inline-block;" ng-if="parameter.context=='item'">
|
||||
{{ option.label?option.label:option.name }}
|
||||
<span class="md-caption" style="color: grey;">({{ option.name?option.name:'' }}) </span>
|
||||
</span> <span ng-if="!parameter.context">{{option.label}}</span> </md-option> </md-select>
|
||||
|
|
@ -70,9 +70,9 @@
|
|||
</span> </md-input-container>
|
||||
</div>
|
||||
</div>
|
||||
<div class="parameter col-sm-12 col-xs-12" ng-switch-when="textarea">
|
||||
<div class="parameter col-xs-12" ng-switch-when="textarea">
|
||||
<label class="config-textInput" for="{{parameter.name}}">{{parameter.label}}</label>
|
||||
<div class="col-md-12 col-sm-12 configContainer">
|
||||
<div class="col-xs-12 configContainer">
|
||||
<textarea scriptarea class="scriptArea" ng-minlength="parameter.min" ng-maxlength="parameter.max" rows="2" wrap="off" ng-init="focus=false" name="{{parameter.name}}" ng-model="configuration[parameter.name]" ng-required="parameter.required" ng-focus="focus=true" ng-blur="focus=false"></textarea>
|
||||
<div ng-messages="form.configForm[parameter.name].$error" ng-show="focus">
|
||||
<p ng-message="minlength" class="customMessage">Minimum length is {{parameter.min}}</p>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<form name="form.thingform">
|
||||
<div class="container" ng-if="thing.item">
|
||||
<div class="thingName">
|
||||
<md-input-container class="col-md-12 col-sm-12 noPadding"> <label>Name</label> <input ng-model="thing.label"> </md-input-container>
|
||||
<md-input-container class="col-xs-12 noPadding"> <label>Name</label> <input ng-model="thing.label"> </md-input-container>
|
||||
|
||||
<md-input-container class="col-md-12 col-sm-12 noPadding" ng-if="!isEditing"> <label>Thing ID</label> <input ng-model="thing.ID" required>
|
||||
<md-input-container class="col-xs-12 noPadding" ng-if="!isEditing"> <label>Thing ID</label> <input ng-model="thing.ID" required>
|
||||
<div ng-messages="form.thingform.uid.$error">
|
||||
<div ng-message="pattern">ID is required</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -65,11 +65,12 @@
|
|||
<div class="bindings row">
|
||||
<div class="row">
|
||||
<div class="ruleNameDesc">
|
||||
<md-input-container class="rules-input col-md-12 col-sm-12 configContainer"> <label>Name</label> <input ng-model="name" /> </md-input-container>
|
||||
<md-input-container class="rules-input col-md-12 col-sm-12 configContainer"> <label>Description</label> <textarea rows="1" ng-model="description"></textarea> </md-input-container>
|
||||
<md-input-container class="rules-input col-xs-12"> <label>Name</label> <input ng-model="name" /> </md-input-container>
|
||||
<md-input-container class="rules-input col-xs-12"> <label>Description</label> <textarea rows="1" ng-model="description"></textarea> </md-input-container>
|
||||
<input type="hidden" ng-value="id" />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-5 item-wrapper">
|
||||
<h3 class="md-title md-title-nospace">
|
||||
Triggers
|
||||
|
|
@ -119,7 +120,7 @@
|
|||
<hr></hr>
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="col-md-10 item-wrapper no-padding">
|
||||
<div class="col-md-10 item-wrapper noPadding">
|
||||
<h3 class="md-title md-title-nospace">
|
||||
Conditions
|
||||
<md-button class="md-fab md-custom-plus" ng-click="openNewModuleDialog($event,'condition')" aria-label="Add">+</md-button>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче