Skip to content

Commit 4332eb1

Browse files
o5faruko5faruk
authored
Merge pull request #113 from o5faruk/feature/alignment
allow positioning and change font size
2 parents 3e4cf91 + 8044c7e commit 4332eb1

File tree

4 files changed

+191
-34
lines changed

4 files changed

+191
-34
lines changed

‎control/design/app.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,10 @@
7070
bottom: -22px;
7171
left: 0;
7272
right: 0;
73+
}
74+
75+
.dropdown {
76+
-webkit-appearance: menulist !important;
77+
margin-left: 14px;
78+
7379
}

‎control/design/design.controller.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
securedFeaturesOption:"Enable"
4949
};
5050
}
51+
if(typeof $scope.data.design.showBlackOverlay !== 'boolean') {
52+
$scope.data.design.showBlackOverlay = true;
53+
}
54+
if(typeof $scope.data.design.showLineSeparator !== 'boolean') {
55+
$scope.data.design.showLineSeparator = true;
56+
}
5157
if (!$scope.data.design.securedFeaturesOption){
5258
$scope.data.design.securedFeaturesOption = "Enable";
5359
}

‎control/design/index.html‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,94 @@
4545
</div>
4646
</div>
4747
</div>
48+
<hr ng-hide="data.design.selectedLayout < 9 || data.design.selectedLayout > 11">
49+
<div class="item row margin-bottom-twenty clearfix textAlign"
50+
ng-hide="data.design.selectedLayout < 9 || data.design.selectedLayout > 11">
51+
<div class="labels col-md-3 padding-right-zero pull-left">
52+
<span>Text Align</span>
53+
</div>
54+
<div class="main col-md-9 pull-right">
55+
<div class="screens clearfix margin-bottom-twenty">
56+
<div class="screen layouticon pull-left">
57+
Vertical
58+
</div>
59+
<div class="screen margin-left-zero">
60+
<select class="form-control dropdown" ng-model="data.design.textAlignVertical">
61+
<option value="flex-start">Top</option>
62+
<option value="center" ng-selected="true">Center</option>
63+
<option value="flex-end">Bottom</option>
64+
</select>
65+
</div>
66+
</div>
67+
<div class="screens clearfix">
68+
<div class="screen layouticon pull-left">
69+
Horizontal
70+
</div>
71+
<div class="screen margin-left-zero">
72+
<select class="form-control dropdown" ng-model="data.design.textAlignHorizontal">
73+
<option value="flex-start">Left</option>
74+
<option value="center" ng-selected="true">Center</option>
75+
<option value="flex-end">Right</option>
76+
</select>
77+
</div>
78+
</div>
79+
</div>
80+
</div>
81+
<hr ng-hide="data.design.selectedLayout < 9 || data.design.selectedLayout > 11">
82+
<div class="item row clearfix" ng-hide="data.design.selectedLayout < 9 || data.design.selectedLayout > 11">
83+
<div class="labels col-md-3 padding-right-zero pull-left">
84+
<span>Image Overlay</span>
85+
</div>
86+
<div class="main col-md-9 pull-right">
87+
<div class="radio radio-primary radio-inline">
88+
<input id="showBlackOverlayOff" type="radio" name="showBlackOverlayOff" ng-model="data.design.showBlackOverlay" ng-value="false">
89+
<label for="showBlackOverlayOff">Hide</label>
90+
</div>
91+
<div class="radio radio-primary radio-inline">
92+
<input id="showBlackOverlay" type="radio" name="showBlackOverlay" ng-model="data.design.showBlackOverlay" ng-value="true">
93+
<label for="showBlackOverlay">Show</label>
94+
</div>
95+
</div>
96+
</div>
97+
<hr ng-hide="![1, 2, 8].includes(data.design.selectedLayout)">
98+
<div class="item row clearfix" ng-hide="![1, 2, 8].includes(data.design.selectedLayout)">
99+
<div class="labels col-md-3 padding-right-zero pull-left">
100+
<span>Line Separator</span>
101+
</div>
102+
<div class="main col-md-9 pull-right">
103+
<div class="radio radio-primary radio-inline">
104+
<input id="showLineSeparatorOff" type="radio" name="showLineSeparatorOff" ng-model="data.design.showLineSeparator" ng-value="false">
105+
<label for="showLineSeparatorOff">Hide</label>
106+
</div>
107+
<div class="radio radio-primary radio-inline">
108+
<input id="showLineSeparator" type="radio" name="showLineSeparator" ng-model="data.design.showLineSeparator" ng-value="true">
109+
<label for="showLineSeparator">Show</label>
110+
</div>
111+
</div>
112+
</div>
113+
<hr>
114+
<div class="item row margin-bottom-twenty clearfix textAlign">
115+
<div class="labels col-md-3 padding-right-zero pull-left">
116+
<span>Font Size</span>
117+
</div>
118+
<div class="main col-md-9 pull-right">
119+
<div class="screens clearfix">
120+
<div class="screen layouticon pull-left">
121+
<select class="form-control dropdown margin-left-zero" ng-model="data.design.textFontSize">
122+
<option value="12">12px</option>
123+
<option value="14">14px</option>
124+
<option value="16" ng-selected="true">16px</option>
125+
<option value="18">18px</option>
126+
<option value="20">20px</option>
127+
<option value="24">24px</option>
128+
<option value="28">28px</option>
129+
<option value="32">32px</option>
130+
<option value="36">36px</option>
131+
</select>
132+
</div>
133+
</div>
134+
</div>
135+
</div>
48136
<hr>
49137
<div class="item clearfix row padding-bottom-twenty">
50138
<div class="labels col-md-3 padding-right-zero pull-left">

0 commit comments

Comments
 (0)