From 9332fd5b0c1720a38aa5c85564da20c89a0f8a96 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 13 Mar 2013 22:48:13 +0100 Subject: Continuation du design : amélioration nav-list + ajout nav-head (avec gestion de la connexion) + début formulaires MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/base.css | 73 +++++++++++++++++++++++++++++++++++------- public/theme/icons/add.svg | 30 +++++++++++++++++ public/theme/icons/link.svg | 33 +++++++++++++++++++ public/theme/icons/login.svg | 33 +++++++++++++++++++ public/theme/icons/logout.svg | 33 +++++++++++++++++++ public/theme/icons/website.svg | 33 ------------------- 6 files changed, 191 insertions(+), 44 deletions(-) create mode 100644 public/theme/icons/add.svg create mode 100644 public/theme/icons/link.svg create mode 100644 public/theme/icons/login.svg create mode 100644 public/theme/icons/logout.svg delete mode 100644 public/theme/icons/website.svg (limited to 'public/theme') diff --git a/public/theme/base.css b/public/theme/base.css index 6b41c922a..64a5b83a2 100644 --- a/public/theme/base.css +++ b/public/theme/base.css @@ -40,6 +40,28 @@ img { } /* FORMULAIRES */ +label { + display: block; + margin: 5px 0; +} +input { + display: inline-block; + min-height: 25px; + padding: 5px 5px; + background: #fff; + border: 1px solid #bbb; + border-radius: 3px; + color: #aaa; + line-height: 25px; + vertical-align: middle; + box-shadow: 0 2px 2px #eee inset; +} + input:focus { + color: #0062BE; + border-color: #33BBFF; + box-shadow: 0 2px 2px #DDDDFF inset; + } + .btn { display: inline-block; min-height: 25px; @@ -84,46 +106,63 @@ img { } /* NAVIGATION */ -.nav.nav-list li { +.nav.nav-list .nav-header, +.nav.nav-list .item { display: block; height: 35px; line-height: 35px; } - .nav.nav-list li:hover { + .nav.nav-list .item:hover { background: #fafafa; } - .nav.nav-list li:hover a { + .nav.nav-list .item:hover a { color: #003388; } - .nav.nav-list li.active { + .nav.nav-list .item.active { background: #0062BE; color: #fff; } - .nav.nav-list li.active a { + .nav.nav-list .item.active a { color: #fff; } - .nav.nav-list li.disable { + .nav.nav-list .disable { color: #aaa; background: #fafafa; text-align: center; } - .nav.nav-list li > * { + .nav.nav-list .item > * { display: block; padding: 0 10px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .nav.nav-list a:hover { text-decoration: none; } - .nav.nav-list li.nav-header { + .nav.nav-list .nav-header { padding: 0 10px; - color: #666; + color: #888; background: #f4f4f4; border-bottom: 1px solid #ddd; font-weight: bold; text-shadow: 0 0 1px #ddd; } +.nav-head { + display: block; + margin: 0; + background: #fff; + background: linear-gradient(#fff, #f0f0f0); + border-bottom: 1px solid #ddd; + text-align: right; +} + .nav-head .item { + display: inline-block; + padding: 5px 10px; + } + /* ALERTS */ .alert { display: block; @@ -169,6 +208,18 @@ img { .icon.configure { background: url("icons/configure.svg") center center no-repeat; } + .icon.login { + background: url("icons/login.svg") center center no-repeat; + } + .icon.logout { + background: url("icons/logout.svg") center center no-repeat; + } + .icon.add { + background: url("icons/add.svg") center center no-repeat; + } + .icon.link { + background: url("icons/link.svg") center center no-repeat; + } /* STRUCTURE */ .header { @@ -245,7 +296,7 @@ img { text-overflow: ellipsis; } .categories .feeds { - width: 200px; + width: 220px; margin: 0 auto; list-style: none; } @@ -408,7 +459,7 @@ img { display: inline-block; width: 25px; height: 25px; - background: url("icons/website.svg") center center no-repeat; + background: url("icons/link.svg") center center no-repeat; vertical-align: middle; } .flux_header .item.link a:hover { diff --git a/public/theme/icons/add.svg b/public/theme/icons/add.svg new file mode 100644 index 000000000..425c9b4aa --- /dev/null +++ b/public/theme/icons/add.svg @@ -0,0 +1,30 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + diff --git a/public/theme/icons/link.svg b/public/theme/icons/link.svg new file mode 100644 index 000000000..ddc8e0706 --- /dev/null +++ b/public/theme/icons/link.svg @@ -0,0 +1,33 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + diff --git a/public/theme/icons/login.svg b/public/theme/icons/login.svg new file mode 100644 index 000000000..0a8af162f --- /dev/null +++ b/public/theme/icons/login.svg @@ -0,0 +1,33 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + diff --git a/public/theme/icons/logout.svg b/public/theme/icons/logout.svg new file mode 100644 index 000000000..284a67578 --- /dev/null +++ b/public/theme/icons/logout.svg @@ -0,0 +1,33 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + diff --git a/public/theme/icons/website.svg b/public/theme/icons/website.svg deleted file mode 100644 index ddc8e0706..000000000 --- a/public/theme/icons/website.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - -- cgit v1.2.3