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

Minor fixes lost on merge

stable
Xavier Julián 2015-01-19 16:30:05 +01:00
parent 5dfa467492
commit e9dbb8a155
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/styles/modules/backlog/taskboard-table.scss
View File

@ -59,19 +59,12 @@ $column-margin: 0 10px 0 0;
} }
.task-colum-name { .task-colum-name {
@extend %large; @extend %large;
<<<<<<< HEAD
@include table-flex();
background: $whitish;
border-top: 3px solid $gray-light;
flex: auto 0 auto;
=======
background: $whitish; background: $whitish;
border-top: 3px solid $gray-light; border-top: 3px solid $gray-light;
display: flex; display: flex;
flex-basis: $column-width; flex-basis: $column-width;
flex-grow: $column-flex; flex-grow: $column-flex;
flex-shrink: $column-shrink; flex-shrink: $column-shrink;
>>>>>>> Removed flexbox mixins to vanilla CSS
justify-content: space-between; justify-content: space-between;
margin: $column-margin; margin: $column-margin;
max-width: $column-width; max-width: $column-width;

6
app/styles/modules/common/related-tasks.scss
View File

@ -113,6 +113,7 @@
white-space: nowrap; white-space: nowrap;
} }
input { input {
@extend %medium;
margin-right: 1rem; margin-right: 1rem;
padding: 3px; padding: 3px;
width: 85%; width: 85%;
@ -123,8 +124,7 @@
text-align: center; text-align: center;
width: 100%; width: 100%;
span { span {
animation: loading .5s linear; animation: loading .5s linear, spin 1s linear infinite;
animation: spin 1s linear infinite;
} }
} }
} }
@ -209,7 +209,7 @@
display: flex; display: flex;
img { img {
flex-basis: 35px; flex-basis: 35px;
/* width & height they are only required for IE */ // width & height they are only required for IE
height: 35px; height: 35px;
width: 35px; width: 35px;
} }

2
app/styles/modules/search/search-result-table.scss
View File

@ -28,9 +28,9 @@
text-align: center; text-align: center;
} }
.assigned-to { .assigned-to {
padding: 0 1rem;
flex-basis: 250px; flex-basis: 250px;
flex-grow: 1; flex-grow: 1;
padding: 0 1rem;
} }
} }
.row-selected { .row-selected {

3
app/styles/modules/wiki/wiki-nav.scss
View File

@ -42,8 +42,7 @@
float: none; float: none;
} }
span { span {
animation: loading .5s linear; animation: loading .5s linear, spin 1s linear infinite;
animation: spin 1s linear infinite;
} }
} }
} }