From 90e8e949097699f520a13fa1aafc44d9ccd5a02e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 11 Dec 2012 18:54:43 +0100 Subject: [PATCH 1/2] =?UTF-8?q?icons=20for=20username=20and=20password=20f?= =?UTF-8?q?ield,=20not=20sure=20if=20it=E2=80=99s=20good?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/css/styles.css | 13 +- core/img/actions/password.png | Bin 0 -> 197 bytes core/img/actions/password.svg | 2174 +++++++++++++++++++++++++++++++ core/img/actions/user.png | Bin 0 -> 374 bytes core/img/actions/user.svg | 1698 ++++++++++++++++++++++++ core/templates/installation.php | 4 +- core/templates/login.php | 4 +- 7 files changed, 3886 insertions(+), 7 deletions(-) create mode 100644 core/img/actions/password.png create mode 100644 core/img/actions/password.svg create mode 100644 core/img/actions/user.png create mode 100644 core/img/actions/user.svg diff --git a/core/css/styles.css b/core/css/styles.css index d5b0a348ee1..01ae5f1f066 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -119,6 +119,13 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #login #datadirContent label { display:block; margin:0; color:#999; } #login form #datadirField legend { margin-bottom:15px; } + +/* Icons for username and password fields to better recognize them */ +#adminlogin, #adminpass, #user, #password { padding-left:1.6em; background-repeat:no-repeat; background-position:.4em .75em; } +#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2em; } +#adminlogin, #user { background-image:url('../img/actions/user.svg'); } +#adminpass, #password { background-image:url('../img/actions/password.svg'); } + /* Nicely grouping input field sets */ .grouptop input { margin-bottom:0; @@ -135,11 +142,11 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset; } -#login form label { margin:.95em 0 0 .85em; color:#666; } -#login .groupmiddle label, #login .groupbottom label { margin-top:13px; } +#login form label { color:#666; } +#login .groupmiddle label, #login .groupbottom label { top:.65em; } /* NEEDED FOR INFIELD LABELS */ p.infield { position:relative; } -label.infield { cursor:text !important; } +label.infield { cursor:text !important; top:1.05em; left:.85em; } #login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; } #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } diff --git a/core/img/actions/password.png b/core/img/actions/password.png new file mode 100644 index 0000000000000000000000000000000000000000..5167161dfa9906bb6e822dd849bc94328800feee GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4 + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/actions/user.png b/core/img/actions/user.png new file mode 100644 index 0000000000000000000000000000000000000000..2221ac679d1c2c4d94df18ed7e4aef73cffe276a GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4y)~0TzkVUVH=ivj8(LUt+un5dtb{8-=rJi29h=j7t;*00(hDn zuRP%T9{22&C_fL+|DVrh7pFb@VsyDaXF8+gh{(yx{;!~P&EOaZH|u+GncsTPMN^i|JjwC?#~Xup8|Tg3Ds+tN z{T(6g&CJ0$XvGni1?DlK8CEGuN;Bi OXYh3Ob6Mw<&;$Vf`ICJB literal 0 HcmV?d00001 diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg new file mode 100644 index 00000000000..f5ac9088c67 --- /dev/null +++ b/core/img/actions/user.svg @@ -0,0 +1,1698 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/templates/installation.php b/core/templates/installation.php index f7a8a028c4f..6e36cd3dc26 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -35,12 +35,12 @@
t( 'Create an admin account' ); ?>

- +

- +

diff --git a/core/templates/login.php b/core/templates/login.php index 5e4e2eb07e6..53e2e9da2ca 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -17,12 +17,12 @@

- autocomplete="on" required /> +

- /> +

From 9d8bdff51b25544bacda1ec13e3e41871547b091 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 12 Dec 2012 22:40:08 +0100 Subject: [PATCH 2/2] =?UTF-8?q?tweak=20icons=20for=20username=20and=20pass?= =?UTF-8?q?word=20fields,=20now=20it=E2=80=99s=20good?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/css/styles.css | 12 ++++++++---- core/img/actions/password.svg | 34 ++++----------------------------- core/img/actions/user.svg | 8 ++++---- core/templates/installation.php | 2 ++ core/templates/login.php | 2 ++ 5 files changed, 20 insertions(+), 38 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 01ae5f1f066..c85fa74df89 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -121,10 +121,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b /* Icons for username and password fields to better recognize them */ -#adminlogin, #adminpass, #user, #password { padding-left:1.6em; background-repeat:no-repeat; background-position:.4em .75em; } -#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2em; } -#adminlogin, #user { background-image:url('../img/actions/user.svg'); } -#adminpass, #password { background-image:url('../img/actions/password.svg'); } +#adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; } +#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2.2em; } +#adminlogin+label+img, #adminpass+label+img, #user+label+img, #password+label+img { + position:absolute; left:1.25em; top:1.65em; + opacity:.3; +} +#adminpass+label+img, #password+label+img { top:1.1em; } + /* Nicely grouping input field sets */ .grouptop input { diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg index 4369a8cfa53..ee6a9fe0182 100644 --- a/core/img/actions/password.svg +++ b/core/img/actions/password.svg @@ -27,7 +27,7 @@ image/svg+xml - + @@ -2141,34 +2141,8 @@ - - + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;opacity:1" + d="M 3 6 C 1.8954305 6 1 6.8954305 1 8 C 1 9.1045695 1.8954305 10 3 10 C 4.1045695 10 5 9.1045695 5 8 C 5 6.8954305 4.1045695 6 3 6 z M 8 6 C 6.8954305 6 6 6.8954305 6 8 C 6 9.1045695 6.8954305 10 8 10 C 9.1045695 10 10 9.1045695 10 8 C 10 6.8954305 9.1045695 6 8 6 z M 13 6 C 11.895431 6 11 6.8954305 11 8 C 11 9.1045695 11.895431 10 13 10 C 14.104569 10 15 9.1045695 15 8 C 15 6.8954305 14.104569 6 13 6 z " + id="path3750" /> diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg index f5ac9088c67..6d0dc714ce4 100644 --- a/core/img/actions/user.svg +++ b/core/img/actions/user.svg @@ -27,7 +27,7 @@ image/svg+xml - + @@ -47,8 +47,8 @@ showguides="true" inkscape:guide-bbox="true" inkscape:zoom="16" - inkscape:cx="7.0131695" - inkscape:cy="5.1911759" + inkscape:cx="6.2464037" + inkscape:cy="5.7411894" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -1690,7 +1690,7 @@ id="g4146"> diff --git a/core/templates/installation.php b/core/templates/installation.php index 6e36cd3dc26..28fbf29b540 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -37,10 +37,12 @@

+

+

diff --git a/core/templates/login.php b/core/templates/login.php index 53e2e9da2ca..153d1b50a30 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -19,10 +19,12 @@

autocomplete="on" required /> +

/> +