freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Delete buttons restyled.

Browse source
This commit is contained in:
baldo 2016-05-16 22:30:35 +02:00
parent 322a2c9dfb
commit 4474a212e7
9 changed files with 10 additions and 10 deletions

3
app/scripts/directives/tokenForm.js
View file

@ -35,7 +35,8 @@ angular.module('ffffng')
'onSubmit': '=fSubmit', 'onSubmit': '=fSubmit',
'onCancel': '=fCancel', 'onCancel': '=fCancel',
'submitIcon': '@fSubmitIcon', 'submitIcon': '@fSubmitIcon',
'submitLabel': '@fSubmitLabel' 'submitLabel': '@fSubmitLabel',
'submitBtn': '@fSubmitBtn'
} }
}; };
}); });

3
app/styles/_variables.scss
View file

@ -15,7 +15,6 @@ $brand-warning: #FDBC41;
$brand-danger: #C9302C; $brand-danger: #C9302C;
$brand-info: #009EE0; $brand-info: #009EE0;
// Scaffolding // Scaffolding
$body-bg: $gray-lighter; $body-bg: $gray-lighter;
$text-color: $gray-dark; $text-color: $gray-dark;
@ -62,7 +61,7 @@ $btn-primary-border: darken($btn-primary-bg, 10%);
$btn-success-color: #FFFFFF; $btn-success-color: #FFFFFF;
$btn-success-bg: $brand-success; $btn-success-bg: $brand-success;
$btn-success-border: darken($btn-success-bg, 10%); $btn-success-border: darken($btn-success-bg, 10%);
$btn-warning-color: #FFFFFF; $btn-warning-color: $gray-dark;
$btn-warning-bg: $brand-warning; $btn-warning-bg: $brand-warning;
$btn-warning-border: darken($btn-warning-bg, 10%); $btn-warning-border: darken($btn-warning-bg, 10%);
$btn-danger-color: #FFFFFF; $btn-danger-color: #FFFFFF;

2
app/styles/views/_main.scss
View file

@ -39,7 +39,7 @@
.delete-node { .delete-node {
button { button {
//@extend .btn-link; @extend .btn-warning;
} }
} }
} }

2
app/styles/views/dialogs/_confirmDeletionDialog.scss
View file

@ -26,7 +26,7 @@
margin-left: 5px; margin-left: 5px;
&.proceed { &.proceed {
@extend .btn-primary; @extend .btn-warning;
} }
} }
} }

2
app/styles/views/directives/_tokenForm.scss
View file

@ -17,7 +17,7 @@ f-token-form {
} }
.submit { .submit {
@extend .btn, .btn-primary; @extend .btn;
margin-left: 5px; margin-left: 5px;
} }

2
app/views/deleteNodeForm.html
View file

@ -13,7 +13,7 @@
<a href="mailto:{{ config.community.contactEmail }}">{{ config.community.contactEmail }}</a>. <a href="mailto:{{ config.community.contactEmail }}">{{ config.community.contactEmail }}</a>.
</strong> </strong>
</p> </p>
<f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-trash" f-submit-label="Knoten löschen"></f-token-form> <f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-trash" f-submit-label="Knoten löschen" f-submit-btn="btn-warning"></f-token-form>
<p> <p>
<em> <em>

2
app/views/dialogs/confirmDeletionDialog.html
View file

@ -5,7 +5,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p> <p>
Soll der Knoten „{{node.hostname}}“ wirklich endgültig gelöscht werden? Soll der Knoten <strong>{{node.hostname}}</strong> wirklich endgültig gelöscht werden?
Du kannst ihn selbstverständlich später jederzeit erneut anmelden! Du kannst ihn selbstverständlich später jederzeit erneut anmelden!
</p> </p>
</div> </div>

2
app/views/directives/tokenForm.html
View file

@ -9,7 +9,7 @@
</span> </span>
</div> </div>
<div class="buttons"> <div class="buttons">
<button class="submit" type="submit"> <button class="submit {{submitBtn}}" type="submit">
<i class="fa {{submitIcon}}"></i> {{submitLabel}} <i class="fa {{submitIcon}}"></i> {{submitLabel}}
</button> </button>
<button class="cancel" type="reset" ng-click="onCancel()"> <button class="cancel" type="reset" ng-click="onCancel()">

2
app/views/updateNodeForm.html
View file

@ -13,7 +13,7 @@
<a href="mailto:{{ config.community.contactEmail }}">{{ config.community.contactEmail }}</a>. <a href="mailto:{{ config.community.contactEmail }}">{{ config.community.contactEmail }}</a>.
</strong> </strong>
</p> </p>
<f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-pencil" f-submit-label="Knotendaten ändern"></f-token-form> <f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-pencil" f-submit-label="Knotendaten ändern" f-submit-btn="btn-primary"></f-token-form>
</div> </div>
<div ng-if="hasData()"> <div ng-if="hasData()">