aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-11 15:32:25 -0800
committerfriendica <info@friendica.com>2013-12-11 15:32:25 -0800
commitc57b6745e8d7222d9cecfb04cd81c9ef7eb25d05 (patch)
treecc9eef5ea3c6676cd537f2f89776ab6d3c835db1 /view/theme
parent2c02f57f276658269a6cc2031fb0fc9ac0a9077c (diff)
parent06c81e189f031a74c54aa14b1f29c93379e7cf3c (diff)
downloadvolse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.gz
volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.bz2
volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.zip
Merge https://github.com/friendica/red into zpull
Conflicts: view/theme/redbasic/css/style.css
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css148
1 files changed, 42 insertions, 106 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b7883f42e..9b45102cf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -327,11 +327,8 @@ footer {
margin-bottom: 15px;
}
-#group-sidebar {
- margin-bottom: 10px;
-}
-
-.group-selected, .nets-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+/*TODO: we should use one class for all this, nets-selected probably obsolete */
+.group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active {
color: #444444 !important;
}
@@ -671,36 +668,6 @@ footer {
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
}
-
-#datebrowse-sidebar select {
- margin-left: 25px;
- border-radius: $radiuspx;
- -moz-border-radius: $radiuspx;
- opacity: 0.3;
- filter:alpha(opacity=30);
-}
-
-#datebrowse-sidebar select:hover {
- opacity: 1.0;
- filter:alpha(opacity=100);
-}
-
-#posted-date-selector {
- margin-left: 30px !important;
- margin-top: 5px !important;
- margin-right: 0px !important;
- margin-bottom: 0px !important;
-}
-
-#posted-date-selector:hover {
- box-shadow: 4px 4px 3px 0 #444444;
- margin-left: 25px !important;
- margin-top: 0px !important;
- margin-right: 5px !important;
- margin-bottom: 5px !important;
-
-}
-
#side-bar-photos-albums {
margin-top: 15px;
}
@@ -767,27 +734,12 @@ footer {
#netsearch-box { margin-bottom: 5px; }
-#sidebar-group-list ul {
- list-style-type: none;
-}
-
-#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
- display: inline-block;
- height: 12px;
- width: 12px;
-}
-
-#sidebar-group-list li,
-.saved-search-li {
- margin-top: 3px;
-}
-
-
-.nets-ul, .fileas-ul, .categories-ul {
+/* might be obsolete
+.nets-ul {
list-style-type: none;
}
-.nets-ul li, .fileas-ul li, .categories-ul li {
+.nets-ul li {
margin-top: 10px;
}
@@ -797,45 +749,17 @@ footer {
.nets-all {
margin-left: 42px;
}
-
-.fileas-link, .categories-link {
- margin-left: 24px;
-}
-
-.fileas-all, .categories-all {
- margin-left: 0px;
-}
+*/
#search-save {
margin-left: 5px;
}
-.groupsideedit {
- margin-right: 10px;
-}
-
-#saved-search-ul {
- list-style-type: none;
-}
-
-.saved-search-li i {
- opacity: 0;
-}
-
-.saved-search-li:hover i {
- opacity: 1;
-}
-
-
-
-.savedsearchterm {
- margin-left: 10px;
-}
-
#side-follow-wrapper {
margin-top: 20px;
}
-#side-follow-url, #side-peoplefind-url {
+
+#side-peoplefind-url {
margin-top: 5px;
}
@@ -851,7 +775,7 @@ footer {
font-family: FontAwesome;
}
-#side-follow-submit, #side-peoplefind-submit {
+#side-peoplefind-submit {
margin-top: 15px;
}
@@ -860,7 +784,7 @@ footer {
}
-.widget, .pmenu {
+.pmenu {
border-bottom: 1px solid #eec;
padding: 8px;
margin-top: 5px;
@@ -1679,12 +1603,6 @@ div.jGrowl div.info {
text-overflow: ellipsis;
}
-#datebrowse-sidebar select {
- margin-left: 25px;
-}
-
-
-
.jslider .jslider-scale ins {
color: #333;
font-size: $body_font_size;
@@ -2255,11 +2173,6 @@ text-decoration: none;
list-style-type: none;
}
-.group-edit-icon,
-.savedsearchdrop {
- opacity: 0;
-}
-
.admin-icons {
color: $toolicon_colour;
margin-right: 10px;
@@ -2395,8 +2308,6 @@ img.mail-list-sender-photo {
max-width: $converse_width;
}
-/* conv_item */
-
.wall-item-content-wrapper {
border-radius: $radiuspx;
background-color: $item_colour;
@@ -2500,8 +2411,6 @@ img.mail-list-sender-photo {
color: $toolicon_colour;
}
-/* comment_item */
-
.my-comment-photo {
border-radius: $radiuspx;
-moz-border-radius: $radiuspx;
@@ -2538,15 +2447,35 @@ img.mail-list-sender-photo {
.comment-edit-text-full {
color: black;
}
-.suggest-widget-more { margin-top: 10px; }
+/* widgets */
+
+.widget {
+ border-bottom: 1px solid #eec;
+ -moz-border-radius: $radiuspx;
+ -webkit-border-radius: $radiuspx;
+ border-radius: $radiuspx;
+}
#note-text {
- width: 190px;
- max-width: 190px;
- height: 150px;
+ border: 1px solid #ccc;
+ border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
+}
+
+#saved-search-ul {
+ list-style-type: none;
+}
+
+.fileas-ul {
+ list-style-type: none;
+}
+
+#datebrowse-sidebar select {
+ border: 1px solid #ccc;
+ border-radius: $radiuspx;
+ -moz-border-radius: $radiuspx;
}
-#note-save { margin-top: 10px; }
/* need to put these back in the theme for now - used in more than one module */
@@ -2600,4 +2529,11 @@ img.mail-list-sender-photo {
}
.contact-entry-end {
clear: both;
+
+.categories-ul {
+ list-style-type: none;
+}
+
+#sidebar-group-list ul {
+ list-style-type: none;
}