From a8f763fb85756f69899f7b3b71c01bb01461ee3c Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 10 Aug 2012 22:12:10 +0200 Subject: beginning new pyload web-ui from scratch --- module/web/static/css/default/style.css | 161 ++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 module/web/static/css/default/style.css (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css new file mode 100644 index 000000000..166b8c452 --- /dev/null +++ b/module/web/static/css/default/style.css @@ -0,0 +1,161 @@ + +/* + General + */ + +body { + margin: 0; + padding: 0; + font-family: 'Abel', sans-serif; + font-size: 16px; + color: #757575; + background: url("../../img/default/fancy_deboss.png") repeat scroll 0 0 transparent; +} + +h1, h2, h3 { + margin: 0; + padding: 0; + font-weight: normal; + color: #221D1D; +} + +h1 { + font-size: 2em; +} + +h2 { + font-size: 2.4em; +} + +h3 { + font-size: 1.6em; +} + +p, ul, ol { + margin-top: 0; + line-height: 180%; +} + +ul, ol { +} + +a { + text-decoration: none; + color: #FF7637; +} + +a:hover { +} + +#wrapper { + width: 960px; + margin: 70px auto 0; + padding: 0; +} + +/* + Header +*/ + +header { + background: url("../../img/default/main-wrapper-bg.png") repeat-x; + height: 70px; + position: fixed; + top: 0; + vertical-align: top; + width: 100%; + z-index: 10; +} + +header:before { + position: absolute; + content: ' '; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: transparent; + box-shadow: 0 0 5px black; + z-index: -1; +} + +header div.center { + padding-left: 20px; + padding-right: 20px; +} +header div.center span.title { + color: white; + float: left; + font-family: SansationRegular, sans-serif; + font-size: 40px; + margin-top: 12px; +} +header img.logo { + float: left; + padding-right: 10px; + padding-top: 7px; + width: 120px; +} + +/* + Footer +*/ + +footer { + background: url("../../img/default/main-wrapper-bg.png") repeat-x; + height: 100px; + position: relative; + width: 100%; + z-index: 10; +} + +footer img.logo { + float: left; + padding-top: 12px; + padding-right: 12px; +} + +footer div.center { + padding-top: 10px; + width: 900px; + margin-left: auto; + margin-right: auto; +} + +footer:before { + position: absolute; + content: ' '; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: transparent; + box-shadow: 0 0 5px black; + z-index: -1; +} + +footer .block { + font-size: 12px; + float: left; + margin: 0; + width: 150px; + padding-top: 6px; + padding-right: 30px; +} + +footer .copyright { + text-align: center; + width: auto; + padding-top: 22px; +} + +footer h2 { + background: url("../../img/default/double-line.gif") repeat-x scroll center bottom transparent !important; + color: #FFFFFF; + font-family: SansationLight, sans-serif; + font-size: 16px; + font-weight: normal; + line-height: 16px; + margin: 0; + padding-bottom: 6px; +} \ No newline at end of file -- cgit v1.2.3 From 4b6e77ad9172b29839b76e29614bf4c0ba81c90d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 11 Aug 2012 11:36:08 +0200 Subject: show footer at bottom --- module/web/static/css/default/style.css | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 166b8c452..bf5e3e7d9 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -3,6 +3,14 @@ General */ +* { + margin: 0; +} + +html, body { + height: 100%; +} + body { margin: 0; padding: 0; @@ -47,16 +55,24 @@ a { a:hover { } -#wrapper { - width: 960px; - margin: 70px auto 0; - padding: 0; +#wrap { + min-height: 100%; +} + +#content { + margin-left: 150px; + margin-right: 150px; + padding-bottom: 100px; /* Height of footer */ } /* Header */ +#push { + height: 70px; /* Pushes content down with height of header */ +} + header { background: url("../../img/default/main-wrapper-bg.png") repeat-x; height: 70px; @@ -101,9 +117,11 @@ header img.logo { Footer */ + footer { background: url("../../img/default/main-wrapper-bg.png") repeat-x; height: 100px; + margin-top: -100px; position: relative; width: 100%; z-index: 10; -- cgit v1.2.3 From 94d4d384db7fc06e1dcba42bec9d09cbd51f33cb Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 11 Aug 2012 15:52:15 +0200 Subject: added speedgraph --- module/web/static/css/default/style.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index bf5e3e7d9..9b2d1768c 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -104,6 +104,7 @@ header div.center span.title { float: left; font-family: SansationRegular, sans-serif; font-size: 40px; + cursor: default; margin-top: 12px; } header img.logo { @@ -113,11 +114,16 @@ header img.logo { width: 120px; } +#speedgraph { + float: right; + height: 45px; + width: 300px; + margin-top: 12px; +} + /* Footer */ - - footer { background: url("../../img/default/main-wrapper-bg.png") repeat-x; height: 100px; -- cgit v1.2.3 From 9e06719452ea67e9dfb431d68a7c7a827bedbaa2 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 11 Aug 2012 19:07:24 +0200 Subject: fixed layout --- module/web/static/css/default/style.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 9b2d1768c..2757501e2 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -114,11 +114,18 @@ header img.logo { width: 120px; } +.header_block { + float: right; + margin-top: 12px; + margin-right: 12px; +} + #speedgraph { float: right; height: 45px; width: 300px; margin-top: 12px; + font-family: sans-serif } /* -- cgit v1.2.3 From 6dedb2f83c6f322b47addcab76a401818fcb08a2 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 12 Aug 2012 13:08:35 +0200 Subject: added little icons + backbone.js --- module/web/static/css/default/style.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 2757501e2..1ff1d4c72 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -116,8 +116,17 @@ header img.logo { .header_block { float: right; - margin-top: 12px; - margin-right: 12px; + margin: 12px 12px 0; + font-family: SansationRegular, sans-serif; + color: #ffffff; +} +.icon_info { + padding-bottom: 5px; +} + +.icon_info img { + margin-bottom: -4px; + padding-right: 5px; } #speedgraph { -- cgit v1.2.3 From 132a5ff97efcf7645d60900633e95b6ce9dde1c4 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 12 Aug 2012 13:38:38 +0200 Subject: added center to header + various resizing --- module/web/static/css/default/style.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 1ff1d4c72..232733b95 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -96,6 +96,7 @@ header:before { } header div.center { + position: relative; padding-left: 20px; padding-right: 20px; } @@ -129,10 +130,20 @@ header img.logo { padding-right: 5px; } +#notification_div { + position: absolute; + left: 50%; + width: 30%; + margin-left: -15%; + height: 45px; + border: 1px solid #ffffff; + margin-top: 12px; +} + #speedgraph { float: right; height: 45px; - width: 300px; + width: 15%; margin-top: 12px; font-family: sans-serif } -- cgit v1.2.3 From 079c44c5e938edb321e007da509523b145ce1029 Mon Sep 17 00:00:00 2001 From: godofdream Date: Sun, 12 Aug 2012 13:40:12 +0200 Subject: added speed & downloads label and some icons --- module/web/static/css/default/style.css | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 2757501e2..3fb1a5406 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -189,4 +189,45 @@ footer h2 { line-height: 16px; margin: 0; padding-bottom: 6px; +} + +.header_block input { + width: 26px; + height: 26px; +} +#speedmeter, #downloads{ + height: 26px; + margin: 0 2px 4px 2px; +} +.header-icon, #check_reconnecting, #check_downloading { + padding: 0; + margin: 0 3px 0 0; + float: left; + width: 26px; + height: 26px; +} +.header_text { + vertical-align:middle; + color: #FFFFFF; +} +#downloads_icon { + background: url("../../img/default/queue-icon-white.png"); +} +#speedmeter_icon{ + background: url("../../img/default/speed-icon-white.png"); +} + + +.pyload-icon-reconnecting-activated { + background: url("../../img/default/reconnecting-icon-green.png"); +} +.pyload-icon-reconnecting-deactivated { + background: url("../../img/default/reconnecting-icon-red.png"); +} + +.pyload-icon-downloading-activated { + background: url("../../img/default/downloading-icon-green.png"); +} +.pyload-icon-downloading-deactivated { + background: url("../../img/default/downloading-icon-red.png"); } \ No newline at end of file -- cgit v1.2.3 From 393bc84c584018cbbc634fb36e6ee42fe1a4acbb Mon Sep 17 00:00:00 2001 From: godofdream Date: Sun, 12 Aug 2012 16:16:22 +0200 Subject: changed colors of 2 icons added settings and logoutbutton --- module/web/static/css/default/style.css | 92 +++++++++++++++------------------ 1 file changed, 43 insertions(+), 49 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 0e7c5d98d..862b2d2c7 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -117,18 +117,10 @@ header img.logo { .header_block { float: right; - margin: 12px 12px 0; + margin: 8px 8px 0; font-family: SansationRegular, sans-serif; color: #ffffff; } -.icon_info { - padding-bottom: 5px; -} - -.icon_info img { - margin-bottom: -4px; - padding-right: 5px; -} #notification_div { position: absolute; @@ -148,6 +140,48 @@ header img.logo { font-family: sans-serif } +#speedmeter, #downloads{ + height: 26px; + margin: 0 2px 4px 2px; +} +.header-icon, #check_reconnecting, #check_downloading{ + padding: 0; + margin: 0 4px 3px 0; + float: left; + width: 26px; + height: 26px; +} +.header_text { + vertical-align: middle; +} +#downloads_icon { + background: url("../../img/default/queue-icon-white.png"); +} +#speedmeter_icon { + background: url("../../img/default/speed-icon-white.png"); +} +#button_settings { + background: url("../../img/default/gear-icon-white.png"); +} +#button_user { + background: url("../../img/default/user-icon-white.png"); +} + +.pyload-icon-reconnecting-activated { + background: url("../../img/default/reconnecting-icon-green.png"); +} +.pyload-icon-reconnecting-deactivated { + background: url("../../img/default/reconnecting-icon-red.png"); +} + +.pyload-icon-downloading-activated { + background: url("../../img/default/downloading-icon-green.png"); +} +.pyload-icon-downloading-deactivated { + background: url("../../img/default/downloading-icon-red.png"); +} + + /* Footer */ @@ -211,43 +245,3 @@ footer h2 { padding-bottom: 6px; } -.header_block input { - width: 26px; - height: 26px; -} -#speedmeter, #downloads{ - height: 26px; - margin: 0 2px 4px 2px; -} -.header-icon, #check_reconnecting, #check_downloading { - padding: 0; - margin: 0 3px 0 0; - float: left; - width: 26px; - height: 26px; -} -.header_text { - vertical-align:middle; - color: #FFFFFF; -} -#downloads_icon { - background: url("../../img/default/queue-icon-white.png"); -} -#speedmeter_icon{ - background: url("../../img/default/speed-icon-white.png"); -} - - -.pyload-icon-reconnecting-activated { - background: url("../../img/default/reconnecting-icon-green.png"); -} -.pyload-icon-reconnecting-deactivated { - background: url("../../img/default/reconnecting-icon-red.png"); -} - -.pyload-icon-downloading-activated { - background: url("../../img/default/downloading-icon-green.png"); -} -.pyload-icon-downloading-deactivated { - background: url("../../img/default/downloading-icon-red.png"); -} \ No newline at end of file -- cgit v1.2.3 From c8c3af67484d3e18aab9cf47c5f9c66518726eed Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 12 Aug 2012 16:45:52 +0200 Subject: revert to last revision --- module/web/static/css/default/style.css | 55 ++++++--------------------------- 1 file changed, 10 insertions(+), 45 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 862b2d2c7..232733b95 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -117,10 +117,18 @@ header img.logo { .header_block { float: right; - margin: 8px 8px 0; + margin: 12px 12px 0; font-family: SansationRegular, sans-serif; color: #ffffff; } +.icon_info { + padding-bottom: 5px; +} + +.icon_info img { + margin-bottom: -4px; + padding-right: 5px; +} #notification_div { position: absolute; @@ -140,48 +148,6 @@ header img.logo { font-family: sans-serif } -#speedmeter, #downloads{ - height: 26px; - margin: 0 2px 4px 2px; -} -.header-icon, #check_reconnecting, #check_downloading{ - padding: 0; - margin: 0 4px 3px 0; - float: left; - width: 26px; - height: 26px; -} -.header_text { - vertical-align: middle; -} -#downloads_icon { - background: url("../../img/default/queue-icon-white.png"); -} -#speedmeter_icon { - background: url("../../img/default/speed-icon-white.png"); -} -#button_settings { - background: url("../../img/default/gear-icon-white.png"); -} -#button_user { - background: url("../../img/default/user-icon-white.png"); -} - -.pyload-icon-reconnecting-activated { - background: url("../../img/default/reconnecting-icon-green.png"); -} -.pyload-icon-reconnecting-deactivated { - background: url("../../img/default/reconnecting-icon-red.png"); -} - -.pyload-icon-downloading-activated { - background: url("../../img/default/downloading-icon-green.png"); -} -.pyload-icon-downloading-deactivated { - background: url("../../img/default/downloading-icon-red.png"); -} - - /* Footer */ @@ -243,5 +209,4 @@ footer h2 { line-height: 16px; margin: 0; padding-bottom: 6px; -} - +} \ No newline at end of file -- cgit v1.2.3 From 7b79b3503b4aa43258c3dcec9bf528b1fef19b54 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 12 Aug 2012 18:37:17 +0200 Subject: size adjustments --- module/web/static/css/default/style.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 232733b95..26da48221 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -18,6 +18,7 @@ body { font-size: 16px; color: #757575; background: url("../../img/default/fancy_deboss.png") repeat scroll 0 0 transparent; + min-width: 1000px; } h1, h2, h3 { @@ -81,6 +82,7 @@ header { vertical-align: top; width: 100%; z-index: 10; + min-width: 1000px; } header:before { @@ -133,8 +135,8 @@ header img.logo { #notification_div { position: absolute; left: 50%; - width: 30%; - margin-left: -15%; + width: 28%; + margin-left: -14%; height: 45px; border: 1px solid #ffffff; margin-top: 12px; @@ -143,7 +145,7 @@ header img.logo { #speedgraph { float: right; height: 45px; - width: 15%; + width: 14%; margin-top: 12px; font-family: sans-serif } -- cgit v1.2.3 From 9c6460162b54b01a0c0a6432f8e038bf194fef52 Mon Sep 17 00:00:00 2001 From: godofdream Date: Sun, 12 Aug 2012 19:04:02 +0200 Subject: added login --- module/web/static/css/default/style.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 232733b95..efea80bc5 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -108,11 +108,13 @@ header div.center span.title { cursor: default; margin-top: 12px; } -header img.logo { +header .logo { float: left; - padding-right: 10px; - padding-top: 7px; - width: 120px; + margin-right: 10px; + margin-top: 8px; + width: 120px; + height: 120px; + background: url("../../img/default/logo.png")no-repeat; } .header_block { -- cgit v1.2.3 From d52fb0f7b6d0700ed43f715cf9abf3ae6e1b223c Mon Sep 17 00:00:00 2001 From: godofdream Date: Sun, 12 Aug 2012 19:52:01 +0200 Subject: added login.html --- module/web/static/css/default/style.css | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index efea80bc5..2f1073932 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -149,6 +149,27 @@ header .logo { margin-top: 12px; font-family: sans-serif } + +/* + Login +*/ +.login { + vertical-align: middle; + text-align: center; + border: 1px; + border-color:#000000; + border-width:2px; + border-style:solid; + padding: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} + +.login div{ + vertical-align: middle; + text-align: center; + padding: 3px; +} /* Footer -- cgit v1.2.3 From 941e3021000e59020f66419cc2156aee30972121 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 13 Aug 2012 17:40:10 +0200 Subject: working login --- module/web/static/css/default/style.css | 35 +++++++++++++++------------------ 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 326111680..63a7ad959 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -151,27 +151,24 @@ header .logo { margin-top: 12px; font-family: sans-serif } - + /* Login -*/ -.login { - vertical-align: middle; - text-align: center; - border: 1px; - border-color:#000000; - border-width:2px; - border-style:solid; - padding: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.login div{ - vertical-align: middle; - text-align: center; - padding: 3px; -} +*/ +.login { + vertical-align: middle; + text-align: center; + border: 2px solid #000000; + padding: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} + +.login div{ + vertical-align: middle; + text-align: center; + padding: 3px; +} /* Footer -- cgit v1.2.3 From 32926fcd860077e098810628b1f494f3a4737b3a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 13 Aug 2012 17:56:33 +0200 Subject: changed header link color --- module/web/static/css/default/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 63a7ad959..19d0c87d3 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -83,6 +83,11 @@ header { width: 100%; z-index: 10; min-width: 1000px; + color: #ffffff; +} + +header a { + color: #ffffff; } header:before { @@ -123,7 +128,6 @@ header .logo { float: right; margin: 12px 12px 0; font-family: SansationRegular, sans-serif; - color: #ffffff; } .icon_info { padding-bottom: 5px; -- cgit v1.2.3 From 247027662fd37fd8de537c8b9ac346637d6aa6ab Mon Sep 17 00:00:00 2001 From: godofdream Date: Tue, 14 Aug 2012 12:59:48 +0200 Subject: Layout fix for login --- module/web/static/css/default/style.css | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 19d0c87d3..455947581 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -164,16 +164,26 @@ header .logo { text-align: center; border: 2px solid #000000; padding: 15px; + font-size: 17px; -moz-border-radius: 15px; border-radius: 15px; } -.login div{ - vertical-align: middle; - text-align: center; +.login input, .login div{ padding: 3px; } - +.login_submit input { + padding: 5px 15px; +} +.login_user , .login_password { + text-align: right; + width: 320px; + margin-left: auto; + margin-right: auto; +} +.login_user span, .login_password span{ + margin-right: 5px; +} /* Footer */ -- cgit v1.2.3 From 01bd93484ec14cfc3f96d54376392e5bd3222f1f Mon Sep 17 00:00:00 2001 From: godofdream Date: Tue, 14 Aug 2012 14:06:26 +0200 Subject: Layout changes img to div --- module/web/static/css/default/style.css | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 455947581..0385af496 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -129,15 +129,40 @@ header .logo { margin: 12px 12px 0; font-family: SansationRegular, sans-serif; } -.icon_info { +.header_icon { padding-bottom: 5px; + padding-left: 24px; + height: 20px; } -.icon_info img { +.header_icon img { margin-bottom: -4px; padding-right: 5px; } +.header_block { + float: right; + margin: 12px 12px 0; + font-family: SansationRegular, sans-serif; +} +.header_text { + vertical-align: middle; +} +#header_div_logout { + text-align: center; + padding-left: 2px; +} +#header_div_user { + background: url("../../img/default/icon_user_small_white.png")no-repeat; +} +#header_div_speed { + background: url("../../img/default/icon_speed_small_white.png")no-repeat; +} +#header_div_downloads{ + background: url("../../img/default/icon_clock_small_white.png")no-repeat; +} + + #notification_div { position: absolute; left: 50%; @@ -172,6 +197,7 @@ header .logo { .login input, .login div{ padding: 3px; } + .login_submit input { padding: 5px 15px; } @@ -184,6 +210,9 @@ header .logo { .login_user span, .login_password span{ margin-right: 5px; } +.login_user input, .login_password input{ + width: 150px; +} /* Footer */ -- cgit v1.2.3 From 5dbd524958cde9764717588ce8dbf4ecd5a22b9a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 14 Aug 2012 14:50:04 +0200 Subject: fixed layout, new progressbar --- module/web/static/css/default/style.css | 57 +++++++++++++++------------------ 1 file changed, 26 insertions(+), 31 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 0385af496..f882e4a43 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -130,47 +130,34 @@ header .logo { font-family: SansationRegular, sans-serif; } .header_icon { + padding-top: 2px; padding-bottom: 5px; - padding-left: 24px; + padding-left: 25px; height: 20px; } -.header_icon img { - margin-bottom: -4px; - padding-right: 5px; -} - -.header_block { - float: right; - margin: 12px 12px 0; - font-family: SansationRegular, sans-serif; -} .header_text { - vertical-align: middle; -} -#header_div_logout { - text-align: center; - padding-left: 2px; -} -#header_div_user { - background: url("../../img/default/icon_user_small_white.png")no-repeat; -} -#header_div_speed { - background: url("../../img/default/icon_speed_small_white.png")no-repeat; -} -#header_div_downloads{ - background: url("../../img/default/icon_clock_small_white.png")no-repeat; + text-align: center; } +.icon_info img { + margin-bottom: -4px; + padding-right: 5px; +} #notification_div { position: absolute; left: 50%; width: 28%; - margin-left: -14%; height: 45px; - border: 1px solid #ffffff; + margin-left: -14%; margin-top: 12px; + text-align: center; +} + +#globalprogress { + height: 8px; + margin: 8px 5px; } #speedgraph { @@ -181,6 +168,18 @@ header .logo { font-family: sans-serif } +#header_user { + background: url("../../img/default/icon_user_small_white.png")no-repeat; +} + +#header_speed { + background: url("../../img/default/icon_speed_small_white.png")no-repeat; +} + +#header_qeuue { + background: url("../../img/default/icon_clock_small_white.png")no-repeat; +} + /* Login */ @@ -197,7 +196,6 @@ header .logo { .login input, .login div{ padding: 3px; } - .login_submit input { padding: 5px 15px; } @@ -210,9 +208,6 @@ header .logo { .login_user span, .login_password span{ margin-right: 5px; } -.login_user input, .login_password input{ - width: 150px; -} /* Footer */ -- cgit v1.2.3 From 332caf0bbaf582ce484eeedd586335fad000434c Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 14 Aug 2012 22:34:45 +0200 Subject: added dialog window --- module/web/static/css/default/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index f882e4a43..87cd60831 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -157,7 +157,11 @@ header .logo { #globalprogress { height: 8px; - margin: 8px 5px; + margin: 8px 5px 0; +} + +#globalprogress .ui-widget-header { + background: #fee247; } #speedgraph { -- cgit v1.2.3 From 90ba0c9f3adccd02b62ec3ca6b4af849a7253d14 Mon Sep 17 00:00:00 2001 From: godofdream Date: Tue, 14 Aug 2012 22:37:58 +0200 Subject: first Design of Queue and Settings --- module/web/static/css/default/queue.css | 82 +++++++++++++++++++++++++++++++++ module/web/static/css/default/style.css | 3 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 module/web/static/css/default/queue.css (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/queue.css b/module/web/static/css/default/queue.css new file mode 100644 index 000000000..645beadae --- /dev/null +++ b/module/web/static/css/default/queue.css @@ -0,0 +1,82 @@ + +#queue-list { + list-style: none; + padding-left: 0; +} + +#page-actions{ + list-style: none; +} + +.pack{ + border: 2px solid #000000; + padding: 0; + -moz-border-radius: 10px; + border-radius: 10px; +} + +.pack_header{ + background: url("../../img/default/main-wrapper-bg.png") repeat-x; + cursor: pointer; + border: 2px solid #000000; + margin: 0px; + height: 23px; + -moz-border-radius-topleft: 10px; + -moz-border-radius-topright: 10px; + -webkit-border-top-left-radius: 10px; + -webkit-border-top-right-radius: 10px; + border-top-left-radius: 10px; + border-top-right-radius: 10px; +} + +.pack_icon{ + cursor: move; + height: 20px; + float: left; + margin-left: 5px; + padding-left: 25px; + background: url("../../img/default/icon_folder.png")no-repeat; +} + +.pack_name{ + vertical-align: middle; + color: #D5D5D5; +} + +.pack_progressbar{ + height: 8px; + margin: 8px 5px; +} + +.pack_toolbar{ + height: 24px; + float: left; + padding-left: 22px; +} + +.pack_toolbar div{ + height: 20px; + float: left; + padding-left: 22px; +} + +.pack_toolbar_delete { + background: url("../../img/default/delete.png")no-repeat; +} + +.pack_toolbar_restart { + background: url("../../img/default/arrow_refresh.png")no-repeat; +} + +.pack_toolbar_edit{ + background: url("../../img/default/pencil.png")no-repeat; +} + +.pack_children{ + display: none; +} + +.sort_children{ + list-style: none; + padding-left: 0; +} \ No newline at end of file diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index f882e4a43..90701b121 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -189,8 +189,9 @@ header .logo { border: 2px solid #000000; padding: 15px; font-size: 17px; - -moz-border-radius: 15px; border-radius: 15px; + -moz-border-radius: 15px; + -webkit-border-radius: 15px; } .login input, .login div{ -- cgit v1.2.3 From 315192a0ab42b80ec2b83d8450dc91ef7c3ad68e Mon Sep 17 00:00:00 2001 From: godofdream Date: Tue, 14 Aug 2012 23:18:20 +0200 Subject: improved QueueLayout --- module/web/static/css/default/queue.css | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/queue.css b/module/web/static/css/default/queue.css index 645beadae..23af09403 100644 --- a/module/web/static/css/default/queue.css +++ b/module/web/static/css/default/queue.css @@ -20,7 +20,7 @@ cursor: pointer; border: 2px solid #000000; margin: 0px; - height: 23px; + height: 25px; -moz-border-radius-topleft: 10px; -moz-border-radius-topright: 10px; -webkit-border-top-left-radius: 10px; @@ -33,25 +33,35 @@ cursor: move; height: 20px; float: left; - margin-left: 5px; - padding-left: 25px; + margin: 2px 7px; + padding: 0 0 0 20px; background: url("../../img/default/icon_folder.png")no-repeat; } .pack_name{ + float: left; + vertical-align: middle; + color: #FFFFFF; +} + +.pack_progressbar_wrapper{ + float: left; + margin: 4px auto 4px auto; + text-align: center; vertical-align: middle; - color: #D5D5D5; + width: 50%; + height: 15px; } .pack_progressbar{ - height: 8px; - margin: 8px 5px; + height: 15px; } .pack_toolbar{ - height: 24px; - float: left; - padding-left: 22px; + height: 20px; + float: right; + padding: 0 0 0 20px; + margin: 2px 7px; } .pack_toolbar div{ -- cgit v1.2.3 From d8119f648e63a4728433e67e79d2a99296a8c2c1 Mon Sep 17 00:00:00 2001 From: godofdream Date: Thu, 16 Aug 2012 17:48:39 +0200 Subject: Added Mobile WebIf, some Layouting --- module/web/static/css/default/my.css | 93 +++++++++++++++++++++++++++++++++ module/web/static/css/default/queue.css | 54 ++++++++++--------- 2 files changed, 121 insertions(+), 26 deletions(-) create mode 100644 module/web/static/css/default/my.css (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/my.css b/module/web/static/css/default/my.css new file mode 100644 index 000000000..2e73c1f35 --- /dev/null +++ b/module/web/static/css/default/my.css @@ -0,0 +1,93 @@ +.text-align-center { + text-align: center; +} +.text-align-right { + text-align: right; +} + +/** CSS for non-standard jQuery Mobile styles or Codiqa components **/ +.split-wrapper { + width: 100%; + min-height: 200px; + clear: both; +} +@media all and (min-width: 650px) { + .content-secondary { + text-align: left; + float: left; + width: 45%; + background: none; + padding: 1.5em 6% 3em 0; + margin: 0; + } + .content-secondary { + background: none; + border-top: none; + } + .content-primary { + width: 45%; + float: right; + margin-right: 1%; + padding-right: 1%; + } + .content-primary ul:first-child { + margin-top: 0; + } + .content-secondary ul.ui-listview, .content-secondary ul.ui-listview-inset { + margin: 0; + } + .content-secondary ul.ui-listview .ui-li-divider, .content-secondary ul.ui-listview .ui-li { + border-radius: 0px; + } + .content-secondary ul.ui-listview .ui-li { + border-left: 0; + border-right: 0; + } + .content-secondary h2 { + position: absolute; + left: -9999px; + } + .content-secondary .ui-li-divider { + padding-top: 1em; + padding-bottom: 1em; + } + .content-secondary { + margin: 0; + padding: 0; + } + +} +@media all and (min-width: 750px){ + .content-secondary { + width: 34%; + } + .content-primary { + width: 60%; + padding-right: 1%; + } + .content-secondary ul.ui-listview-inset { +} + +@media all and (min-width: 1200px){ + .content-secondary { + width: 30%; + padding-right:6%; + margin: 0px 0 20px 5%; + } + .content-secondary ul { + margin: 0; + } + .content-secondary { + margin: 0; + padding: 0; + } + .content-primary { + width: 50%; + margin-right: 5%; + padding-right: 3%; + } + .content-primary { + width: 60%; + } +} + diff --git a/module/web/static/css/default/queue.css b/module/web/static/css/default/queue.css index 23af09403..265432331 100644 --- a/module/web/static/css/default/queue.css +++ b/module/web/static/css/default/queue.css @@ -9,59 +9,61 @@ } .pack{ - border: 2px solid #000000; + border: 2px solid #CFCFCF; padding: 0; - -moz-border-radius: 10px; - border-radius: 10px; } .pack_header{ - background: url("../../img/default/main-wrapper-bg.png") repeat-x; + background-color: #CFCFCF; cursor: pointer; - border: 2px solid #000000; + border: 2px solid #CFCFCF; margin: 0px; height: 25px; - -moz-border-radius-topleft: 10px; - -moz-border-radius-topright: 10px; - -webkit-border-top-left-radius: 10px; - -webkit-border-top-right-radius: 10px; - border-top-left-radius: 10px; - border-top-right-radius: 10px; + } .pack_icon{ + display:inline-block; cursor: move; - height: 20px; - float: left; + height:20px; margin: 2px 7px; padding: 0 0 0 20px; background: url("../../img/default/icon_folder.png")no-repeat; } .pack_name{ - float: left; - vertical-align: middle; - color: #FFFFFF; + display:inline-block; + + top:0px; + margin: 0; + padding:0; + color: #000000; } .pack_progressbar_wrapper{ - float: left; - margin: 4px auto 4px auto; - text-align: center; + display:inline-block; vertical-align: middle; - width: 50%; - height: 15px; + height:9px; + width:50%; + right:15%; + margin-top: 6px; + position:absolute; } .pack_progressbar{ - height: 15px; + display:block; + width:100%; + height: inherit; + text-align: center; + margin: 0; } .pack_toolbar{ - height: 20px; - float: right; - padding: 0 0 0 20px; - margin: 2px 7px; + display:inline-block; + height:inherit; + right:0; + margin: 0; + } .pack_toolbar div{ -- cgit v1.2.3 From 7bc7de7332670f692eda576787e671c2eba0e5bb Mon Sep 17 00:00:00 2001 From: godofdream Date: Fri, 17 Aug 2012 01:29:03 +0200 Subject: added division into default template and mobile template, added Base site --- module/web/static/css/default/my.css | 93 ------------------------------------ 1 file changed, 93 deletions(-) delete mode 100644 module/web/static/css/default/my.css (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/my.css b/module/web/static/css/default/my.css deleted file mode 100644 index 2e73c1f35..000000000 --- a/module/web/static/css/default/my.css +++ /dev/null @@ -1,93 +0,0 @@ -.text-align-center { - text-align: center; -} -.text-align-right { - text-align: right; -} - -/** CSS for non-standard jQuery Mobile styles or Codiqa components **/ -.split-wrapper { - width: 100%; - min-height: 200px; - clear: both; -} -@media all and (min-width: 650px) { - .content-secondary { - text-align: left; - float: left; - width: 45%; - background: none; - padding: 1.5em 6% 3em 0; - margin: 0; - } - .content-secondary { - background: none; - border-top: none; - } - .content-primary { - width: 45%; - float: right; - margin-right: 1%; - padding-right: 1%; - } - .content-primary ul:first-child { - margin-top: 0; - } - .content-secondary ul.ui-listview, .content-secondary ul.ui-listview-inset { - margin: 0; - } - .content-secondary ul.ui-listview .ui-li-divider, .content-secondary ul.ui-listview .ui-li { - border-radius: 0px; - } - .content-secondary ul.ui-listview .ui-li { - border-left: 0; - border-right: 0; - } - .content-secondary h2 { - position: absolute; - left: -9999px; - } - .content-secondary .ui-li-divider { - padding-top: 1em; - padding-bottom: 1em; - } - .content-secondary { - margin: 0; - padding: 0; - } - -} -@media all and (min-width: 750px){ - .content-secondary { - width: 34%; - } - .content-primary { - width: 60%; - padding-right: 1%; - } - .content-secondary ul.ui-listview-inset { -} - -@media all and (min-width: 1200px){ - .content-secondary { - width: 30%; - padding-right:6%; - margin: 0px 0 20px 5%; - } - .content-secondary ul { - margin: 0; - } - .content-secondary { - margin: 0; - padding: 0; - } - .content-primary { - width: 50%; - margin-right: 5%; - padding-right: 3%; - } - .content-primary { - width: 60%; - } -} - -- cgit v1.2.3 From 19d7330d35ce8cb234d47c22b4454482ef3f1d8a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 27 Aug 2012 22:53:40 +0200 Subject: derived mobile template from default --- module/web/static/css/default/style.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index a5f0d7c9b..fb33875a7 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -66,14 +66,16 @@ a:hover { padding-bottom: 100px; /* Height of footer */ } +#content:before { + display: block; + content: " "; + height: 70px; /* Pushes content down with height of header */ +} + /* Header */ -#push { - height: 70px; /* Pushes content down with height of header */ -} - header { background: url("../../img/default/main-wrapper-bg.png") repeat-x; height: 70px; -- cgit v1.2.3 From 288b6190121618090107b3c0bb4f9e3539608d3b Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 2 Sep 2012 19:22:48 +0200 Subject: modal dialog --- module/web/static/css/default/style.css | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index fb33875a7..b871c1d3d 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -279,4 +279,44 @@ footer h2 { line-height: 16px; margin: 0; padding-bottom: 6px; +} + + +/* + Modal Dialogs +*/ +.modal { + top: 100px; + left: 50%; + position: fixed; + width: 300px; + height: 300px; + margin-left: -150px; + z-index: 100; + background: #fcfcfc; + padding: 10px 20px 20px; + box-shadow: 0 0 30px rgba(0,0,0,0.2); +} + +#modal-overlay { + content: " "; + height: 100%; + width: 100%; + position: absolute; + left: 0; + top: 0; /* TODO change gradient at all browser */ + background: -moz-radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%, rgba(40,119,171,0.9) 100%); + /*background: -moz-radial-gradient(center, ellipse cover, rgba(127,127,0,0) 0%, rgba(127,127,127,0.9) 100%);*/ + background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(127,127,127,0)), color-stop(100%,rgba(127,127,127,0.9))); + background: -webkit-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); + background: -o-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); + background: -ms-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); + background: radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007f7f7f', endColorstr='#e67f7f7f',GradientType=1 ); + z-index: 50; + opacity: 0; +} + +.modal-closed { + display: none; } \ No newline at end of file -- cgit v1.2.3 From 6a196ec9074a963c957223a7f8322cc12cb56d36 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 6 Sep 2012 20:41:09 +0200 Subject: little logo update --- module/web/static/css/default/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index b871c1d3d..2a2878ec6 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -120,7 +120,7 @@ header div.center span.title { header .logo { float: left; margin-right: 10px; - margin-top: 7px; + margin-top: 6px; width: 120px; height: 120px; background: url("../../img/default/logo.png")no-repeat; -- cgit v1.2.3 From 6a8303b004e1976739371431aa7358c672ad7313 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 16 Sep 2012 21:45:10 +0200 Subject: added bootstrap --- module/web/static/css/default/style.css | 41 +++++---------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 2a2878ec6..93ac91d89 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -28,18 +28,6 @@ h1, h2, h3 { color: #221D1D; } -h1 { - font-size: 2em; -} - -h2 { - font-size: 2.4em; -} - -h3 { - font-size: 1.6em; -} - p, ul, ol { margin-top: 0; line-height: 180%; @@ -115,7 +103,7 @@ header div.center span.title { font-family: SansationRegular, sans-serif; font-size: 40px; cursor: default; - margin-top: 12px; + margin-top: 24px; } header .logo { float: left; @@ -162,8 +150,8 @@ header .logo { margin: 8px 5px 0; } -#globalprogress .ui-widget-header { - background: #fee247; +#globalprogress .bar { + background-color: #fee247; } #speedgraph { @@ -224,6 +212,7 @@ footer { margin-top: -100px; position: relative; width: 100%; + line-height: 16px; z-index: 10; } @@ -237,7 +226,7 @@ footer .logo { } footer div.center { - padding-top: 10px; + padding-top: 8px; width: 900px; margin-left: auto; margin-right: auto; @@ -281,23 +270,9 @@ footer h2 { padding-bottom: 6px; } - /* - Modal Dialogs + Modal Overlay */ -.modal { - top: 100px; - left: 50%; - position: fixed; - width: 300px; - height: 300px; - margin-left: -150px; - z-index: 100; - background: #fcfcfc; - padding: 10px 20px 20px; - box-shadow: 0 0 30px rgba(0,0,0,0.2); -} - #modal-overlay { content: " "; height: 100%; @@ -315,8 +290,4 @@ footer h2 { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007f7f7f', endColorstr='#e67f7f7f',GradientType=1 ); z-index: 50; opacity: 0; -} - -.modal-closed { - display: none; } \ No newline at end of file -- cgit v1.2.3 From 68f1510f5a6ab632db19fc63f29c0475de9feb9d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 17 Sep 2012 15:46:42 +0200 Subject: nav + search bar for dashboard --- module/web/static/css/default/queue.css | 94 --------------------------------- module/web/static/css/default/style.css | 22 +++++++- 2 files changed, 21 insertions(+), 95 deletions(-) delete mode 100644 module/web/static/css/default/queue.css (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/queue.css b/module/web/static/css/default/queue.css deleted file mode 100644 index 265432331..000000000 --- a/module/web/static/css/default/queue.css +++ /dev/null @@ -1,94 +0,0 @@ - -#queue-list { - list-style: none; - padding-left: 0; -} - -#page-actions{ - list-style: none; -} - -.pack{ - border: 2px solid #CFCFCF; - padding: 0; -} - -.pack_header{ - background-color: #CFCFCF; - cursor: pointer; - border: 2px solid #CFCFCF; - margin: 0px; - height: 25px; - -} - -.pack_icon{ - display:inline-block; - cursor: move; - height:20px; - margin: 2px 7px; - padding: 0 0 0 20px; - background: url("../../img/default/icon_folder.png")no-repeat; -} - -.pack_name{ - display:inline-block; - - top:0px; - margin: 0; - padding:0; - color: #000000; -} - -.pack_progressbar_wrapper{ - display:inline-block; - vertical-align: middle; - height:9px; - width:50%; - right:15%; - margin-top: 6px; - position:absolute; -} - -.pack_progressbar{ - display:block; - width:100%; - height: inherit; - text-align: center; - margin: 0; -} - -.pack_toolbar{ - display:inline-block; - height:inherit; - right:0; - margin: 0; - -} - -.pack_toolbar div{ - height: 20px; - float: left; - padding-left: 22px; -} - -.pack_toolbar_delete { - background: url("../../img/default/delete.png")no-repeat; -} - -.pack_toolbar_restart { - background: url("../../img/default/arrow_refresh.png")no-repeat; -} - -.pack_toolbar_edit{ - background: url("../../img/default/pencil.png")no-repeat; -} - -.pack_children{ - display: none; -} - -.sort_children{ - list-style: none; - padding-left: 0; -} \ No newline at end of file diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 93ac91d89..844955e29 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -38,10 +38,12 @@ ul, ol { a { text-decoration: none; - color: #FF7637; + color: #3a79aa; } a:hover { + text-decoration: none; + color: #FF7637; } #wrap { @@ -290,4 +292,22 @@ footer h2 { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007f7f7f', endColorstr='#e67f7f7f',GradientType=1 ); z-index: 50; opacity: 0; +} + +/* + Dashboard +*/ + +.nav > li > a:hover { + color: #3a79aa; +} + +#dash-nav form { + margin-top: 8px; + margin-bottom: 0; +} + +#dash-nav input, #dash-nav button { + padding-top: 2px; + padding-bottom: 2px; } \ No newline at end of file -- cgit v1.2.3 From 8a0d6e4660481740efe47a0a3dd91c8c76c4e4dc Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 17 Sep 2012 17:15:45 +0200 Subject: breadcrumbs for dashboard --- module/web/static/css/default/style.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 844955e29..ec1a22312 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -302,6 +302,22 @@ footer h2 { color: #3a79aa; } +#dash-nav { + border-bottom: 1px dashed #d3d3d3; + padding-bottom: 2px; + margin-bottom: 5px; +} + +#dash-nav li > a { + margin-top: 5px; +} + +#dash-nav .breadcrumb { + margin: 0; + padding-top: 6px; + padding-bottom: 0; +} + #dash-nav form { margin-top: 8px; margin-bottom: 0; -- cgit v1.2.3 From 6b4ef3af1319efd8e2069f4c67332378b8a1c64e Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 17 Sep 2012 17:39:26 +0200 Subject: removed unneeded css, new login style --- module/web/static/css/default/style.css | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index ec1a22312..9c56d2d6d 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -181,30 +181,13 @@ header .logo { */ .login { vertical-align: middle; - text-align: center; border: 2px solid #000000; - padding: 15px; + padding: 15px 50px; font-size: 17px; border-radius: 15px; -moz-border-radius: 15px; -webkit-border-radius: 15px; } - -.login input, .login div{ - padding: 3px; -} -.login_submit input { - padding: 5px 15px; -} -.login_user , .login_password { - text-align: right; - width: 320px; - margin-left: auto; - margin-right: auto; -} -.login_user span, .login_password span{ - margin-right: 5px; -} /* Footer */ @@ -303,7 +286,7 @@ footer h2 { } #dash-nav { - border-bottom: 1px dashed #d3d3d3; + border-bottom: 1px dashed #E5E5E5; padding-bottom: 2px; margin-bottom: 5px; } -- cgit v1.2.3 From ab2b8b65572aa2338411c98f68e41d7b0adcfd60 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 17 Sep 2012 19:00:23 +0200 Subject: different bg pattern --- module/web/static/css/default/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 9c56d2d6d..4694605da 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -17,7 +17,7 @@ body { font-family: 'Abel', sans-serif; font-size: 16px; color: #757575; - background: url("../../img/default/fancy_deboss.png") repeat scroll 0 0 transparent; + background: url("../../img/default/bgpattern.png") repeat scroll 0 0 transparent; min-width: 1000px; } -- cgit v1.2.3 From e83859cc53d7976fc63e63846fdf1f72a9bf6686 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 17 Sep 2012 21:40:21 +0200 Subject: added less / moved style --- module/web/static/css/default/style.css | 312 ------------------------------ module/web/static/css/default/style.less | 318 +++++++++++++++++++++++++++++++ 2 files changed, 318 insertions(+), 312 deletions(-) delete mode 100644 module/web/static/css/default/style.css create mode 100644 module/web/static/css/default/style.less (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css deleted file mode 100644 index 4694605da..000000000 --- a/module/web/static/css/default/style.css +++ /dev/null @@ -1,312 +0,0 @@ - -/* - General - */ - -* { - margin: 0; -} - -html, body { - height: 100%; -} - -body { - margin: 0; - padding: 0; - font-family: 'Abel', sans-serif; - font-size: 16px; - color: #757575; - background: url("../../img/default/bgpattern.png") repeat scroll 0 0 transparent; - min-width: 1000px; -} - -h1, h2, h3 { - margin: 0; - padding: 0; - font-weight: normal; - color: #221D1D; -} - -p, ul, ol { - margin-top: 0; - line-height: 180%; -} - -ul, ol { -} - -a { - text-decoration: none; - color: #3a79aa; -} - -a:hover { - text-decoration: none; - color: #FF7637; -} - -#wrap { - min-height: 100%; -} - -#content { - margin-left: 150px; - margin-right: 150px; - padding-bottom: 100px; /* Height of footer */ -} - -#content:before { - display: block; - content: " "; - height: 70px; /* Pushes content down with height of header */ -} - -/* - Header -*/ - -header { - background: url("../../img/default/main-wrapper-bg.png") repeat-x; - height: 70px; - position: fixed; - top: 0; - vertical-align: top; - width: 100%; - z-index: 10; - min-width: 1000px; - color: #ffffff; -} - -header a { - color: #ffffff; -} - -header:before { - position: absolute; - content: ' '; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: transparent; - box-shadow: 0 0 5px black; - z-index: -1; -} - -header div.center { - position: relative; - padding-left: 20px; - padding-right: 20px; -} -header div.center span.title { - color: white; - float: left; - font-family: SansationRegular, sans-serif; - font-size: 40px; - cursor: default; - margin-top: 24px; -} -header .logo { - float: left; - margin-right: 10px; - margin-top: 6px; - width: 120px; - height: 120px; - background: url("../../img/default/logo.png")no-repeat; -} - -.header_block { - float: right; - margin: 12px 12px 0; - font-family: SansationRegular, sans-serif; -} -.header_icon { - padding-top: 2px; - padding-bottom: 5px; - padding-left: 25px; - height: 20px; -} - -.header_text { - text-align: center; -} - -.icon_info img { - margin-bottom: -4px; - padding-right: 5px; -} - -#notification_div { - position: absolute; - left: 50%; - width: 28%; - height: 45px; - margin-left: -14%; - margin-top: 12px; - text-align: center; -} - -#globalprogress { - height: 8px; - margin: 8px 5px 0; -} - -#globalprogress .bar { - background-color: #fee247; -} - -#speedgraph { - float: right; - height: 45px; - width: 14%; - margin-top: 12px; - font-family: sans-serif -} - -#header_user { - background: url("../../img/default/icon_user_small_white.png")no-repeat; -} - -#header_speed { - background: url("../../img/default/icon_speed_small_white.png")no-repeat; -} - -#header_qeuue { - background: url("../../img/default/icon_clock_small_white.png")no-repeat; -} - -/* - Login -*/ -.login { - vertical-align: middle; - border: 2px solid #000000; - padding: 15px 50px; - font-size: 17px; - border-radius: 15px; - -moz-border-radius: 15px; - -webkit-border-radius: 15px; -} -/* - Footer -*/ -footer { - background: url("../../img/default/main-wrapper-bg.png") repeat-x; - height: 100px; - margin-top: -100px; - position: relative; - width: 100%; - line-height: 16px; - z-index: 10; -} - -footer .logo { - background: url(../../img/default/logo_grey.png) no-repeat; - float: left; - width: 60px; - height: 60px; - margin-top: 12px; - margin-right: 12px; -} - -footer div.center { - padding-top: 8px; - width: 900px; - margin-left: auto; - margin-right: auto; -} - -footer:before { - position: absolute; - content: ' '; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: transparent; - box-shadow: 0 0 5px black; - z-index: -1; -} - -footer .block { - font-size: 12px; - float: left; - margin: 0; - width: 150px; - padding-top: 6px; - padding-right: 30px; -} - -footer .copyright { - text-align: center; - width: auto; - padding-top: 22px; -} - -footer h2 { - background: url("../../img/default/double-line.gif") repeat-x scroll center bottom transparent !important; - color: #FFFFFF; - font-family: SansationLight, sans-serif; - font-size: 16px; - font-weight: normal; - line-height: 16px; - margin: 0; - padding-bottom: 6px; -} - -/* - Modal Overlay -*/ -#modal-overlay { - content: " "; - height: 100%; - width: 100%; - position: absolute; - left: 0; - top: 0; /* TODO change gradient at all browser */ - background: -moz-radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%, rgba(40,119,171,0.9) 100%); - /*background: -moz-radial-gradient(center, ellipse cover, rgba(127,127,0,0) 0%, rgba(127,127,127,0.9) 100%);*/ - background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(127,127,127,0)), color-stop(100%,rgba(127,127,127,0.9))); - background: -webkit-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); - background: -o-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); - background: -ms-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); - background: radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007f7f7f', endColorstr='#e67f7f7f',GradientType=1 ); - z-index: 50; - opacity: 0; -} - -/* - Dashboard -*/ - -.nav > li > a:hover { - color: #3a79aa; -} - -#dash-nav { - border-bottom: 1px dashed #E5E5E5; - padding-bottom: 2px; - margin-bottom: 5px; -} - -#dash-nav li > a { - margin-top: 5px; -} - -#dash-nav .breadcrumb { - margin: 0; - padding-top: 6px; - padding-bottom: 0; -} - -#dash-nav form { - margin-top: 8px; - margin-bottom: 0; -} - -#dash-nav input, #dash-nav button { - padding-top: 2px; - padding-bottom: 2px; -} \ No newline at end of file diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less new file mode 100644 index 000000000..08ae11f9e --- /dev/null +++ b/module/web/static/css/default/style.less @@ -0,0 +1,318 @@ + +/* + General + */ + +@width: 1000px; +@header-height: 70px; +@footer-height: 100px; +@margin-side: 150px; + +@dark: #333333; +@grey: #757575; +@yellow: #fee247; +@blue: #3a79aa; +@emph: #FF7637; + + +* { + margin: 0; +} + +html, body { + height: 100%; +} + +body { + margin: 0; + padding: 0; + font-family: 'Abel', sans-serif; + font-size: 16px; + background: url("../../img/default/bgpattern.png") repeat scroll 0 0 transparent; + min-width: @width; +} + +h1, h2, h3 { + margin: 0; + padding: 0; + font-weight: normal; +} + +a { + text-decoration: none; + color: @blue; +} + +a:hover { + text-decoration: none; + color: @emph; +} + +#wrap { + min-height: 100%; +} + +#content { + margin-left: @margin-side; + margin-right: @margin-side; + padding-bottom: @footer-height; +} + +#content:before { + display: block; + content: " "; + height: @header-height; +} + +/* + Header +*/ + +header { + background: url("../../img/default/main-wrapper-bg.png") repeat-x; + height: @header-height; + position: fixed; + top: 0; + vertical-align: top; + width: 100%; + z-index: 10; + min-width: @width; + color: #ffffff; +} + +header a { + color: #ffffff; +} + +header:before { + position: absolute; + content: ' '; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: transparent; + box-shadow: 0 0 5px black; + z-index: -1; +} + +header div.center { + position: relative; + padding-left: 20px; + padding-right: 20px; +} +header div.center span.title { + color: white; + float: left; + font-family: SansationRegular, sans-serif; + font-size: 40px; + cursor: default; + margin-top: 24px; +} +header .logo { + float: left; + margin-right: 10px; + margin-top: 6px; + width: 120px; + height: 120px; + background: url("../../img/default/logo.png")no-repeat; +} + +.header_block { + float: right; + margin: 12px 12px 0; + font-family: SansationRegular, sans-serif; +} +.header_icon { + padding-top: 2px; + padding-bottom: 5px; + padding-left: 25px; + height: 20px; +} + +.header_text { + text-align: center; +} + +.icon_info img { + margin-bottom: -4px; + padding-right: 5px; +} + +#notification_div { + position: absolute; + left: 50%; + width: 28%; + height: 45px; + margin-left: -14%; + margin-top: 12px; + text-align: center; +} + +#globalprogress { + height: 8px; + margin: 8px 5px 0; +} + +#globalprogress .bar { + background-color: @yellow; +} + +#speedgraph { + float: right; + height: 45px; + width: 14%; + margin-top: 12px; + font-family: sans-serif +} + +#header_user { + background: url("../../img/default/icon_user_small_white.png")no-repeat; +} + +#header_speed { + background: url("../../img/default/icon_speed_small_white.png")no-repeat; +} + +#header_qeuue { + background: url("../../img/default/icon_clock_small_white.png")no-repeat; +} + +/* + Login +*/ +.login { + vertical-align: middle; + border: 2px solid @dark; + padding: 15px 50px; + font-size: 17px; + border-radius: 15px; + -moz-border-radius: 15px; + -webkit-border-radius: 15px; +} +/* + Footer +*/ +footer { + background: url("../../img/default/main-wrapper-bg.png") repeat-x; + color: @grey; + height: @footer-height; + margin-top: -@footer-height; + position: relative; + width: 100%; + line-height: 16px; + z-index: 10; +} + +footer .logo { + background: url(../../img/default/logo_grey.png) no-repeat; + float: left; + width: 60px; + height: 60px; + margin-top: 12px; + margin-right: 12px; +} + +footer div.center { + padding-top: 8px; + width: 900px; + margin-left: auto; + margin-right: auto; +} + +footer:before { + position: absolute; + content: ' '; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: transparent; + box-shadow: 0 0 5px black; + z-index: -1; +} + +footer .block { + font-size: 12px; + float: left; + margin: 0; + width: 150px; + padding-top: 6px; + padding-right: 30px; +} + +footer .copyright { + text-align: center; + width: auto; + padding-top: 22px; +} + +footer h2 { + background: url("../../img/default/double-line.gif") repeat-x scroll center bottom transparent !important; + color: #FFFFFF; + font-family: SansationLight, sans-serif; + font-size: 16px; + font-weight: normal; + line-height: 16px; + margin: 0; + padding-bottom: 6px; +} + +/* + Modal Overlay +*/ +#modal-overlay { + content: " "; + height: 100%; + width: 100%; + position: absolute; + left: 0; + top: 0; + background: -moz-radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%, rgba(40,119,171,0.9) 100%); + background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(236,208,66,0)), color-stop(100%,rgba(40,119,171,0.9))); + background: -webkit-radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%,rgba(40,119,171,0.9) 100%); + background: -o-radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%,rgba(40,119,171,0.9) 100%); + background: -ms-radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%,rgba(40,119,171,0.9) 100%); + background: radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%,rgba(40,119,171,0.9) 100%); + z-index: 50; + opacity: 0; +} + +/* + Dashboard +*/ + +.nav > li > a:hover { + color: @blue; +} + +#dash-nav { + border-bottom: 1px dashed @grey; + padding-bottom: 2px; + margin-bottom: 5px; +} + +#dash-nav li > a { + margin-top: 5px; +} + +#dash-nav .breadcrumb { + margin: 0; + padding-top: 10px; + padding-bottom: 0; + + .active { + color: @grey; + } + +} + +#dash-nav form { + margin-top: 8px; + margin-bottom: 0; +} + +#dash-nav input, #dash-nav button { + padding-top: 2px; + padding-bottom: 2px; +} \ No newline at end of file -- cgit v1.2.3 From b3c5fa9924907cd0515e98b79882eb89973e9423 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 17 Sep 2012 22:07:17 +0200 Subject: dropdowns in navbar --- module/web/static/css/default/style.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/web/static/css/default') diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less index 08ae11f9e..203135e97 100644 --- a/module/web/static/css/default/style.less +++ b/module/web/static/css/default/style.less @@ -3,7 +3,7 @@ General */ -@width: 1000px; +@min-width: 1000px; @header-height: 70px; @footer-height: 100px; @margin-side: 150px; @@ -29,7 +29,7 @@ body { font-family: 'Abel', sans-serif; font-size: 16px; background: url("../../img/default/bgpattern.png") repeat scroll 0 0 transparent; - min-width: @width; + min-width: @min-width; } h1, h2, h3 { @@ -54,7 +54,7 @@ a:hover { #content { margin-left: @margin-side; - margin-right: @margin-side; + margin-right: @margin-side ; padding-bottom: @footer-height; } @@ -76,7 +76,7 @@ header { vertical-align: top; width: 100%; z-index: 10; - min-width: @width; + min-width: @min-width; color: #ffffff; } -- cgit v1.2.3