aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2014-04-17 05:46:45 +0000
committerjeroenpraat <jeroenpraat@xs4all.nl>2014-04-17 05:46:45 +0000
commit0d0751b9257314dd8972ccf3e214f3e8cc43f7e5 (patch)
tree6f37ebc558439ca8da6d9f0ffb94b72d3f1beb91 /view/theme
parent68545ceeb61cd833f6560156cf2ced9c9ecd6c43 (diff)
parent962665b8b56491dc59a62f2cb5c05eb353abb79f (diff)
downloadvolse-hubzilla-0d0751b9257314dd8972ccf3e214f3e8cc43f7e5.tar.gz
volse-hubzilla-0d0751b9257314dd8972ccf3e214f3e8cc43f7e5.tar.bz2
volse-hubzilla-0d0751b9257314dd8972ccf3e214f3e8cc43f7e5.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css61
1 files changed, 18 insertions, 43 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 60d0f4bc6..da3849925 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -228,6 +228,16 @@ footer {
margin-bottom: 15px;
}
+aside ul {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+aside li {
+ margin-top: 5px;
+}
+
/*TODO: we should use one class for all this. */
.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
color: $selected_active_colour !important;
@@ -470,18 +480,6 @@ footer {
}
-.settings-widget ul {
- list-style-type: none;
- padding: 0px;
-}
-
-.settings-widget li {
- margin-left: 24px;
- margin-bottom: 8px;
-}
-
-
-
#fsuggest-desc, #fsuggest-submit-wrapper {
margin-top: 15px;
margin-bottom: 15px;
@@ -631,35 +629,19 @@ footer {
color: #0080FF;
}
-#netsearch-box { margin-bottom: 5px; }
-
-#search-save {
- margin: 5px 0 0 5px;
-}
#side-follow-wrapper {
margin-top: 20px;
}
-#side-peoplefind-url {
- margin-top: 5px;
-}
-
-#side-peoplefind-url {
- font-size: 1em;
-}
-
-#side-peoplefind-url::-webkit-input-placeholder {
+#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder {
font-family: FontAwesome;
}
-#side-peoplefind-url::-moz-placeholder {
+#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder {
font-family: FontAwesome;
}
-#side-peoplefind-submit {
- margin-top: 15px;
-}
#side-match-link {
margin-top: 10px;
@@ -1121,14 +1103,6 @@ footer {
}
-#netsearch-box {
- margin-top: 20px;
-}
-
-#netsearch-box #search-submit {
- margin: 5px 0px 0px 0px;
-}
-
.required {
color: #FF0000;
}
@@ -1236,6 +1210,10 @@ brain is weird like that */
}
+.field input[type="checkbox"] {
+ width: 16px;
+}
+
.field .onoff {
float: left;
width: 80px;
@@ -1768,10 +1746,6 @@ margin-right: 50px;
list-style-type: none;
}
-.pmenu li {
- margin-left: -20px;
-}
-
.admin-icons {
font-size: 1.2em;
color: $toolicon_colour;
@@ -2103,7 +2077,7 @@ img.mail-list-sender-photo {
border-radius: $radiuspx;
-moz-border-radius: $radiuspx;
}
-
+/*
.categories-ul {
list-style-type: none;
}
@@ -2111,6 +2085,7 @@ img.mail-list-sender-photo {
#sidebar-group-list ul, #posted-date-selector {
list-style-type: none;
}
+*/
.profile-thing-list img, .thing-show img, .thing-edit-links a {
margin-top: 8px;