More permanent fix for control spacing

This commit is contained in:
Rick Falkvinge
2016-12-29 19:47:40 +01:00
parent 31bcce147d
commit 84c05aeba7
8 changed files with 19 additions and 12 deletions
+1 -1
View File
@@ -179,4 +179,4 @@
</script>
<asp:TextBox ID="TextInput" runat="server" />
<div class="stacked-input-control"><asp:TextBox ID="TextInput" runat="server" /></div>
+2 -2
View File
@@ -113,5 +113,5 @@
</script>
<asp:Label runat="server" ID="ToggleSliderLabel"></asp:Label>
<div class="toggle-iphone toggle-padding" id="<%=this.ClientID %>_sliderContainer"><asp:Checkbox ID="SliderCheckbox" runat="server"/></div>
<div class="stacked-input-control"><asp:Label runat="server" ID="ToggleSliderLabel"></asp:Label>
<div class="toggle-iphone toggle-padding" id="<%=this.ClientID %>_sliderContainer"><asp:Checkbox ID="SliderCheckbox" runat="server"/></div></div>
+1 -1
View File
@@ -60,4 +60,4 @@
</script>
<span id="<%=this.ClientID %>_SpanGeographies"><select class="easyui-combotree" name="DropGeographies" id="<%=this.ClientID %>_DropGeographies" animate="true" style="width:324px"></select></span>
<div class="stacked-input-control"><span id="<%=this.ClientID %>_SpanGeographies"><select class="easyui-combotree" name="DropGeographies" id="<%=this.ClientID %>_DropGeographies" animate="true" style="width:324px"></select></span></div><%-- --%>
+1 -1
View File
@@ -82,4 +82,4 @@
</script>
<span id="<%=this.ClientID %>_SpanDrop"><asp:DropDownList ID="DropControl" runat="server" /></span>
<div class="stacked-input-control"><span id="<%=this.ClientID %>_SpanDrop"><asp:DropDownList ID="DropControl" runat="server" /></span></div>
+1 -1
View File
@@ -65,5 +65,5 @@
</script>
<div class="buttonUploadFile"><input id="<%=this.ClientID %>_ButtonUploadVisible" class="ButtonSwarmopsUpload NoInputFocus" type="button" <%= this.HideTrigger? "style='display:none'" : string.Empty %> /><input id="<%=this.ClientID %>_ButtonUploadHidden" type="file" name="files[]" multiple style="display:none" /></div><div style="height:36px;padding-top:4px;width:270px;margin-right:10px;float:right;border:none"><div id="<%=this.ClientID %>_DivUploadCount" style='display:none;overflow:hidden;height:'<%=this.DisplayCount < 9? 32: 64%>px'></div><div id="<%=this.ClientID %>_DivProgressUpload" style="width:100%;margin-top:8px;display:none"></div></div>&#8203;<br/>
<div class="stacked-input-control"><div class="buttonUploadFile"><input id="<%=this.ClientID %>_ButtonUploadVisible" class="ButtonSwarmopsUpload NoInputFocus" type="button" <%= this.HideTrigger? "style='display:none'" : string.Empty %> /><input id="<%=this.ClientID %>_ButtonUploadHidden" type="file" name="files[]" multiple style="display:none" /></div><div style="height:36px;padding-top:4px;width:270px;margin-right:10px;float:right;border:none"><div id="<%=this.ClientID %>_DivUploadCount" style='display:none;overflow:hidden;height:'<%=this.DisplayCount < 9? 32: 64%>px'></div><div id="<%=this.ClientID %>_DivProgressUpload" style="width:100%;margin-top:8px;display:none"></div></div></div>
+1 -1
View File
@@ -130,4 +130,4 @@
</script>
<span id="<%=this.ClientID %>_SpanPeople" class="fakePlaceholderText"><select class="easyui-combobox comboperson" url="" name="DropPeople" id="<%=this.ClientID %>_DropPeople" animate="true" style="width:324px"></select></span>
<div class="stacked-input-control"><span id="<%=this.ClientID %>_SpanPeople" class="fakePlaceholderText"><select class="easyui-combobox comboperson" url="" name="DropPeople" id="<%=this.ClientID %>_DropPeople" animate="true" style="width:324px"></select></span></div>
+5 -5
View File
@@ -80,12 +80,12 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
<div class="entryFields" style="padding-top:4px">
<Swarmops5:DropDown runat="server" ID="DropRecipientClasses" OnClientChange="onRecipientChange"/>&thinsp;<br/>
<Swarmops5:ComboGeographies ID="ComboGeographies" runat="server" OnClientSelect="onGeographyChange" />&thinsp;<br/>
<asp:TextBox ID="TextSubject" runat="server"/>&thinsp;
<div class="entryFields">
<Swarmops5:DropDown runat="server" ID="DropRecipientClasses" OnClientChange="onRecipientChange"/>
<Swarmops5:ComboGeographies ID="ComboGeographies" runat="server" OnClientSelect="onGeographyChange" />
<asp:TextBox ID="TextSubject" runat="server"/>
</div>
<div class="entryLabels" style="padding-top:10px">
<div class="entryLabels">
<asp:Label ID="LabelRecipientType" runat="server" /><br/>
<asp:Label ID="LabelGeography" runat="server" /><br/>
<asp:Label ID="LabelSubject" runat="server"/>
+7
View File
@@ -334,6 +334,13 @@ body.rtl .sidebar {
}
div.stacked-input-control {
height: 40px;
width: 100%;
overflow-y: hidden;
}
.content h3
{
font-family: Ubuntu, Arial, Sans-Serif;