From 86489c9c86ec5b6cf866e3ccb5984e3ae07f6139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 8 Aug 2014 13:14:08 +0200 Subject: [PATCH] Admin functionalities fixes --- app/styles/layout/base.scss | 2 +- .../modules/admin/admin-functionalities.scss | 27 ++++++++++++------- app/styles/modules/common/lightbox.scss | 7 +++-- app/styles/modules/common/nav.scss | 1 + 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 5675786e..1bcd39ac 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -83,7 +83,7 @@ body { } .menu-tertiary { - @include table-flex-child(1, 190px, 0, 190px); + @include table-flex-child(1, 210px, 0, 210px); background-color: $dark-grayish-lime-green; padding: 2em 1em; } diff --git a/app/styles/modules/admin/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss index 5e4c5e2f..995c56cf 100644 --- a/app/styles/modules/admin/admin-functionalities.scss +++ b/app/styles/modules/admin/admin-functionalities.scss @@ -1,44 +1,51 @@ .admin-functionalities { + form { + width: 100%; + } .functionality { @include transition(all .2s linear); - @include table-flex(); + @include table-flex(center, center, flex, column, wrap, center); background-color: $whitish; - margin-bottom: 1rem; + display: inline-block; + margin-bottom: .3rem; opacity: .5; padding: 1rem; position: relative; + vertical-align: top; + width: 33%; &.active { background-color: #e9f0da; opacity: 1; } .icon { - @include table-flex-child(1, 0, 0); - @include transform(translate(1rem, 1rem)); + @include table-flex-child(1, 120px, 0, 100%); + @extend %xxlarge; + margin: 0 auto; + min-height: 60px; + text-align: center; } .desc { - @include table-flex-child(10 , 0, 0); + @include table-flex-child(1 , 0, 0, 100%); } .activate-input { display: none; +label { color: $white; cursor: pointer; + display: block; + text-align: center; } } span { font-weight: bold; } p { - margin-bottom: .5rem; + margin-bottom: 1rem; } select { margin-top: 1rem; } } - .icon { - @extend %xxlarge; - margin-right: 2rem; - } .videoconference-attributes { select { margin-bottom: .5rem; diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index 1e81f98a..6fdef090 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -118,12 +118,15 @@ } &.selected { @include transition(all .2s ease-in); - background: $green-taiga; + background: $fresh-taiga; border: 1px solid $green-taiga; - color: $white; + span { + color: $white; + } } } .blocked { + padding: 8px 30px; &:hover { @include transition(all .2s ease-in); background: $red-light; diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss index 52aeb049..4ddc9af5 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -63,6 +63,7 @@ @extend %small; color: $white; text-align: left; + text-transform: none; &:hover { @include transition (color .2s linear); color: $fresh-taiga;