aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpafcu <pafcu@iki.fi>2014-12-31 12:01:16 +0200
committerpafcu <pafcu@iki.fi>2014-12-31 12:01:16 +0200
commit8fa27efa7e367ab67325609420eccb9e02c8eb41 (patch)
treefdf7577c0b602a1f8b86401572e53cfe90cf2474
parent24a16434bccb7b41d026767f81ffe5f060d566bf (diff)
parent8c8a10b8195c520f39af6dd70f8b1622b5142501 (diff)
downloadvolse-hubzilla-8fa27efa7e367ab67325609420eccb9e02c8eb41.tar.gz
volse-hubzilla-8fa27efa7e367ab67325609420eccb9e02c8eb41.tar.bz2
volse-hubzilla-8fa27efa7e367ab67325609420eccb9e02c8eb41.zip
Merge pull request #801 from friendica/revert-799-cssrefactor
Revert "Move mod_profiles.css content back into style.css, since it cont...
-rw-r--r--view/theme/redbasic/css/mod_profiles.css39
-rw-r--r--view/theme/redbasic/css/style.css41
2 files changed, 39 insertions, 41 deletions
diff --git a/view/theme/redbasic/css/mod_profiles.css b/view/theme/redbasic/css/mod_profiles.css
index e69de29bb..b2b9a9d01 100644
--- a/view/theme/redbasic/css/mod_profiles.css
+++ b/view/theme/redbasic/css/mod_profiles.css
@@ -0,0 +1,39 @@
+#profile-edit-wrapper .field label {
+ margin-top: 20px;
+ width: 175px;
+}
+
+#profile-edit-wrapper .field input[type="text"] {
+ margin-top: 20px;
+ width: 220px;
+}
+
+
+#profile-edit-links {
+ max-width: $converse_width;
+ padding-top: 15px;
+ padding-bottom: 15px;
+}
+
+#profile-edit-links .btn {
+ margin: 0 10px 15px 0;
+}
+
+.profile-import {
+ vertical-align: top;
+ text-align: left;
+}
+
+.profile-import b {
+ color: $link_colour;
+}
+
+.profile-import input {
+ color: $font_colour;
+ border: none;
+}
+
+#profile-edit-drop-link {
+ color: #FFF;
+ font-weight: normal;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6c620da1d..50b21add9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2216,44 +2216,3 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
border: 1px solid #cccccc;
}
-
-/* Should really go in mod_profiles.css, but since it includes variables it's here instead. A solution would be to handle variables in mod_profiles.css and other CSS files as well.
-#profile-edit-wrapper .field label {
- margin-top: 20px;
- width: 175px;
-}
-
-#profile-edit-wrapper .field input[type="text"] {
- margin-top: 20px;
- width: 220px;
-}
-
-
-#profile-edit-links {
- max-width: $converse_width;
- padding-top: 15px;
- padding-bottom: 15px;
-}
-
-#profile-edit-links .btn {
- margin: 0 10px 15px 0;
-}
-
-.profile-import {
- vertical-align: top;
- text-align: left;
-}
-
-.profile-import b {
- color: $link_colour;
-}
-
-.profile-import input {
- color: $font_colour;
- border: none;
-}
-
-#profile-edit-drop-link {
- color: #FFF;
- font-weight: normal;
-}