diff options
author | pafcu <pafcu@iki.fi> | 2014-12-30 22:42:34 +0200 |
---|---|---|
committer | pafcu <pafcu@iki.fi> | 2014-12-30 22:42:34 +0200 |
commit | 43671a0a323afa758df56c06822ce3c46da026df (patch) | |
tree | 515c2f742a5a39e18b00debf1849ee9703fa4a42 | |
parent | 0623b472371db80c94b02ab1388436b49a746b46 (diff) | |
parent | 6501c4d93e541ae401c904f8a6a705c02a570371 (diff) | |
download | volse-hubzilla-43671a0a323afa758df56c06822ce3c46da026df.tar.gz volse-hubzilla-43671a0a323afa758df56c06822ce3c46da026df.tar.bz2 volse-hubzilla-43671a0a323afa758df56c06822ce3c46da026df.zip |
Merge pull request #792 from pafcu/cssrefactor
Make redbasic css more modular
-rw-r--r-- | view/theme/redbasic/css/mod_events.css | 23 | ||||
-rw-r--r-- | view/theme/redbasic/css/mod_group.php | 32 | ||||
-rw-r--r-- | view/theme/redbasic/css/mod_profile_photo.css | 10 | ||||
-rw-r--r-- | view/theme/redbasic/css/mod_profiles.css | 39 | ||||
-rw-r--r-- | view/theme/redbasic/css/mod_profperm.css | 32 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 154 |
6 files changed, 146 insertions, 144 deletions
diff --git a/view/theme/redbasic/css/mod_events.css b/view/theme/redbasic/css/mod_events.css new file mode 100644 index 000000000..4b93932f0 --- /dev/null +++ b/view/theme/redbasic/css/mod_events.css @@ -0,0 +1,23 @@ +#event-start-text, #event-finish-text { + margin-top: 10px; + margin-bottom: 5px; +} + +#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text { + float: left; +} +#event-datetime-break { + margin-bottom: 10px; +} + +#event-nofinish-break, #event-adjust-break { + clear: both; +} + +#event-desc-text, #event-location-text { + margin-top: 10px; + margin-bottom: 5px; +} +#event-submit { + margin-top: 10px; +} diff --git a/view/theme/redbasic/css/mod_group.php b/view/theme/redbasic/css/mod_group.php new file mode 100644 index 000000000..d1f48a84c --- /dev/null +++ b/view/theme/redbasic/css/mod_group.php @@ -0,0 +1,32 @@ +#group-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} + +#group-members-end { + clear: both; +} + +#group-separator { + margin-top: 10px; + margin-bottom: 10px; +} + +#group-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} + +#group-all-contacts-end { + clear: both; + margin-bottom: 10px; +} + +#group-edit-desc { + margin-top: 15px; +} diff --git a/view/theme/redbasic/css/mod_profile_photo.css b/view/theme/redbasic/css/mod_profile_photo.css new file mode 100644 index 000000000..beda7da4c --- /dev/null +++ b/view/theme/redbasic/css/mod_profile_photo.css @@ -0,0 +1,10 @@ + +#cropimage-wrapper, #cropimage-preview-wrapper { + float: left; + padding: 30px; +} + +#crop-image-form { + margin-top: 30px; + clear: both; +} diff --git a/view/theme/redbasic/css/mod_profiles.css b/view/theme/redbasic/css/mod_profiles.css new file mode 100644 index 000000000..b2b9a9d01 --- /dev/null +++ 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/mod_profperm.css b/view/theme/redbasic/css/mod_profperm.css new file mode 100644 index 000000000..dabd0ceaa --- /dev/null +++ b/view/theme/redbasic/css/mod_profperm.css @@ -0,0 +1,32 @@ +#prof-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-members-end { + clear: both; +} + +#prof-separator { + margin-top: 10px; + margin-bottom: 10px; +} + +#prof-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-all-contacts-end { + clear: both; + margin-bottom: 10px; +} + +#prof-edit-desc { + margin-top: 15px; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b778c43b5..fccf4ec87 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -358,61 +358,11 @@ footer { margin-top: 10px; } - -#cropimage-wrapper, #cropimage-preview-wrapper { - float: left; - padding: 30px; -} - -#crop-image-form { - margin-top: 30px; - clear: both; -} - +// Not used anymore? #page-profile .title { font-weight: bold; } -#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; -} - .fn { font-weight: bold; font-size: 16px; @@ -1044,15 +994,18 @@ footer { margin: 10px; } +/* Not used anymore? */ #identity-manage-desc { margin-top:15px; margin-bottom: 15px; } +/* Not used anymore? */ #identity-manage-choose { margin-bottom: 15px; } +/* Not used anymore? */ #identity-submit { margin-top: 20px; } @@ -1100,114 +1053,27 @@ footer { .side-link { margin-bottom: 15px; } - -#group-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; -} - -#group-members-end { - clear: both; -} - -#group-separator { - margin-top: 10px; - margin-bottom: 10px; -} - -#group-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; -} - -#group-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - -#group-edit-desc { - margin-top: 15px; -} - - -#prof-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; -} - -#prof-members-end { - clear: both; -} - -#prof-separator { - margin-top: 10px; - margin-bottom: 10px; -} - -#prof-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; -} - -#prof-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - -#prof-edit-desc { - margin-top: 15px; -} - - .required { color: #FF0000; } -#event-start-text, #event-finish-text { - margin-top: 10px; - margin-bottom: 5px; -} - -#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text { - float: left; -} -#event-datetime-break { - margin-bottom: 10px; -} - -#event-nofinish-break, #event-adjust-break { - clear: both; -} - -#event-desc-text, #event-location-text { - margin-top: 10px; - margin-bottom: 5px; -} -#event-submit { - margin-top: 10px; -} - +/* Not used anymore? */ #item-delete-selected { margin-top: 30px; } +/* Not used anymore? */ #item-delete-selected-end { clear: both; } + +/* Not used anymore? */ #item-delete-selected-icon, #item-delete-selected-desc { float: left; margin-right: 5px; } + +/* Not used anymore? */ #item-delete-selected-desc:hover { text-decoration: underline; } |