Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

stretch out some controls to 100% width

Browse source
This commit is contained in:
Felix Niklas 2016-02-17 18:12:39 +01:00
parent ef83cfdeab
commit 0f21655439
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
View file

@ -8,8 +8,12 @@
<p><%- @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p> <p><%- @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p>
<h3><%- @T('URL') %></h3> <h3><label for="calendar-subscription-url"><%- @T('URL') %></label></h3>
<input class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets"> <div class="form-group">
<div class="controls">
<input type="url" class="form-control js-select" readonly value="<%= @baseurl %>/ical/tickets" id="calendar-subscription-url">
</div>
</div>
<h3><%- @T('Subscription Settings') %></h3> <h3><%- @T('Subscription Settings') %></h3>
<table class="settings-list"> <table class="settings-list">

2
app/assets/javascripts/app/views/settings/item.jst.eco
View file

@ -2,7 +2,7 @@
<h2><%- @T( @setting.title ) %></h2> <h2><%- @T( @setting.title ) %></h2>
<p class="help-text"><%- @RichText( @setting.description ) %></p> <p class="help-text"><%- @RichText( @setting.description ) %></p>
<div class="horizontal end"> <div class="horizontal end">
<div class="form-item flex"></div> <div class="form-item"></div>
<button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button> <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
</div> </div>
</form> </form>

15
app/assets/stylesheets/zammad.scss
View file

@ -1402,6 +1402,14 @@ fieldset > .form-group {
.form-control { .form-control {
min-width: initial; min-width: initial;
} }
.controls {
display: block;
}
.controls--button {
display: flex;
}
} }
.formGroup--standalone .form-control { .formGroup--standalone .form-control {
@ -1437,6 +1445,7 @@ textarea,
display: block; display: block;
padding: 7px 12px; padding: 7px 12px;
width: 100%; width: 100%;
min-width: 200px;
height: 41px; height: 41px;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
@ -1649,7 +1658,7 @@ input.has-error {
} }
.controls--button { .controls--button {
display: flex; display: inline-flex;
input, input,
.form-control { .form-control {
@ -3422,6 +3431,10 @@ footer {
text-transform: initial; text-transform: initial;
letter-spacing: 0; letter-spacing: 0;
} }
.controls {
width: 100%;
}
} }
.sidebar-block { .sidebar-block {