From a00d88bbaf74cc2a3b1864a84c31a52286f11e5e Mon Sep 17 00:00:00 2001 From: pafcu Date: Wed, 31 Dec 2014 12:01:42 +0200 Subject: Revert "Make redbasic css more modular" --- view/theme/redbasic/css/mod_events.css | 23 ---- view/theme/redbasic/css/mod_group.php | 32 ------ view/theme/redbasic/css/mod_profile_photo.css | 10 -- view/theme/redbasic/css/mod_profiles.css | 39 ------- view/theme/redbasic/css/mod_profperm.css | 32 ------ view/theme/redbasic/css/style.css | 154 ++++++++++++++++++++++++-- 6 files changed, 144 insertions(+), 146 deletions(-) delete mode 100644 view/theme/redbasic/css/mod_events.css delete mode 100644 view/theme/redbasic/css/mod_group.php delete mode 100644 view/theme/redbasic/css/mod_profile_photo.css delete mode 100644 view/theme/redbasic/css/mod_profiles.css delete mode 100644 view/theme/redbasic/css/mod_profperm.css (limited to 'view/theme') diff --git a/view/theme/redbasic/css/mod_events.css b/view/theme/redbasic/css/mod_events.css deleted file mode 100644 index 4b93932f0..000000000 --- a/view/theme/redbasic/css/mod_events.css +++ /dev/null @@ -1,23 +0,0 @@ -#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 deleted file mode 100644 index d1f48a84c..000000000 --- a/view/theme/redbasic/css/mod_group.php +++ /dev/null @@ -1,32 +0,0 @@ -#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 deleted file mode 100644 index beda7da4c..000000000 --- a/view/theme/redbasic/css/mod_profile_photo.css +++ /dev/null @@ -1,10 +0,0 @@ - -#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 deleted file mode 100644 index b2b9a9d01..000000000 --- a/view/theme/redbasic/css/mod_profiles.css +++ /dev/null @@ -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/mod_profperm.css b/view/theme/redbasic/css/mod_profperm.css deleted file mode 100644 index dabd0ceaa..000000000 --- a/view/theme/redbasic/css/mod_profperm.css +++ /dev/null @@ -1,32 +0,0 @@ -#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 50b21add9..60760509d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -358,11 +358,61 @@ footer { margin-top: 10px; } -// Not used anymore? + +#cropimage-wrapper, #cropimage-preview-wrapper { + float: left; + padding: 30px; +} + +#crop-image-form { + margin-top: 30px; + clear: both; +} + #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; @@ -994,18 +1044,15 @@ 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; } @@ -1053,27 +1100,114 @@ 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; } -/* Not used anymore? */ +#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; +} + #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; } -- cgit v1.2.3