Commit 05c07a6c authored by Curtis Adam's avatar Curtis Adam

Merge branch '65-misalignment-of-icon-and-button-layout' into 'staging'

Resolve "Misalignment of icon and button layout"

Closes #65

See merge request arsnova/cards!74
parents df25f385 45f6af4e
......@@ -109,16 +109,17 @@ $padding-card-list-row: 8px;
}
#selectLicenseModal {
#cc-modules img {
width: 30px;
label {
text-align: left;
}
#cc-description {
padding-top: 10px;
#cc-modules {
width: 100%;
img {
width: 58px;
width: 30px;
}
p {
padding-bottom: 10px;
label {
text-align: center;
}
}
}
......@@ -261,17 +262,10 @@ $padding-card-list-row: 8px;
width: 100%;
}
#showLicenseModal {
#cc-modules img {
#cc-description {
img {
width: 30px;
}
#cc-description {
padding-top: 10px;
img {
width: 58px;
}
}
}
.table {
......
......@@ -14,25 +14,45 @@
<div id=cc-description class="col-md-12">
{{#if getLicenseCount}}
{{#if getLicenseType 'by'}}
<img class="col-md-2" src="/img/by.large.png" alt="Namensnennung"/>
<p class="col-md-10">{{_ "modal-dialog.by-desc"}}</p>
<div class="row">
<div class="col-xs-2">
<img src="/img/by.large.png" alt="Namensnennung"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.by-desc"}}</p></div>
</div>
{{/if}}
{{#if getLicenseType 'nc'}}
<img class="col-md-2" src="/img/nc-eu.large.png" alt="Nicht kommerziell"/>
<p class="col-md-10">{{_ "modal-dialog.nc-desc"}}</p>
<div class="row">
<div class="col-xs-2">
<img src="/img/nc-eu.large.png" alt="Nicht kommerziell"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.nc-desc"}}</p></div>
</div>
{{/if}}
{{#if getLicenseType 'nd'}}
<img class="col-md-2" src="/img/nd.large.png" alt="Keine Bearbeitung"/>
<p class="col-md-10">{{_ "modal-dialog.nd-desc"}}</p>
<div class="row">
<div class="col-xs-2">
<img src="/img/nd.large.png" alt="Keine Bearbeitung"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.nd-desc"}}</p></div>
</div>
{{/if}}
{{#if getLicenseType 'sa'}}
<img class="col-md-2" src="/img/sa.large.png"
alt="Weitergabe unter gleichen Bedingungen"/>
<p class="col-md-10">{{_ "modal-dialog.sa-desc"}}</p>
<div class="row">
<div class="col-xs-2">
<img src="/img/sa.large.png"
alt="Weitergabe unter gleichen Bedingungen"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.sa-desc"}}</p></div>
</div>
{{/if}}
{{else}}
<img class="col-md-2" src="/img/zero.large.png" alt="Keine Lizenz"/>
<p class="col-md-10">{{_ "modal-dialog.zero-desc"}}</p>
<div class="row">
<div class="col-xs-2">
<img src="/img/zero.large.png" alt="Keine Lizenz"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.zero-desc"}}</p></div>
</div>
{{/if}}
</div>
</div>
......
......@@ -11,31 +11,27 @@
<div class="modal-body">
<div class="form-horizontal">
<div class="form-group">
<label id="modulesLabel" class="col-md-3 control-label"
<label id="modulesLabel" class="col-xs-12 control-label"
for="newSetDescription">{{_ "modal-dialog.modules"}}</label>
<div class="controls col-md-9">
<div class="controls col-xs-12">
<div id="cc-modules" class="btn-group" data-toggle="buttons">
<label id="cc-option0"
class="btn btn-default {{#if licenseIsActive 'by'}}active{{/if}}"
style="width:100px">
class="col-xs-3 btn btn-default {{#if licenseIsActive 'by'}}active{{/if}}">
<input type="checkbox" autocomplete="off" value="by" id="cc-by">
<img src="/img/by.large.png" alt="Namensnennung"/>
</label>
<label id="cc-option1"
class="btn btn-default {{#if licenseIsActive 'nc'}}active{{/if}}"
style="width:100px">
class="col-xs-3 btn btn-default {{#if licenseIsActive 'nc'}}active{{/if}}">
<input type="checkbox" autocomplete="off" value="nc" id="cc-nc">
<img src="/img/nc-eu.large.png" alt="Nicht kommerziell"/>
</label>
<label id="cc-option2"
class="btn btn-default {{#if licenseIsActive 'nd'}}active{{/if}}"
style="width:100px">
class="col-xs-3 btn btn-default {{#if licenseIsActive 'nd'}}active{{/if}}">
<input type="checkbox" autocomplete="off" value="nd" id="cc-nd">
<img src="/img/nd.large.png" alt="Keine Bearbeitung"/>
</label>
<label id="cc-option3"
class="btn btn-default {{#if licenseIsActive 'sa'}}active{{/if}}"
style="width:100px">
class="col-xs-3 btn btn-default {{#if licenseIsActive 'sa'}}active{{/if}}">
<input type="checkbox" autocomplete="off" value="sa" id="cc-sa">
<img src="/img/sa.large.png" alt="Weitergabe unter gleichen Bedingungen"/>
</label>
......@@ -43,23 +39,38 @@
<span id="helpCC-modules" class="help-block cc-modules"></span>
</div>
<div id=cc-description class="col-md-12">
<div id=cc-description class="col-xs-12">
<hr>
<img class="col-md-2" src="/img/by.large.png" alt="Namensnennung"/>
<p class="col-md-10">{{_ "modal-dialog.by-desc"}}</p>
<img class="col-md-2" src="/img/nc-eu.large.png" alt="Nicht kommerziell"/>
<p class="col-md-10">{{_ "modal-dialog.nc-desc"}}</p>
<img class="col-md-2" src="/img/nd.large.png" alt="Keine Bearbeitung"/>
<p class="col-md-10">{{_ "modal-dialog.nd-desc"}}</p>
<img class="col-md-2" src="/img/sa.large.png"
alt="Weitergabe unter gleichen Bedingungen"/>
<p class="col-md-10">{{_ "modal-dialog.sa-desc"}}</p>
<div class="row">
<div class="col-xs-2">
<img src="/img/by.large.png" alt="Namensnennung"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.by-desc"}}</p></div>
</div>
<div class="row">
<div class="col-xs-2">
<img src="/img/nc-eu.large.png" alt="Nicht kommerziell"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.nc-desc"}}</p></div>
</div>
<div class="row">
<div class="col-xs-2">
<img src="/img/nd.large.png" alt="Keine Bearbeitung"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.nd-desc"}}</p></div>
</div>
<div class="row">
<div class="col-xs-2">
<img src="/img/sa.large.png" alt="Weitergabe unter gleichen Bedingungen"/>
</div>
<div class="col-xs-10"><p>{{_ "modal-dialog.sa-desc"}}</p></div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button id="licenseCancel" class="btn btn-default btn-raised btn-block"
<button id="licenseCancel" class="btn btn-default btn-raised pull-left"
data-dismiss="modal">{{_ "modal-dialog.cancel"}}</button>
<button id="licenseSave" class="btn btn-success btn-raised btn-block pull-success pull-right">{{_
"modal-dialog.saveLicense"}}</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment