diff --git a/app/styles/components/basic-table.scss b/app/styles/components/basic-table.scss index 5a8e500a..88fc0c17 100644 --- a/app/styles/components/basic-table.scss +++ b/app/styles/components/basic-table.scss @@ -14,7 +14,7 @@ flex-direction: row; flex-wrap: nowrap; justify-content: flex-start; - padding: .5rem 0 .5rem 0; + padding: .5rem 0; text-align: left; width: 100%; @for $i from 1 through 8 { diff --git a/app/styles/dependencies/elements.scss b/app/styles/dependencies/elements.scss index addf58dd..1524ba2b 100644 --- a/app/styles/dependencies/elements.scss +++ b/app/styles/dependencies/elements.scss @@ -41,3 +41,9 @@ ol { list-style: decimal; } .draggable { cursor: move; } + +// Background +%triangled-bg { + background: url('/images/bg.png') no-repeat center center; + background-size: cover; +} diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss index fed7705e..ffaeba10 100644 --- a/app/styles/layout/login.scss +++ b/app/styles/layout/login.scss @@ -1,7 +1,8 @@ + + .login-main { @include table-flex(center, center, flex, row, wrap, center); - background: url('/images/bg.png') no-repeat center center; - background-size: cover; + @extend %triangled-bg; bottom: 0; left: 0; position: fixed; diff --git a/app/styles/layout/wiki-edit.scss b/app/styles/layout/wiki-edit.scss index 7fe0b393..f1ee14a4 100644 --- a/app/styles/layout/wiki-edit.scss +++ b/app/styles/layout/wiki-edit.scss @@ -1,7 +1,7 @@ .wysiwyg { margin-bottom: 2rem; textarea { - background: white; + background: $white; max-height: none; } } diff --git a/app/styles/layout/wiki.scss b/app/styles/layout/wiki.scss index 50930528..1e3829ca 100644 --- a/app/styles/layout/wiki.scss +++ b/app/styles/layout/wiki.scss @@ -3,10 +3,12 @@ } .action-buttons { position: absolute; - top: 2rem; right: 2rem; - .delete-wiki, .edit-wiki, .save-wiki { - float:right; + top: 2rem; + .delete-wiki, + .edit-wiki, + .save-wiki { + float: right; margin-left: 10px; } } diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index d1f47356..dbdc7046 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -39,17 +39,15 @@ } .icon-arrow-up { @include transform(rotate(180deg)); + @include transition (all .2s linear); vertical-align: baseline; - &:hover, &.active { @include transform(rotate(0)); - @include transition (all .2s ease-in); + @include transition (all .2s linear); } - &.active { - &:hover { - @include transition (all .2s ease-in); - @include transform(rotate(180deg)); - } + &:hover { + @include transition(color .2s linear); + color: $fresh-taiga; } } .icon-edit { @@ -176,16 +174,15 @@ .sprint-name { .icon-arrow-up { @include transform(rotate(180deg)); - &:hover, + @include transition (all .2s linear); + vertical-align: baseline; &.active { @include transform(rotate(0)); - @include transition (all .2s ease-in); + @include transition (all .2s linear); } - &.active { - &:hover { - @include transform(rotate(180deg)); - @include transition (all .2s ease-in); - } + &:hover { + @include transition(color .2s linear); + color: $fresh-taiga; } } } @@ -199,16 +196,15 @@ .sprint-name { .icon-arrow-up { @include transform(rotate(180deg)); - &:hover, + @include transition (all .2s linear); + vertical-align: baseline; &.active { @include transform(rotate(0)); - @include transition (all .2s ease-in); + @include transition (all .2s linear); } - &.active { - &:hover { - @include transform(rotate(180deg)); - @include transition (all .2s ease-in); - } + &:hover { + @include transition(color .2s linear); + color: $fresh-taiga; } } } diff --git a/app/styles/modules/create-project.scss b/app/styles/modules/create-project.scss index 58e1fc6f..5db19759 100644 --- a/app/styles/modules/create-project.scss +++ b/app/styles/modules/create-project.scss @@ -1,7 +1,6 @@ .create-project { @include table-flex(center, center, flex, row, wrap, center); - background: url('/images/bg.png') no-repeat center center; - background-size: cover; + @extend %triangled-bg; bottom: 0; left: 0; position: fixed; @@ -15,8 +14,8 @@ @include table-flex-child(0, 400px, 0, 400px); } h1 { - text-align: center; color: $white; + text-align: center; } .logo, .tagline { @@ -82,4 +81,4 @@ color: $white; } } -} \ No newline at end of file +}