diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 382d47882..27619834c 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -1,5 +1,5 @@ @import url(http://fonts.googleapis.com/css?family=Josefin+Sans:200,400,700); -/* +/*! * Bootstrap v3.0.0 * * Copyright 2013 Twitter, Inc @@ -8,7 +8,7 @@ * * Designed and built with all the love in the world by @mdo and @fat. */ -/* normalize.css v2.1.0 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ /* line 22, ../bower_components/sass-bootstrap/lib/_normalize.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { display: block; } @@ -5718,7 +5718,7 @@ th.visible-print, td.visible-print { /* line 523, ../bower_components/sass-bootstrap/lib/_mixins.scss */ th.hidden-print, td.hidden-print { display: none !important; } } -/* +/*! * Font Awesome 3.2.1 * the iconic font designed for Bootstrap * ------------------------------------------------------------------------------ @@ -9132,7 +9132,7 @@ textarea { -webkit-box-shadow: #1ba6e5 0 0 0 inset; box-shadow: #1ba6e5 0 0 0 inset; } } -/* +/*! * Ladda * http://lab.hakim.se/ladda * MIT licensed @@ -9564,7 +9564,7 @@ textarea { /* line 5, admin-theme/_admin-login.sass */ #login-header { - margin: 0; + margin: 0 0 60px 0; color: white; } /* line 9, admin-theme/_admin-login.sass */ @@ -9627,6 +9627,111 @@ textarea { #login-footer a { color: #a0aab5; } +/* line 45, admin-theme/_admin-login.sass */ +.animated { + -webkit-animation-duration: 1s; + -moz-animation-duration: 1s; + -o-animation-duration: 1s; + animation-duration: 1s; + -webkit-animation-fill-mode: both; + -moz-animation-fill-mode: both; + -o-animation-fill-mode: both; + animation-fill-mode: both; } + +@-webkit-keyframes fadeInDown { + /* line 56, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; + -webkit-transform: translateY(-20px); } + + /* line 59, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; + -webkit-transform: translateY(0); } } + +@-moz-keyframes fadeInDown { + /* line 64, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; + -moz-transform: translateY(-20px); } + + /* line 67, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; + -moz-transform: translateY(0); } } + +@-o-keyframes fadeInDown { + /* line 72, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; + -o-transform: translateY(-20px); } + + /* line 75, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; + -o-transform: translateY(0); } } + +@keyframes fadeInDown { + /* line 80, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; + transform: translateY(-20px); } + + /* line 83, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; + transform: translateY(0); } } + +/* line 87, admin-theme/_admin-login.sass */ +.animated.fadeInDown { + -webkit-animation-name: fadeInDown; + -moz-animation-name: fadeInDown; + -o-animation-name: fadeInDown; + animation-name: fadeInDown; } + +@-webkit-keyframes fadeIn { + /* line 95, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; } + + /* line 97, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; } } + +@-moz-keyframes fadeIn { + /* line 101, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; } + + /* line 103, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; } } + +@-o-keyframes fadeIn { + /* line 107, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; } + + /* line 109, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; } } + +@keyframes fadeIn { + /* line 113, admin-theme/_admin-login.sass */ + 0% { + opacity: 0; } + + /* line 115, admin-theme/_admin-login.sass */ + 100% { + opacity: 1; } } + +/* line 118, admin-theme/_admin-login.sass */ +.animated.fadeIn { + -webkit-animation-name: fadeIn; + -moz-animation-name: fadeIn; + -o-animation-name: fadeIn; + animation-name: fadeIn; } + /* line 1, admin-theme/_admin-carrier-wizard.sass */ #carrier_wizard { position: relative; diff --git a/admin-dev/themes/default/css/admin-theme/_admin-login.sass b/admin-dev/themes/default/css/admin-theme/_admin-login.sass index 701333b36..1e97775ac 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-login.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-login.sass @@ -3,7 +3,7 @@ @include background(radial-gradient(color-stops(rgba(104,128,138,.4) 10%,rgba(138,114,76,0) 40%), top left),linear-gradient(top,rgba(57,173,219,.25),rgba(42,60,87,.4)),linear-gradient(left top,#670D10,#092756)) #login-header - margin: 0 + margin: 0 0 60px 0 color: white #login-panel @@ -40,4 +40,83 @@ #login-footer a - color: #A0AAB5 \ No newline at end of file + color: #A0AAB5 + +.animated + -webkit-animation-duration: 1s + -moz-animation-duration: 1s + -o-animation-duration: 1s + animation-duration: 1s + -webkit-animation-fill-mode: both + -moz-animation-fill-mode: both + -o-animation-fill-mode: both + animation-fill-mode: both + +@-webkit-keyframes fadeInDown + 0% + opacity: 0 + -webkit-transform: translateY(-20px) + 100% + opacity: 1 + -webkit-transform: translateY(0) + +@-moz-keyframes fadeInDown + 0% + opacity: 0 + -moz-transform: translateY(-20px) + 100% + opacity: 1 + -moz-transform: translateY(0) + +@-o-keyframes fadeInDown + 0% + opacity: 0 + -o-transform: translateY(-20px) + 100% + opacity: 1 + -o-transform: translateY(0) + +@keyframes fadeInDown + 0% + opacity: 0 + transform: translateY(-20px) + 100% + opacity: 1 + transform: translateY(0) + +.animated.fadeInDown + -webkit-animation-name: fadeInDown + -moz-animation-name: fadeInDown + -o-animation-name: fadeInDown + animation-name: fadeInDown + + +@-webkit-keyframes fadeIn + 0% + opacity: 0 + 100% + opacity: 1 + +@-moz-keyframes fadeIn + 0% + opacity: 0 + 100% + opacity: 1 + +@-o-keyframes fadeIn + 0% + opacity: 0 + 100% + opacity: 1 + +@keyframes fadeIn + 0% + opacity: 0 + 100% + opacity: 1 + +.animated.fadeIn + -webkit-animation-name: fadeIn + -moz-animation-name: fadeIn + -o-animation-name: fadeIn + animation-name: fadeIn \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index a9b3b7fbc..c964cb1b0 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -29,10 +29,10 @@ var label_error = '{l s='error'}';
-
+

- - PRESTASHOP + + PRESTASHOP

{$shop_name}

@@ -57,7 +57,7 @@
{$warningSslMessage}
{/if}
-
+
{if !isset($wrong_folder_name) && !isset($wrong_install_name)} @@ -142,7 +142,6 @@ placeholder="test@example.com" />
-
-