From 1b6c84d8f453ff591451e3304547b239a3d86c5b Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 18 Apr 2012 02:36:30 +0200 Subject: diabook-themes: some css/bug-fixes --- view/theme/diabook/icons/events2.png | Bin 0 -> 1823 bytes view/theme/diabook/login.tpl | 33 ++++++++++++++++++++++ view/theme/diabook/style-network-wide.css | 2 +- view/theme/diabook/style-network.css | 7 ++--- view/theme/diabook/style-profile-wide.css | 2 +- view/theme/diabook/style-profile.css | 2 +- view/theme/diabook/style-wide.css | 44 ++++++++++++++++++++++++------ view/theme/diabook/style.css | 43 +++++++++++++++++++++++------ 8 files changed, 108 insertions(+), 25 deletions(-) create mode 100644 view/theme/diabook/icons/events2.png create mode 100644 view/theme/diabook/login.tpl (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/events2.png b/view/theme/diabook/icons/events2.png new file mode 100644 index 000000000..53f59c006 Binary files /dev/null and b/view/theme/diabook/icons/events2.png differ diff --git a/view/theme/diabook/login.tpl b/view/theme/diabook/login.tpl new file mode 100644 index 000000000..efa7c2d6d --- /dev/null +++ b/view/theme/diabook/login.tpl @@ -0,0 +1,33 @@ + +
+ + +
+ {{ inc field_input.tpl with $field=$lname }}{{ endinc }} + {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} +
+ + {{ if $openid }} +
+ {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} +
+ {{ endif }} + +
+ +
+ + + + {{ for $hiddens as $k=>$v }} + + {{ endfor }} + + +
+ + + diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css index 28f363847..af819b061 100644 --- a/view/theme/diabook/style-network-wide.css +++ b/view/theme/diabook/style-network-wide.css @@ -2299,7 +2299,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 21c08e856..739a97b35 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -2287,7 +2287,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; @@ -2309,10 +2309,7 @@ a.mail-list-link { margin-bottom: 15px; } -.event-description:before { - content: url('../../../images/calendar.png'); - margin-right: 15px; -} + .event-start, .event-end { margin-left: 10px; diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css index e7cede6b8..21af162e8 100644 --- a/view/theme/diabook/style-profile-wide.css +++ b/view/theme/diabook/style-profile-wide.css @@ -2277,7 +2277,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 71b034865..a830e810e 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2266,7 +2266,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index 6287a05ba..2fff20d81 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -435,6 +435,10 @@ body { } +#jappix_mini { +right: 45px !important; +} + h4 { font-size: 1.1em; } @@ -1190,7 +1194,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - margin-top: 20px; + margin-bottom: 15px; } /* widget */ .widget { @@ -2550,16 +2554,39 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; -} -.vevent .event-description, .vevent .event-location { +position: relative; +width: 400px; +padding: 20px; +padding-top: 10px; +margin: 0 0px; +margin-bottom: 10px; +background-color: white; +-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +} +.vevent .event-location { margin-left: 10px; margin-right: 10px; } -.vevent .event-start { - margin-left: 10px; - margin-right: 10px; +.vevent .event-description { +margin-left: 10px; +margin-right: 10px; +font-size: 1.1em; +font-weight: bolder; } +.vevent .event-start, .vevent .event-end { + +margin-right: 20px; +margin-bottom: 2px; +margin-top: 2px; +font-size: 0.9em; +text-align: left; +} +.event-start .dtstart, .event-end .dtend { +float: right; +} + #new-event-link { margin-bottom: 10px; @@ -2573,7 +2600,7 @@ a.mail-list-link { } .event-description:before { - content: url('../../../images/calendar.png'); + content: url("../../../view/theme/diabook/icons/events2.png") !important; margin-right: 15px; } @@ -2586,7 +2613,6 @@ a.mail-list-link { .event-start .dtstart, .event-end .dtend { float: right; } - .event-list-date { margin-bottom: 10px; } diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 0afb2cac8..39d60f321 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -436,6 +436,10 @@ body { display: table; } +#jappix_mini { +right: 45px !important; +} + h4 { font-size: 1.1em; } @@ -1193,7 +1197,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - margin-top: 20px; + margin-bottom: 15px; } /* widget */ .widget { @@ -2545,16 +2549,39 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; -} -.vevent .event-description, .vevent .event-location { +position: relative; +width: 400px; +padding: 20px; +padding-top: 10px; +margin: 0 0px; +margin-bottom: 10px; +background-color: white; +-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +} +.vevent .event-location { margin-left: 10px; margin-right: 10px; } -.vevent .event-start { - margin-left: 10px; - margin-right: 10px; +.vevent .event-description { +margin-left: 10px; +margin-right: 10px; +font-size: 1.1em; +font-weight: bolder; +} +.vevent .event-start, .vevent .event-end { + +margin-right: 20px; +margin-bottom: 2px; +margin-top: 2px; +font-size: 0.9em; +text-align: left; } +.event-start .dtstart, .event-end .dtend { +float: right; +} + #new-event-link { margin-bottom: 10px; @@ -2568,7 +2595,7 @@ a.mail-list-link { } .event-description:before { - content: url('../../../images/calendar.png'); + content: url("../../../view/theme/diabook/icons/events2.png") !important; margin-right: 15px; } -- cgit v1.2.3