taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor style fixes

stable
xaviju 2017-03-02 16:32:18 +01:00
parent 7837dde7c4
commit 16a7eb74b3
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/modules/projects/create/create-project-restrictions/create-project-restrictions.jade
View File

@ -1,11 +1,11 @@
div.create-project-warning( .create-project-warning(
ng-if="isPrivate && !canCreatePrivateProjects.valid && canCreatePrivateProjects.reason == 'max_private_projects'" ng-if="isPrivate && !canCreatePrivateProjects.valid && canCreatePrivateProjects.reason == 'max_private_projects'"
) )
tg-svg(svg-icon="icon-exclamation") tg-svg(svg-icon="icon-exclamation")
span {{ 'PROJECT.CREATE.MAX_PRIVATE_PROJECTS' | translate }} span {{ 'PROJECT.CREATE.MAX_PRIVATE_PROJECTS' | translate }}
div.create-project-warning( .create-project-warning(
ng-if="!isPrivate && !canCreatePublicProjects.valid && canCreatePublicProjects.reason == 'max_public_projects'" ng-if="!isPrivate && !canCreatePublicProjects.valid && canCreatePublicProjects.reason == 'max_public_projects'"
) )
tg-svg(svg-icon="icon-exclamation") tg-svg(svg-icon="icon-exclamation")
span {{ 'PROJECT.CREATE.MAX_PUBLIC_PROJECTS' | translate }} span {{ 'PROJECT.CREATE.MAX_PUBLIC_PROJECTS' | translate }}

6
app/modules/projects/create/warning-user-import-lightbox/warning-user-import-lightbox.jade
View File

@ -1,8 +1,8 @@
tg-lightbox-close(on-close="onClose()") tg-lightbox-close(on-close="onClose()")
.create-project.import-project .warning-users-import-lightbox
h1(translate="PROJECT.IMPORT.WARNING.TITLE") h1.warning-users-import-title(translate="PROJECT.IMPORT.WARNING.TITLE")
p(translate="PROJECT.IMPORT.WARNING.DESCRIPTION") p(translate="PROJECT.IMPORT.WARNING.DESCRIPTION")
.actions .actions
button.button.button-gray(translate="PROJECT.IMPORT.WARNING.CHECK", ng-click="onClose()") button.button.button-trans(translate="PROJECT.IMPORT.WARNING.CHECK", ng-click="onClose()")
button.button.button-green(type="submit", translate="PROJECT.IMPORT.IMPORT", ng-click="onConfirm()") button.button.button-green(type="submit", translate="PROJECT.IMPORT.IMPORT", ng-click="onConfirm()")

20
app/modules/projects/create/warning-user-import-lightbox/warning-user-import-lightbox.scss
View File

@ -1,9 +1,21 @@
tg-warning-user-import-lightbox { .warning-users-import-lightbox {
max-width: 600px;
.warning-users-import-title {
text-align: center;
}
.actions { .actions {
display: flex; display: flex;
justify-content: center; margin: 2rem;
button:first-child { button {
margin-right: .5rem; flex: 1;
&:first-child {
flex: 0;
flex-basis: 40%;
margin-right: .5rem;
}
}
.button-trans {
color: $grayer;
} }
} }
} }

4
app/styles/dependencies/mixins/create.scss
View File

@ -218,8 +218,10 @@
} }
&-warning { &-warning {
@include font-size(small); @include font-size(small);
border: 1px solid $red-light;
display: flex;
padding: 1rem; padding: 1rem;
text-align: center; margin-bottom: 1rem;
.icon-exclamation { .icon-exclamation {
fill: $red-light; fill: $red-light;
margin-right: .5rem; margin-right: .5rem;