Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Align checkbox in dialogue form better and don't add extra line break in edit subsection #178

Merged
merged 2 commits into from Dec 15, 2015
Merged

Align checkbox in dialogue form better and don't add extra line break in edit subsection #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d79cef
Do not insert line break between description and the existing licence…
manicki Dec 14, 2015
1113dcc
Use bootstrap checkbox styles to have text wrapping properly in dialo…
manicki Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions redesign/css/main.css
View file
Open in desktop
Expand Up @@ -453,6 +453,9 @@ a:hover {
.dialogue-bubble .form-group {
margin: 5px 0;
}
.dialogue-bubble input[type="checkbox"] {
position: relative;
}
.dialogue-bubble .bubble-columns {
-webkit-column-count: 2;
-moz-column-count: 2;
Expand Down
4 changes: 2 additions & 2 deletions redesign/js/app/templates/AuthorStep.handlebars
View file
Open in desktop
Expand Up @@ -14,11 +14,11 @@
<form class="immediate-submit">
<p>{{translate 'dialogue.author-label'}}</p>

<div class="form-group">
<div class="form-group checkbox">
<input type="text" name="author"><button class="green-btn" type="submit">{{translate 'dialogue.next'}}</button>
</div>

<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="no-author" value="true">
{{translate 'dialogue.answer-no-author'}}
Expand Down
2 changes: 1 addition & 1 deletion redesign/js/app/templates/ChangeStep.handlebars
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@

{{#*inline 'content'}}
<form>
<div class="form-group">
<div class="form-group checkbox">
<input type="text" name="change"><button class="green-btn" type="submit">{{translate 'dialogue.next'}}</button>
</div>
</form>
Expand Down
4 changes: 2 additions & 2 deletions redesign/js/app/templates/CompilationStep.handlebars
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@

{{#*inline 'content'}}
<form class="immediate-submit">
<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="compilation" value="true">
{{translate 'dialogue.answer-compilation'}}
Expand All @@ -17,7 +17,7 @@
</div>
</div>

<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="compilation" value="false">
{{translate 'dialogue.answer-no-compilation'}}
Expand Down
4 changes: 2 additions & 2 deletions redesign/js/app/templates/EditingStep.handlebars
View file
Open in desktop
Expand Up @@ -12,14 +12,14 @@

{{#*inline 'content'}}
<form class="immediate-submit">
<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="edited" value="true">
{{translate 'dialogue.answer-edited'}}
</label>
</div>

<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="edited" value="false">
{{translate 'dialogue.answer-not-edited'}}
Expand Down
6 changes: 3 additions & 3 deletions redesign/js/app/templates/LicenceStep.handlebars
View file
Open in desktop
Expand Up @@ -12,17 +12,17 @@

{{#*inline 'content'}}
<form class="immediate-submit">
<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="licence" value="{{original.id}}">
{{translate 'dialogue.same-licence'}}
<br>(<b>{{original.name}}</b>
(<b>{{original.name}}</b>
<small>&#8594;<a href="{{original.url}}" target="_blank">{{translate 'dialogue.licence-text'}}</a></small>)
</label>
</div>

{{#each compatibles}}
<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="licence" value="{{this.getId}}"> <b>{{this.getName}}</b>
<small>&#8594;<a href="{{this.getUrl}}" target="_blank">{{translate 'dialogue.licence-text'}}</a></small>
Expand Down
4 changes: 2 additions & 2 deletions redesign/js/app/templates/TypeOfUseStep.handlebars
View file
Open in desktop
Expand Up @@ -5,14 +5,14 @@

{{#*inline 'content'}}
<form class="immediate-submit">
<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="type" value="print">
{{translate 'dialogue.answer-print'}}
</label>
</div>

<div class="form-group">
<div class="form-group checkbox">
<label>
<input type="checkbox" name="type" value="online">
{{translate 'dialogue.answer-online'}}
Expand Down