summaryrefslogtreecommitdiff
path: root/theme/base
diff options
context:
space:
mode:
Diffstat (limited to 'theme/base')
-rw-r--r--theme/base/css/display.css94
-rw-r--r--theme/base/css/ie.css31
-rw-r--r--theme/base/css/ie6.css19
-rw-r--r--theme/base/css/mobile.css160
-rw-r--r--theme/base/css/modal.css22
-rw-r--r--theme/base/css/modal_ie.css16
-rw-r--r--theme/base/images/icons/icon_processing.gifbin0 -> 673 bytes
-rw-r--r--theme/base/images/x.pngbin1066 -> 0 bytes
8 files changed, 190 insertions, 152 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c741ed4cb..4c9b52254 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -150,7 +150,9 @@ font-weight:bold;
#form_openid_login legend,
#form_search legend,
#form_invite legend,
-#form_notice_delete legend {
+#form_notice_delete legend,
+#form_password_recover legend,
+#form_password_change legend {
display:none;
}
@@ -214,6 +216,9 @@ margin-right:0;
address .fn {
font-weight:bold;
}
+address img + .fn {
+display:none;
+}
#header {
width:100%;
@@ -245,6 +250,7 @@ position:absolute;
top:65px;
right:18px;
width:250px;
+width:24%;
}
#page_notice {
clear:both;
@@ -254,9 +260,8 @@ margin-bottom:18px;
#anon_notice {
float:left;
-width:432px;
-width:28.052em;
-padding:11px;
+width:43.2%;
+padding:1.1%;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
@@ -364,7 +369,9 @@ margin-right:4px;
#wrap {
margin:0 auto;
-width:1003px;
+width:100%;
+min-width:760px;
+max-width:1003px;
overflow:hidden;
}
@@ -376,14 +383,16 @@ margin-bottom:1em;
}
#content {
-width:644px;
-padding:18px;
+width:64.009%;
+padding:1.795%;
float:left;
border-radius:7px;
-moz-border-radius:7px;
-moz-border-radius-topleft:0;
-webkit-border-radius:7px;
-webkit-border-top-left-radius:0;
+border-style:solid;
+border-width:1px;
}
#content_inner {
@@ -393,10 +402,10 @@ float:left;
}
#aside_primary {
-width:280px;
+width:27.917%;
float:left;
-margin-left:4px;
-padding:18px;
+margin-left:0.395%;
+padding:1.795%;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
@@ -404,9 +413,8 @@ border-width:1px;
border-style:solid;
}
-/*Start: FORM NOTICE*/
#form_notice {
-width:458px;
+width:45.664%;
float:left;
position:relative;
line-height:1;
@@ -419,40 +427,30 @@ padding:0;
display:none;
}
#form_notice textarea {
+float:left;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
-width:370px;
+width:80.789%;
height:67px;
line-height:1.5;
padding:7px 7px 16px 7px;
}
#form_notice label {
display:block;
+float:left;
font-size:1.3em;
margin-bottom:7px;
}
-#form_notice .form_data li {
-float:left;
-}
-
-#form_notice #notice_attach_file label,
#form_notice #notice_submit label {
display:none;
}
-
-#form_notice #notice_attachment {
-margin-top:25px;
-margin-left:4px;
-}
-
#form_notice .form_note {
position:absolute;
top:99px;
right:98px;
z-index:9;
}
-
#form_notice .form_note dt {
font-weight:bold;
display:none;
@@ -462,51 +460,28 @@ font-weight:bold;
line-height:1.15;
padding:1px 2px;
}
-
-#form_notice #notice_data-attach_view {
-position:absolute;
-top:25px;
-right:30px;
-margin-left:4px;
+#form_notice #notice_action-submit {
+width:14%;
+height:47px;
padding:0;
-width:16px;
-height:16px;
-border:0;
-text-indent:-9999px;
-}
-#form_notice .form_actions {
position:absolute;
bottom:0;
right:0;
}
-#form_notice .form_actions input.submit {
-width:60px;
-padding:8px;
-}
-
-#form_notice li {
-margin-bottom:0;
-}
-
-#form_notice #notice_to {
-margin-bottom:7px;
-}
-
-#notice_to label {
-float:left;
-margin-right:18px;
+#form_notice label[for=to] {
margin-top:11px;
}
-#notice_to select {
+#form_notice select[id=to] {
+margin-bottom:7px;
+margin-left:18px;
float:left;
}
-/*end FORM NOTICE*/
/* entity_profile */
.entity_profile {
position:relative;
-width:475px;
+width:67.702%;
min-height:123px;
float:left;
margin-bottom:18px;
@@ -536,7 +511,6 @@ margin-bottom:18px;
.entity_profile .entity_tags {
margin-left:113px;
margin-bottom:4px;
-width:322px;
}
.entity_profile .entity_fn,
@@ -564,14 +538,14 @@ display:none;
.entity_profile h2 {
display:none;
}
-
/* entity_profile */
/*entity_actions*/
.entity_actions {
float:right;
-margin-left:28px;
+margin-left:4.35%;
+max-width:25%;
}
.entity_actions h2 {
display:none;
@@ -939,8 +913,6 @@ display:none;
border:0;
padding:0;
}
-/*END: NOTICES */
-
#new_group, #group_search {
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 45176a201..5d8bea8ae 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -1,8 +1,21 @@
/* IE specific styles */
-
-#aside_primary {
-padding-left:11px;
+legend {
+margin-left:-7px;
+}
+input.checkbox {
+top:0;
+}
+#form_notice textarea {
+width:78%;
+}
+#form_notice #notice_action-submit {
+width:17%;
+max-width:17%;
}
+#anon_notice {
+max-width:39%;
+}
+
.notice-options input.submit {
font-size:0;
margin-top:3px;
@@ -11,15 +24,9 @@ text-align:right;
text-indent:0;
width:24px;
}
-
-input.checkbox {
-top:0;
-}
-
-legend {
-margin-left:-7px;
-}
-
.notice div.entry-content .timestamp a {
margin-right:4px;
}
+.entity_profile {
+width:64%;
+}
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 10b31cbcb..76a82c004 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -1,4 +1,17 @@
/* IE6 specific styles */
+address {
+margin-left:7px;
+}
+address .fn {
+display:none;
+}
+#content {
+width:70%;
+}
+#aside_primary {
+padding:5%;
+width:29.5%;
+}
.entity_profile .entity_nickname,
.entity_profile .entity_location,
.entity_profile .entity_url,
@@ -9,3 +22,9 @@ margin-left:0;
.entity_profile .entity_depiction {
margin-bottom:123px;
}
+.entity_actions {
+width:20%;
+}
+.notice div.entry-content {
+width:63%;
+}
diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css
index 3d0455a67..eee98317c 100644
--- a/theme/base/css/mobile.css
+++ b/theme/base/css/mobile.css
@@ -2,14 +2,21 @@
*
* @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/
*/
-/* Go linear. */
+body {
+font-size:2.5em;
+}
+
+#wrap {
+width:95%;
+}
+
#header,
#header address,
-#site_nav_global_primary,
#anon_notice,
#site_nav_local_views .nav,
#form_notice,
@@ -24,49 +31,120 @@
.notice .notice-options a,
.pagination,
.pagination .nav,
-.aside .section { float: none; }
+.aside .section {
+float:none;
+}
.notice-options .notice_reply,
.notice-options .notice_delete,
.notice-options .form_favor,
-.notice-options .form_disfavor { position: static; }
+.notice-options .form_disfavor {
+position:static;
+}
#form_notice,
#anon_notice,
-#content_inner,
-#footer { width: auto; }
-
-/* And liquid. */
-#wrap { width: 95%; }
-
-/* Make things bigger on smaller screens. */
-body { font-size: 2em; }
-.notices { font-size: 1.5em; }
-
-#site_nav_global_primary, #site_nav_global_secondary { text-align: center; }
-
-.notice div.entry-content { margin-left: 0; }
-address { margin: 0; }
-
-#anon_notice, #footer { clear: left; font-size: .5em; }
-
-#form_notice textarea { width: 80%; height: 5em; }
-#form_notice .form_note { right: 20%; top: 6em; }
-#form_notice .form_actions input.submit { width: auto; }
-
-#content { padding: 18px 0; width: 100%; }
-#content h1, #page_notice, #content_inner { padding: 0 18px; }
-.notices .entry-title, .notices div.entry-content { width: 90%; }
-.notice .author .photo { height: 4.5em; width: 4.5em; } /* about double physical size; TODO: do this scaling better */
-.notice-options { position: absolute; top: 0; right: 0; padding-left: 7%; width: 3%; }
-.notice-options .notice_delete a { float: left; } /* Works, but feels like it shouldn't. */
-/* TODO: Make the icons of the notice options bigger. Probably with mobile-specific images. */
-.pagination .nav { overflow: auto; }
-
-#aside_primary { margin: 10px 0 0 0; border: none; padding: 0; width: 100%; }
-#popular_notices { float: none; width: auto; }
-/* Columns for supplemental info. */
-.aside .section { clear: none; padding: 9px; width: 45%; }
-#top_groups_by_post { float: left; }
-#featured_users { float: right; }
-#export_data { display: none; }
+#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
deleted file mode 100644
index 985e4adfa..000000000
--- a/theme/base/css/modal.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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
deleted file mode 100644
index eab4637c0..000000000
--- a/theme/base/css/modal_ie.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * 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/images/icons/icon_processing.gif b/theme/base/images/icons/icon_processing.gif
new file mode 100644
index 000000000..d0bce1542
--- /dev/null
+++ b/theme/base/images/icons/icon_processing.gif
Binary files differ
diff --git a/theme/base/images/x.png b/theme/base/images/x.png
deleted file mode 100644
index c11f7af69..000000000
--- a/theme/base/images/x.png
+++ /dev/null
Binary files differ
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-10-28 18:42:35 +0000