aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpafcu <pafcu@iki.fi>2014-12-31 11:31:15 +0200
committerpafcu <pafcu@iki.fi>2014-12-31 11:31:15 +0200
commit24a16434bccb7b41d026767f81ffe5f060d566bf (patch)
treee321c9473ef52f5de584221075f13054119a5965
parenta54f168463abd0657d28bd0223b1b6907fd7bdb3 (diff)
parent5e6fa5a830de37ee7c65da29ad62a42be891ab3b (diff)
downloadvolse-hubzilla-24a16434bccb7b41d026767f81ffe5f060d566bf.tar.gz
volse-hubzilla-24a16434bccb7b41d026767f81ffe5f060d566bf.tar.bz2
volse-hubzilla-24a16434bccb7b41d026767f81ffe5f060d566bf.zip
Merge pull request #799 from pafcu/cssrefactor
Move mod_profiles.css content back into style.css, since it contains var...
-rw-r--r--view/theme/redbasic/css/mod_profiles.css39
-rw-r--r--view/theme/redbasic/css/style.css41
2 files changed, 41 insertions, 39 deletions
diff --git a/view/theme/redbasic/css/mod_profiles.css b/view/theme/redbasic/css/mod_profiles.css
index b2b9a9d01..e69de29bb 100644
--- a/view/theme/redbasic/css/mod_profiles.css
+++ b/view/theme/redbasic/css/mod_profiles.css
@@ -1,39 +0,0 @@
-#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 50b21add9..6c620da1d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2216,3 +2216,44 @@ 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;
+}