aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-13 16:29:15 -0800
committerfriendica <info@friendica.com>2012-12-13 16:29:15 -0800
commit2ec79dbe9d33c34139ae6deb0faf8c3be14f84dd (patch)
treee51efe236f0cedcb1d2cfd7f7d7e4b359356ea7e
parentdd2483221d3ee639088c0baca62a3472c76ecd1c (diff)
parentde3d8ea8dd570e98cb8b0dc26f241fdc36ef9cae (diff)
downloadvolse-hubzilla-2ec79dbe9d33c34139ae6deb0faf8c3be14f84dd.tar.gz
volse-hubzilla-2ec79dbe9d33c34139ae6deb0faf8c3be14f84dd.tar.bz2
volse-hubzilla-2ec79dbe9d33c34139ae6deb0faf8c3be14f84dd.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--view/theme/redbasic/css/mod_channel.css53
-rw-r--r--view/theme/redbasic/css/mod_events.css97
-rw-r--r--view/theme/redbasic/css/mod_help.css2
-rw-r--r--view/theme/redbasic/css/mod_lostpass.css4
-rw-r--r--view/theme/redbasic/css/mod_profile.css1
-rw-r--r--view/theme/redbasic/css/style.css157
6 files changed, 155 insertions, 159 deletions
diff --git a/view/theme/redbasic/css/mod_channel.css b/view/theme/redbasic/css/mod_channel.css
new file mode 100644
index 000000000..1fd1225d4
--- /dev/null
+++ b/view/theme/redbasic/css/mod_channel.css
@@ -0,0 +1,53 @@
+
+#profile-vcard-break {
+ clear: both;
+}
+
+
+#profile-edit-links ul {
+ list-style-type: none;
+}
+
+#profile-edit-links li {
+ margin-top: 10px;
+}
+
+
+.fn {
+ padding: 0px 0px 5px 0px;
+ font-size: 120%;
+ font-weight: bold;
+ color: #dd0000;
+}
+
+.vcard .title {
+ margin-bottom: 5px;
+ margin-left: 12px;
+}
+
+.vcard dl {
+ clear: both;
+}
+
+#birthday-title {
+ float: left;
+ font-weight: bold;
+}
+
+#birthday-adjust {
+ float: left;
+ font-size: 75%;
+ margin-left: 10px;
+}
+
+#birthday-title-end {
+ clear: both;
+}
+
+.birthday-list {
+ margin-left: 15px;
+}
+
+#birthday-wrapper {
+ margin-bottom: 20px;
+}
diff --git a/view/theme/redbasic/css/mod_events.css b/view/theme/redbasic/css/mod_events.css
index e69de29bb..1a69059a8 100644
--- a/view/theme/redbasic/css/mod_events.css
+++ b/view/theme/redbasic/css/mod_events.css
@@ -0,0 +1,97 @@
+
+.eventcal {
+ float: left;
+ font-size: 20px;
+}
+
+#event-summary-text {
+ margin-top: 15px;
+}
+
+#event-share-checkbox {
+ float: left;
+ margin-top: 10px;
+}
+
+#event-share-text {
+ float: left;
+ margin-top: 10px;
+ margin-left: 5px;
+}
+
+#event-share-break {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+#event-summary {
+ width: 400px;
+}
+
+.vevent {
+ border: 1px solid #CCCCCC;
+}
+
+.vevent .event-summary {
+ margin-left: 10px;
+ margin-right: 10px;
+ font-weight: bold;
+}
+
+.vevent .event-description, .vevent .event-location {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+.vevent .event-start {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+#new-event-link {
+ margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+ float: left;
+ margin-top: 4px;
+ margin-right: 4px;
+ margin-bottom: 15px;
+}
+
+.event-description:before {
+ content: url('../../../../images/calendar.png');
+ margin-right: 15px;
+}
+
+.event-start, .event-end {
+ margin-left: 10px;
+ width: 330px;
+ clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+ float: right;
+}
+
+.event-list-date {
+ margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+ float: left;
+ margin-left: 32px;
+ margin-right: 32px;
+ margin-top: 64px;
+}
+.event-calendar-end {
+ clear: both;
+}
+
+
+.calendar {
+ font-family: Courier, monospace;
+}
+.today {
+ font-weight: bold;
+ color: #FF0000;
+}
diff --git a/view/theme/redbasic/css/mod_help.css b/view/theme/redbasic/css/mod_help.css
index 8d1c8b69c..a4a1c8e20 100644
--- a/view/theme/redbasic/css/mod_help.css
+++ b/view/theme/redbasic/css/mod_help.css
@@ -1 +1 @@
-
+h1 {color: #f00;} \ No newline at end of file
diff --git a/view/theme/redbasic/css/mod_lostpass.css b/view/theme/redbasic/css/mod_lostpass.css
index 8d1c8b69c..667495c35 100644
--- a/view/theme/redbasic/css/mod_lostpass.css
+++ b/view/theme/redbasic/css/mod_lostpass.css
@@ -1 +1,3 @@
-
+/* Not really useful for now - we'll need this when people start adding turing numbers and such */
+
+h3 {color: #f00}
diff --git a/view/theme/redbasic/css/mod_profile.css b/view/theme/redbasic/css/mod_profile.css
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/view/theme/redbasic/css/mod_profile.css
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 46ca47705..30df8f590 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -604,9 +604,7 @@ input#dfrn-url {
#page-profile .title {
font-weight: bold;
}
-#profile-vcard-break {
- clear: both;
-}
+
#profile-extra-links {
clear: both;
margin-top: 10px;
@@ -622,13 +620,6 @@ input#dfrn-url {
margin-top: 5px;
}
-#profile-edit-links ul {
- list-style-type: none;
-}
-
-#profile-edit-links li {
- margin-top: 10px;
-}
.profile-edit-side-div {
float: right;
}
@@ -1792,113 +1783,6 @@ tr.mceLast {
-
-/** acl **/
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
- display:block!important;
-}
-
-#photos-usage-message {
- margin-bottom: 15px;
-}
-
-
-#acl-wrapper {
- width: 690px;
- float:left;
-}
-#acl-search {
- float:right;
- background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
- padding-right:20px;
-}
-#acl-showall {
- float: left;
- display: block;
- width: auto;
- height: 18px;
- background-color: #cccccc;
- background-image: url("../../../../images/show_all_off.png");
- background-position: 7px 7px;
- background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
- -webkit-border-radius: 5px ;
- -moz-border-radius: 5px;
- border-radius: 5px;
- color: #999999;
-}
-#acl-showall.selected {
- color: #000000;
- background-color: #ff9900;
- background-image: url("../../../../images/show_all_on.png");
-}
-
-#acl-list {
- height: 210px;
- border: 1px solid #cccccc;
- clear: both;
- margin-top: 30px;
- overflow: auto;
-}
-#acl-list-content {
-
-}
-.acl-list-item {
- display: block;
- width: 150px;
- height: 30px;
- border: 1px solid #cccccc;
- margin: 5px;
- float: left;
-}
-.acl-list-item img{
- width:22px;
- height: 22px;
- float: left;
- margin: 4px;
-}
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a {
- font-size: 8px;
- display: block;
- width: 40px;
- height: 10px;
- float: left;
- color: #999999;
- background-color: #cccccc;
- background-position: 3px 3px;
- background-repeat: no-repeat;
- margin-right: 5px;
- -webkit-border-radius: 5px ;
- -moz-border-radius: 5px;
- border-radius: 5px;
- padding-left: 15px;
-}
-#acl-wrapper a:hover {
- text-decoration: none;
- color:#000000;
-}
-.acl-button-show { background-image: url("../../../../images/show_off.png"); }
-.acl-button-hide { background-image: url("../../../../images/hide_off.png"); }
-
-.acl-button-show.selected {
- color: #000000;
- background-color: #9ade00;
- background-image: url("../../../../images/show_on.png");
-}
-.acl-button-hide.selected {
- color: #000000;
- background-color: #ff4141;
- background-image: url("../../../../images/hide_on.png");
-}
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
-/** /acl **/
-
-
-
#group-new-submit-wrapper {
margin-top: 30px;
}
@@ -2270,45 +2154,6 @@ aside input[type='text'] {
/* end from default */
-.fn {
- padding: 0px 0px 5px 0px;
- font-size: 120%;
- font-weight: bold;
- color: #dd0000;
-}
-
-.vcard .title {
- margin-bottom: 5px;
- margin-left: 12px;
-}
-
-.vcard dl {
- clear: both;
-}
-
-#birthday-title {
- float: left;
- font-weight: bold;
-}
-
-#birthday-adjust {
- float: left;
- font-size: 75%;
- margin-left: 10px;
-}
-
-#birthday-title-end {
- clear: both;
-}
-
-.birthday-list {
- margin-left: 15px;
-}
-
-#birthday-wrapper {
- margin-bottom: 20px;
-}
-
#network-new-link {
margin-top: 15px;
margin-bottom: 15px;