From b94433c68938fc42974d31afd5197175dde5af67 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine <baptiste.lemoine@ext.ercom.fr> Date: Thu, 21 Feb 2019 16:20:03 +0100 Subject: [PATCH] [DEV] :art: form user style --- app/Resources/views/default/header.html.twig | 2 +- assets/css/pages/demo.scss | 22 ++++++++++++- assets/css/pages/global.scss | 33 +++++++++++++++++--- assets/css/split/custom_vars.scss | 3 +- 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/app/Resources/views/default/header.html.twig b/app/Resources/views/default/header.html.twig index 14b172ba..f70fb3f3 100755 --- a/app/Resources/views/default/header.html.twig +++ b/app/Resources/views/default/header.html.twig @@ -1,5 +1,5 @@ <div class="header-block"> - <div class="nav navbar-inverse padded"> + <div class="nav padded"> <div class="row"> <div class="col-xs-12"> {% include 'default/login-choices.html.twig' %} diff --git a/assets/css/pages/demo.scss b/assets/css/pages/demo.scss index 73aa1eee..d11bc49e 100755 --- a/assets/css/pages/demo.scss +++ b/assets/css/pages/demo.scss @@ -23,7 +23,7 @@ p { } a { - color: #0000F0; + color: $primary; } a:hover { @@ -114,3 +114,23 @@ code { animation: fade-in 1s .2s forwards; } } + +.header-block{ + background: $darkblue; + .btn-default{ + color: $grey; + } + .btn{ + + span{ + position: absolute; + right: 2.5em; + top: 1em; + } + } +} +#menu-dashboard .nav .logo-home.btn-default{ + background: $darkblue; + height: 52px; + font-size: 1em; +} \ No newline at end of file diff --git a/assets/css/pages/global.scss b/assets/css/pages/global.scss index 21f4f363..65e38b64 100755 --- a/assets/css/pages/global.scss +++ b/assets/css/pages/global.scss @@ -7,10 +7,6 @@ body { line-height: 2rem; } -.navbar-inverse { - background-color: rgba(0, 0, 0, 0.25); - border-color: #090909; -} #wrapper { min-height: 100vh; @@ -69,7 +65,7 @@ body { } thead { - background: $dark; + background: $darkblue; color: $light; } @@ -205,4 +201,31 @@ input { .btn-success{ background-color: $deepblue; font-weight: 800; +} +.table > thead > tr > td, +table td{ + padding: 0.5em; + } +.login-fosub{ + .padded{ + padding: 3em; + } + input[type=submit]{ + background: $primary; + color:$light; + display: block; + margin-top: 1em; + padding: 1em; + border: 0; + width: 100%; + &:hover{ + background: $lightblue; + } + } +} + +#fos_user_profile_form{ + div{ + margin: 0.5em auto; + } } \ No newline at end of file diff --git a/assets/css/split/custom_vars.scss b/assets/css/split/custom_vars.scss index 5b308e73..fc2aebf8 100755 --- a/assets/css/split/custom_vars.scss +++ b/assets/css/split/custom_vars.scss @@ -1,10 +1,11 @@ $dark: #222; $light: #dedede; $deepblue: #1b6d85; +$darkblue: mix(#000, $deepblue); $lightblue: lightblue; $grey: #e3e3e3; $logo-color: mix($deepblue, $light); $all-text-color: mix($deepblue, $light); - +$primary: $deepblue; $btn-primary-bg: $deepblue; \ No newline at end of file