summaryrefslogtreecommitdiff
path: root/theme/base
diff options
context:
space:
mode:
Diffstat (limited to 'theme/base')
-rw-r--r--theme/base/css/display.css127
-rw-r--r--theme/base/css/facebookapp.css98
-rw-r--r--theme/base/css/ie.css5
-rw-r--r--theme/base/css/ie6.css5
-rw-r--r--theme/base/css/ie7.css5
-rw-r--r--theme/base/css/mobile.css150
-rw-r--r--theme/base/css/modal.css22
-rw-r--r--theme/base/css/modal_ie.css16
-rw-r--r--theme/base/css/print.css36
-rw-r--r--theme/base/images/icons/icon_atom.jpgbin1117 -> 0 bytes
-rw-r--r--theme/base/images/icons/icon_atom.pngbin0 -> 820 bytes
-rw-r--r--theme/base/images/icons/icon_rss.jpgbin1166 -> 0 bytes
-rw-r--r--theme/base/images/icons/icon_rss.pngbin0 -> 777 bytes
-rw-r--r--theme/base/images/x.pngbin0 -> 1066 bytes
14 files changed, 390 insertions, 74 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 289329bbc..c741ed4cb 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -20,16 +20,13 @@ font-family:sans-serif;
font-size:1em;
line-height:1.65;
position:relative;
-margin:0 auto;
-width:71.714em;
}
h1,h2,h3,h4,h5,h6 {
-text-transform:uppercase;
margin-bottom:7px;
+overflow:hidden;
}
h1 {
font-size:1.4em;
-line-height:1;
margin-bottom:18px;
}
h2 { font-size:1.3em; }
@@ -44,7 +41,6 @@ font-weight:bold;
legend {
font-weight:bold;
font-size:1.3em;
-text-transform:uppercase;
}
input, textarea, select, option {
padding:4px;
@@ -153,7 +149,8 @@ font-weight:bold;
#form_remote_subscribe legend,
#form_openid_login legend,
#form_search legend,
-#form_invite legend {
+#form_invite legend,
+#form_notice_delete legend {
display:none;
}
@@ -180,6 +177,7 @@ float:left;
width:90%;
}
+
#form_login p.form_guide,
#form_register #settings_rememberme p.form_guide,
#form_openid_login #settings_rememberme p.form_guide,
@@ -195,12 +193,16 @@ border-radius:4px;
padding:0 7px;
}
+
+.form_settings input.form_action-secondary {
+margin-left:29px;
+padding:0;
+}
+
#form_search .submit {
margin-left:11px;
}
-
-
address {
float:left;
margin-bottom:18px;
@@ -240,10 +242,9 @@ display:none;
#site_notice {
position:absolute;
-right:0;
-top:49px;
-float:right;
-width:300px;
+top:65px;
+right:18px;
+width:250px;
}
#page_notice {
clear:both;
@@ -254,6 +255,7 @@ margin-bottom:18px;
#anon_notice {
float:left;
width:432px;
+width:28.052em;
padding:11px;
border-radius:7px;
-moz-border-radius:7px;
@@ -295,7 +297,7 @@ padding:4px 11px;
border-width:1px;
border-style:solid;
border-bottom:0;
-text-shadow: 4px 4px 4px #ddd;
+text-shadow: 2px 2px 2px #ddd;
font-weight:bold;
}
#site_nav_local_views .nav {
@@ -361,9 +363,9 @@ margin-right:4px;
}
#wrap {
-float:left;
margin:0 auto;
-width:71.714em;
+width:1003px;
+overflow:hidden;
}
#core {
@@ -391,13 +393,15 @@ float:left;
}
#aside_primary {
-width:286px;
+width:280px;
float:left;
-margin-left:2px;
+margin-left:4px;
padding:18px;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
}
/*Start: FORM NOTICE*/
@@ -505,50 +509,44 @@ position:relative;
width:475px;
min-height:123px;
float:left;
-margin-bottom:17px;
+margin-bottom:18px;
margin-left:0;
+overflow:hidden;
}
.entity_profile dt,
#entity_statistics dt {
font-weight:bold;
}
+.entity_profile dd {
+display:inline;
+}
+
.entity_profile .entity_depiction {
float:left;
-position:absolute;
-top:0;
-left:0;
width:96px;
+margin-right:18px;
+margin-bottom:18px;
}
+
.entity_profile .entity_fn,
.entity_profile .entity_nickname,
.entity_profile .entity_location,
.entity_profile .entity_url,
.entity_profile .entity_note,
.entity_profile .entity_tags {
-float:left;
-clear:left;
margin-left:113px;
-width:322px;
margin-bottom:4px;
+width:322px;
}
.entity_profile .entity_fn,
.entity_profile .entity_nickname {
-width:auto;
-clear:none;
-}
-
-.entity_profile .entity_fn {
margin-left:11px;
-margin-right:4px;
-}
-.entity_profile .entity_fn .fn {
+display:inline;
font-weight:bold;
-font-style:normal;
}
-.entity_profile .nickname {
-font-style:italic;
-font-weight:bold;
+.entity_profile .entity_nickname {
+margin-left:0;
}
.entity_profile .entity_fn dd:before {
@@ -566,13 +564,14 @@ display:none;
.entity_profile h2 {
display:none;
}
+
/* entity_profile */
/*entity_actions*/
.entity_actions {
float:right;
-
+margin-left:28px;
}
.entity_actions h2 {
display:none;
@@ -610,12 +609,14 @@ display:block;
.form_user_block input.submit,
.form_user_unblock input.submit,
.entity_send-a-message a,
+.entity_edit a,
.form_user_nudge input.submit,
.entity_nudge p {
border:0;
padding-left:20px;
}
+.entity_edit a,
.entity_send-a-message a,
.entity_nudge p {
padding:4px 4px 4px 23px;
@@ -688,12 +689,6 @@ min-height:60px;
}
-.profile .form_group_join,
-.profile .form_group_leave,
-.profile .form_user_subscribe,
-.profile .form_user_unsubscribe {
-float:right;
-}
.profile .form_group_join legend,
.profile .form_group_leave legend,
.profile .form_user_subscribe legend,
@@ -759,7 +754,7 @@ border-radius:4px;
/* NOTICES */
#notices_primary {
float:left;
-width:644px;
+width:100%;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
@@ -776,6 +771,10 @@ padding-left:28px;
margin-right:11px;
}
+.fn {
+overflow:hidden;
+}
+
.notice .author .fn {
font-weight:bold;
}
@@ -796,13 +795,11 @@ text-decoration:none;
.vcard .url:hover {
text-decoration:underline;
}
-.vcard .fn {
-font-style:italic;
-}
.notice .entry-title {
float:left;
width:100%;
+overflow:hidden;
}
#shownotice .notice .entry-title {
font-size:2.2em;
@@ -903,7 +900,7 @@ left:0;
left:29px;
}
.notice-options .notice_delete {
-left:76px;
+right:0;
}
.notice-options .notice_reply dt {
display:none;
@@ -946,7 +943,7 @@ padding:0;
-#new_group {
+#new_group, #group_search {
margin-bottom:18px;
}
#new_group a {
@@ -1031,21 +1028,18 @@ display:block;
text-decoration:none;
font-weight:bold;
padding:7px;
-border:1px dotted #D1D9E4;
-border-bottom:0;
+border-width:1px;
+border-style:solid;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-radius:7px;
}
.pagination .nav_prev a {
--moz-border-radius-topright:7px;
--webkit-border-top-right-radius:7px;
-padding-left:20px;
-border-left:0;
+padding-left:30px;
}
.pagination .nav_next a {
--moz-border-radius-topleft:7px;
--webkit-border-top-left-radius:7px;
-padding-right:20px;
-border-right:0;
+padding-right:30px;
}
/* END: NOTICE */
@@ -1078,13 +1072,20 @@ margin-bottom:0;
}
.section .notice {
-padding-top:11px;
-padding-bottom:11px;
+padding-top:7px;
+padding-bottom:7px;
+border-top:0;
}
.section .notice:first-child {
padding-top:0;
-border-top:0;
+}
+
+.section .notice .author {
+margin-right:0;
+}
+.section .notice .author .fn {
+display:none;
}
@@ -1169,3 +1170,5 @@ clear:both;
#form_settings_avatar .form_actions {
margin-bottom:0;
}
+
+
diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css
index 0d8c879cd..163b41fb4 100644
--- a/theme/base/css/facebookapp.css
+++ b/theme/base/css/facebookapp.css
@@ -1,4 +1,100 @@
@import url("display.css");
@import url("../../identica/css/display.css");
-span.facebook-button { border: 2px solid #777; padding: 5px; display: block; float: left; margin-right: 20px; -moz-border-radius: 4px; border-radius:4px; -webkit-border-radius:4px; font-weight: bold; background-color:#A9BF4F; color:#fff; font-size:1.2em }
+* {
+font-size:14px;
+font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
+
+#wrap {
+background-color:#F0F2F5;
+padding-left:18px;
+padding-right:18px;
+width:auto;
+}
+
+p,label,
+h1,h2,h3,h4,h5,h6 {
+color:#000;
+}
+
+#content {
+width:95%;
+}
+
+#site_nav_local_views a {
+background-color:#D0DFE7;
+}
+#site_nav_local_views a:hover {
+background-color:#FAFBFC;
+}
+
+span.facebook-button {
+border: 2px solid #aaa;
+padding: 3px;
+display: block;
+float: left;
+margin-right: 20px;
+-moz-border-radius: 4px;
+border-radius:4px;
+-webkit-border-radius:4px;
+font-weight: bold;
+background-color:#A9BF4F;
+color:#fff;
+font-size:1.2em
+}
+
+span.facebook-button a { color:#fff }
+
+.facebook_guide {
+margin-bottom:18px;
+}
+.facebook_guide p {
+font-weight:bold;
+}
+
+
+input {
+height:auto !important;
+}
+
+#facebook-friends {
+float:left;
+width:100%;
+}
+
+#facebook-friends li {
+float:left;
+margin-right:2%;
+margin-bottom:11px;
+width:18%;
+height:115px;
+}
+#facebook-friends li a {
+float:left;
+}
+
+#add_to_profile {
+position:absolute;
+right:18px;
+top:10px;
+z-index:2;
+}
+
+.notice div.entry-content dl,
+.notice div.entry-content dt,
+.notice div.entry-content dd {
+margin-right:5px;
+}
+
+#content_inner p {
+margin-bottom:18px;
+}
+
+#content_inner ul {
+list-style-type:none;
+}
+
+.form_settings label {
+margin-right:18px;
+}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 08b027b59..45176a201 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -9,7 +9,6 @@ margin-top:3px;
height:16px;
text-align:right;
text-indent:0;
-color:#fff;
width:24px;
}
@@ -24,7 +23,3 @@ margin-left:-7px;
.notice div.entry-content .timestamp a {
margin-right:4px;
}
-
-.entity_profile .entity_nickname {
-padding-right:3px;
-}
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 4a2316903..10b31cbcb 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -4,5 +4,8 @@
.entity_profile .entity_url,
.entity_profile .entity_note,
.entity_profile .entity_tags {
-margin-left:55px;
+margin-left:0;
+}
+.entity_profile .entity_depiction {
+margin-bottom:123px;
}
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
deleted file mode 100644
index a6ee001e2..000000000
--- a/theme/base/css/ie7.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* IE7 specific styles */
-
-#form_notice textarea {
-width:370px;
-}
diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css
new file mode 100644
index 000000000..eee98317c
--- /dev/null
+++ b/theme/base/css/mobile.css
@@ -0,0 +1,150 @@
+/** theme: base
+ *
+ * @package Laconica
+ * @author Meitar Moscovitz <meitar@maymay.net>
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
+body {
+font-size:2.5em;
+}
+
+#wrap {
+width:95%;
+}
+
+#header,
+#header address,
+#anon_notice,
+#site_nav_local_views .nav,
+#form_notice,
+#form_notice .form_data li,
+#core,
+#content_inner,
+#notices_primary,
+.notice,
+.notice .entry-title,
+.notice div.entry-content,
+.notice-options,
+.notice .notice-options a,
+.pagination,
+.pagination .nav,
+.aside .section {
+float:none;
+}
+
+.notice-options .notice_reply,
+.notice-options .notice_delete,
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+position:static;
+}
+
+#form_notice,
+#anon_notice,
+#footer,
+#form_notice .form_actions input.submit {
+width:auto;
+}
+
+.form_settings label {
+width:25%;
+}
+.form_settings .form_data p.form_guide {
+margin-left:26%;
+}
+
+#site_nav_global_primary {
+width:75%;
+}
+
+.entity_profile {
+width:65%;
+}
+.entity_actions {
+margin-left:0;
+}
+
+#form_notice,
+#anon_notice {
+clear:both;
+}
+
+#content,
+#aside_primary {
+width:96%;
+padding-left:2%;
+padding-right:2%;
+}
+
+#site_notice {
+position:static;
+float:right;
+clear:right;
+width:75%;
+margin-right:0;
+margin-bottom:11px;
+}
+
+.notices {
+font-size:1.5em;
+}
+
+#form_notice textarea {
+width:80%;
+height:5em;
+}
+#form_notice .form_note {
+right:20%;
+top:6em;
+}
+
+
+.vcard .photo,
+.section .vcard .photo {
+margin-right:18px;
+}
+.notice,
+.profile {
+margin-bottom:18px;
+}
+
+.notices .entry-title,
+.notices div.entry-content {
+width:90%;
+}
+.notice div.entry-content {
+margin-left:0;
+}
+
+.notice .author .photo {
+height:4.5em;
+width:4.5em;
+}
+.notice-options {
+position:absolute;
+top:0;
+right:0;
+padding-left:7%;
+width:3%;
+}
+
+.notice-options .notice_delete a {
+float:left;
+}
+.pagination .nav {
+overflow:auto;
+}
+
+#export_data {
+display:none;
+}
+
+#site_nav_local_views li {
+margin-right:4px;
+}
+#site_nav_local_views a {
+padding:18px 11px;
+}
diff --git a/theme/base/css/modal.css b/theme/base/css/modal.css
new file mode 100644
index 000000000..985e4adfa
--- /dev/null
+++ b/theme/base/css/modal.css
@@ -0,0 +1,22 @@
+/*
+ * SimpleModal Basic Modal Dialog
+ * http://www.ericmmartin.com/projects/simplemodal/
+ * http://code.google.com/p/simplemodal/
+ *
+ * Copyright (c) 2008 Eric Martin - http://ericmmartin.com
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Revision: $Id: basic.css 162 2008-12-01 23:36:58Z emartin24 $
+ *
+ */
+
+
+/* Overlay */
+#simplemodal-overlay {background-color:#000; cursor:wait;}
+
+/* Container */
+#simplemodal-container {height:240px; width:320px; background-color:#fff; border:3px solid #ccc;}
+#simplemodal-container a.modalCloseImg {background:url(../images/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-18px; cursor:pointer;}
+#simplemodal-container #basicModalContent {padding:8px;}
diff --git a/theme/base/css/modal_ie.css b/theme/base/css/modal_ie.css
new file mode 100644
index 000000000..eab4637c0
--- /dev/null
+++ b/theme/base/css/modal_ie.css
@@ -0,0 +1,16 @@
+/*
+ * SimpleModal Basic Modal Dialog
+ * http://www.ericmmartin.com/projects/simplemodal/
+ * http://code.google.com/p/simplemodal/
+ *
+ * Copyright (c) 2008 Eric Martin - http://ericmmartin.com
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Revision: $Id: basic_ie.css 162 2008-12-01 23:36:58Z emartin24 $
+ *
+ */
+
+/* IE 6 hacks*/
+#simplemodal-container a.modalCloseImg {background:none; right:-14px; width:22px; height:26px; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/x.png',sizingMethod='scale');}
diff --git a/theme/base/css/print.css b/theme/base/css/print.css
new file mode 100644
index 000000000..2da3e5e44
--- /dev/null
+++ b/theme/base/css/print.css
@@ -0,0 +1,36 @@
+/** theme: base
+ *
+ * @package Laconica
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
+a:after { background-color:#fff; }
+a:not([href^="#"]):after { content:" ( "attr(href)" ) "; }
+
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subcription_edit .submit {
+display:none;
+}
+
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
diff --git a/theme/base/images/icons/icon_atom.jpg b/theme/base/images/icons/icon_atom.jpg
deleted file mode 100644
index 22853edc4..000000000
--- a/theme/base/images/icons/icon_atom.jpg
+++ /dev/null
Binary files differ
diff --git a/theme/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png
new file mode 100644
index 000000000..6a001f11a
--- /dev/null
+++ b/theme/base/images/icons/icon_atom.png
Binary files differ
diff --git a/theme/base/images/icons/icon_rss.jpg b/theme/base/images/icons/icon_rss.jpg
deleted file mode 100644
index da23422d0..000000000
--- a/theme/base/images/icons/icon_rss.jpg
+++ /dev/null
Binary files differ
diff --git a/theme/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png
new file mode 100644
index 000000000..0ccd1ce25
--- /dev/null
+++ b/theme/base/images/icons/icon_rss.png
Binary files differ
diff --git a/theme/base/images/x.png b/theme/base/images/x.png
new file mode 100644
index 000000000..c11f7af69
--- /dev/null
+++ b/theme/base/images/x.png
Binary files differ
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-19 06:33:38 +0000