From 801ab709adfa808072f70fe1bf4b712ddc33df42 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 28 Dec 2014 18:16:27 +0100 Subject: more work on files --- view/theme/redbasic/css/style.css | 59 +++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 27 deletions(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7a6c13798..6f8b2a6a6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1774,7 +1774,6 @@ img.mail-list-sender-photo { color: #777; } -#jot-perms-icon, .jot-icons { color: $toolicon_colour; } @@ -2031,6 +2030,38 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ color: $nav_active_icon_colour; } +.section-title-wrapper { + padding: 7px 10px; + background-color: $item_colour; + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; + margin-bottom: 3px; +} + +.section-title-wrapper h2 { + margin-top: 0px; + margin-bottom: 0px; +} + +.section-content-tools-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + margin-bottom: 3px; +} + +.section-content-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; +} + +[id^="cloud-index-"]:hover, +.cloud-index-active { + background-color: $item_colour; +} + + /* bootstrap overrides */ blockquote { @@ -2226,32 +2257,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); } -.section-title-wrapper { - padding: 7px 10px; - background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; - margin-bottom: 3px; -} - -.section-title-wrapper h2 { - margin-top: 0px; - margin-bottom: 0px; -} - -.section-content-tools-wrapper { - padding: 7px 10px; - background-color: $comment_item_colour; - margin-bottom: 3px; -} - -.section-content-wrapper { - padding: 7px 10px; - background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; -} - @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); -- cgit v1.2.3 From 1ab23061df0c92abd6a9ed5ece1507cf19efff58 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 28 Dec 2014 20:34:12 +0100 Subject: files css fixes --- view/theme/redbasic/css/style.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6f8b2a6a6..15cf64aff 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2056,12 +2056,15 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ border-bottom-right-radius: $radiuspx; } +#cloud-index tr { + background-color: $comment_item_colour; +} + [id^="cloud-index-"]:hover, .cloud-index-active { - background-color: $item_colour; + background-color: $item_colour !important; } - /* bootstrap overrides */ blockquote { -- cgit v1.2.3 From fa23439b9cb93869985be14bc150c5a6a702ccce Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 28 Dec 2014 20:46:16 +0100 Subject: more files css fixes --- view/theme/redbasic/css/style.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 15cf64aff..357718623 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2056,13 +2056,15 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ border-bottom-right-radius: $radiuspx; } -#cloud-index tr { +.section-content-wrapper-np { background-color: $comment_item_colour; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; } [id^="cloud-index-"]:hover, .cloud-index-active { - background-color: $item_colour !important; + background-color: $item_colour; } /* bootstrap overrides */ -- cgit v1.2.3 From de338b3dd70c913c9d168bd10df6cff3d282642a Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Mon, 29 Dec 2014 20:43:24 +0100 Subject: Show some notification badges in red to indicate they are about you --- view/theme/redbasic/css/style.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 357718623..bd08ae4a4 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2087,6 +2087,20 @@ nav .badge:hover { background-color: #999; } +nav .badge.home-update, +nav .badge.notify-update, +nav .badge.intro-update, +nav .badge.mail-update { + background-color:#C9302C; +} + +nav .badge.home-update:hover, +nav .badge.notify-update:hover, +nav .badge.intro-update:hover, +nav .badge.mail-update:hover { + background-color:#D9534F; +} + .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; -- cgit v1.2.3 From f2bfdf0c76d2cce95f136b5240a6d7aa18bea8dc Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 29 Dec 2014 22:45:07 +0100 Subject: some work on cloud actionspanel and minor cleanup --- view/theme/redbasic/css/style.css | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 357718623..b778c43b5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -689,18 +689,6 @@ footer { overflow: hidden; } -#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { - color: #8888FF; - text-decoration: none; - cursor: pointer; -} - -#photos-upload-perms-menu:hover { - color: #0000FF; - text-decoration: underline; - cursor: pointer; -} - #photo-view-wrapper { background-color: $item_colour; } -- cgit v1.2.3 From 6501c4d93e541ae401c904f8a6a705c02a570371 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Tue, 30 Dec 2014 11:32:00 +0100 Subject: 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, 146 insertions(+), 144 deletions(-) create mode 100644 view/theme/redbasic/css/mod_events.css create mode 100644 view/theme/redbasic/css/mod_group.php create mode 100644 view/theme/redbasic/css/mod_profile_photo.css create mode 100644 view/theme/redbasic/css/mod_profiles.css create mode 100644 view/theme/redbasic/css/mod_profperm.css (limited to 'view/theme/redbasic/css') 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 7a6c13798..c5be3e1d6 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; @@ -1056,15 +1006,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; } @@ -1112,114 +1065,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; } -- cgit v1.2.3 From 5e6fa5a830de37ee7c65da29ad62a42be891ab3b Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Wed, 31 Dec 2014 10:26:05 +0100 Subject: Move mod_profiles.css content back into style.css, since it contains variables --- view/theme/redbasic/css/mod_profiles.css | 39 ------------------------------ view/theme/redbasic/css/style.css | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 39 deletions(-) (limited to 'view/theme/redbasic/css') 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 c5be3e1d6..de323b054 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2204,3 +2204,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; +} -- cgit v1.2.3 From 8c8a10b8195c520f39af6dd70f8b1622b5142501 Mon Sep 17 00:00:00 2001 From: pafcu Date: Wed, 31 Dec 2014 12:00:47 +0200 Subject: Revert "Move mod_profiles.css content back into style.css, since it contains var..." --- view/theme/redbasic/css/mod_profiles.css | 39 ++++++++++++++++++++++++++++++ view/theme/redbasic/css/style.css | 41 -------------------------------- 2 files changed, 39 insertions(+), 41 deletions(-) (limited to 'view/theme/redbasic/css') 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; -} -- cgit v1.2.3 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/redbasic/css') 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 From 70f0019905f8c44ed875379a9af65988e536b4f4 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 1 Jan 2015 10:08:20 +0100 Subject: Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic --- view/theme/redbasic/css/style.css | 81 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 6 deletions(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 60760509d..f88febf4d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -301,14 +301,13 @@ footer { #main-login #id_remember { float: left; padding: 0; - margin-top: 15px; margin-bottom: 0; margin-left: 0; width: 20px; } -#main-login .field.checkbox label { - margin-top: 15px; +/* first-of-type needed to style switches */ +#main-login .field.checkbox label:first-of-type { margin-bottom: 0; float: left; width: 100px; @@ -373,13 +372,15 @@ footer { font-weight: bold; } -#profile-edit-wrapper .field label { +#profile-edit-wrapper .field { margin-top: 20px; +} +/* first-of-type needed to style switches */ +#profile-edit-wrapper .field label:first-of-type { width: 175px; } #profile-edit-wrapper .field input[type="text"] { - margin-top: 20px; width: 220px; } @@ -1242,7 +1243,8 @@ footer { width: 100% } -.field label { +/* first-of-type needed to style switches */ +.field label:first-of-type { float: left; width: 350px; } @@ -1296,6 +1298,8 @@ footer { .hidden { display: none!important; } .field.radio .field_help { margin-left: 0px; } +.field.checkbox .field_help { display: inline; margin-left: 10px; } + /** * OAuth @@ -2350,3 +2354,68 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { .jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus { border: 1px solid #cccccc; } + +/* Hide the placeholder label which is used for styling switches */ +/* Many places give a width to all labels, so need to specifically set these to 0 width */ +/* This should probably be moved to core */ +.field.checkbox label:nth-of-type(2) { + width: 0px; + margin: 0px; + float: none; +} + +/* Turn checkboxes into switches */ +/* Doesn't work with IE<9. */ +.field.checkbox input { + position: absolute; + margin-left: -9999px; + visibility: hidden; +} +.field.checkbox input + label:nth-of-type(2) { + display: block; + position: relative; + cursor: pointer; + outline: none; + user-select: none; + + padding: 2px; + width: 60px; + height: 24px; + background-color: #dddddd; + border-radius: 60px; + transition: background 0.4s; + + float:left; +} + +.field.checkbox input + label:before, +.field.checkbox input + label:after { + display: block; + position: absolute; + content: ""; +} +.field.checkbox input + label:before { + top: 2px; + left: 2px; + bottom: 2px; + right: 2px; + background-color: #fff; + border-radius: 30px; + transition: background 0.4s; +} +.field.checkbox input + label:after { + top: 4px; + left: 4px; + bottom: 4px; + width: 30px; + background-color: #dddddd; + border-radius: 30px; + transition: margin 0.4s, background 0.4s; +} +.field.checkbox input:checked + label { + background-color: #8ce196; +} +.field.checkbox input:checked + label:after { + margin-left: 22px; + background-color: #8ce196; +} -- cgit v1.2.3 From ef6680f7adfeacb0e7614c509e8861f08ff066e8 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 1 Jan 2015 11:33:00 +0100 Subject: Possibly make switches work on IE8 (untested) --- view/theme/redbasic/css/style.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f88febf4d..61acc8ec7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -307,6 +307,7 @@ footer { } /* first-of-type needed to style switches */ +#main-login .field.checkbox label.mainlabel, #main-login .field.checkbox label:first-of-type { margin-bottom: 0; float: left; @@ -376,6 +377,7 @@ footer { margin-top: 20px; } /* first-of-type needed to style switches */ +#profile-edit-wrapper .field label.mainlabel, #profile-edit-wrapper .field label:first-of-type { width: 175px; } @@ -1244,6 +1246,7 @@ footer { } /* first-of-type needed to style switches */ +.field label.mainlabel, .field label:first-of-type { float: left; width: 350px; @@ -2358,6 +2361,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { /* Hide the placeholder label which is used for styling switches */ /* Many places give a width to all labels, so need to specifically set these to 0 width */ /* This should probably be moved to core */ +.field.checkbox label.switchlabel, .field.checkbox label:nth-of-type(2) { width: 0px; margin: 0px; @@ -2371,6 +2375,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { margin-left: -9999px; visibility: hidden; } +.field.checkbox input + label.switchlabel, .field.checkbox input + label:nth-of-type(2) { display: block; position: relative; -- cgit v1.2.3 From 42773a11220a5bba7bdf3395e3f00913dce9f5a0 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Fri, 2 Jan 2015 18:14:23 +0100 Subject: Reworked switch to also display text --- view/theme/redbasic/css/style.css | 122 +++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 66 deletions(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 61acc8ec7..63cf27d58 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -306,9 +306,7 @@ footer { width: 20px; } -/* first-of-type needed to style switches */ -#main-login .field.checkbox label.mainlabel, -#main-login .field.checkbox label:first-of-type { +#main-login .field.checkbox > label { margin-bottom: 0; float: left; width: 100px; @@ -376,9 +374,7 @@ footer { #profile-edit-wrapper .field { margin-top: 20px; } -/* first-of-type needed to style switches */ -#profile-edit-wrapper .field label.mainlabel, -#profile-edit-wrapper .field label:first-of-type { +#profile-edit-wrapper .field > label { width: 175px; } @@ -1245,9 +1241,7 @@ footer { width: 100% } -/* first-of-type needed to style switches */ -.field label.mainlabel, -.field label:first-of-type { +.field > label { float: left; width: 350px; } @@ -2358,69 +2352,65 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { border: 1px solid #cccccc; } -/* Hide the placeholder label which is used for styling switches */ -/* Many places give a width to all labels, so need to specifically set these to 0 width */ -/* This should probably be moved to core */ -.field.checkbox label.switchlabel, -.field.checkbox label:nth-of-type(2) { - width: 0px; - margin: 0px; - float: none; -} + /* Turn checkboxes into switches */ -/* Doesn't work with IE<9. */ +.field.checkbox .fieldhelp { vertical-align:top; } +.field.checkbox > div { + position: relative; width: 70px; + -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; + display:inline-block; +} + .field.checkbox input { - position: absolute; - margin-left: -9999px; - visibility: hidden; + display: none; } -.field.checkbox input + label.switchlabel, -.field.checkbox input + label:nth-of-type(2) { - display: block; - position: relative; - cursor: pointer; - outline: none; - user-select: none; - padding: 2px; - width: 60px; - height: 24px; - background-color: #dddddd; - border-radius: 60px; - transition: background 0.4s; +.field.checkbox > div label { + display: block; overflow: hidden; cursor: pointer; + border: 2px solid #999999; + border-radius: 20px; + margin:0px; +} - float:left; +.onoffswitch-inner { + display: block; width: 200%; margin-left: -100%; + -moz-transition: margin 0.3s ease-in 0s; -webkit-transition: margin 0.3s ease-in 0s; + -o-transition: margin 0.3s ease-in 0s; transition: margin 0.3s ease-in 0s; } -.field.checkbox input + label:before, -.field.checkbox input + label:after { - display: block; - position: absolute; - content: ""; -} -.field.checkbox input + label:before { - top: 2px; - left: 2px; - bottom: 2px; - right: 2px; - background-color: #fff; - border-radius: 30px; - transition: background 0.4s; -} -.field.checkbox input + label:after { - top: 4px; - left: 4px; - bottom: 4px; - width: 30px; - background-color: #dddddd; - border-radius: 30px; - transition: margin 0.4s, background 0.4s; -} -.field.checkbox input:checked + label { - background-color: #8ce196; -} -.field.checkbox input:checked + label:after { - margin-left: 22px; - background-color: #8ce196; +.onoffswitch-inner:before, .onoffswitch-inner:after { + display: block; float: left; width: 50%; height: 20px; padding: 0; line-height:20px; + -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; +} + +.onoffswitch-inner:before { + content: attr(data-on); + padding-left: 10px; + background-color: #EEEEEE; +} + +.onoffswitch-inner:after { + content: attr(data-off); + padding-right: 10px; + background-color: #EEEEEE; color: #999999; + text-align: right; +} + +.onoffswitch-switch { + display: block; width: 25px; margin-left: 6px; margin-right: 6px; margin-top:5%; margin-bottom:5%; + background: #A1A1A1; + border: 2px solid #999999; border-radius: 20px; + position: absolute; top: 0; bottom: 0; right: 36px; + -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s; + -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; +} + +.field.checkbox > div > input:checked + label .onoffswitch-inner { + margin-left: 0; +} + +.field.checkbox > div > input:checked + label .onoffswitch-switch { + right: -2px; + background-color: #27A1CA; } -- cgit v1.2.3 From 753e6809d920f0205b49d45072c8a5bb687c1797 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sat, 3 Jan 2015 15:51:01 +0000 Subject: update NL and text-background-fix in chat for alternatives schemas --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 63cf27d58..7a6ceb968 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1978,7 +1978,7 @@ img.mail-list-sender-photo { .chat-item-text { border-radius: $radiuspx; - background-color: #eee; + background-color: $chat_txtbgcol; } /* nav bootstrap */ -- cgit v1.2.3 From b320b8cbf35e84df76e236a7bc2cbd53047e4654 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Mon, 5 Jan 2015 19:49:15 +0100 Subject: Replace fancybox with colorbox --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7a6ceb968..c37d29d40 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1028,7 +1028,7 @@ footer { background: none repeat scroll 0% 0% $cal_bgcolour !important; } -#fancybox-content { +#colorbox { border: 0px solid $fancybox_bgcolour; background-color: $fancybox_bgcolour; } -- cgit v1.2.3 From 7c3193e26e514a58a778a06d0cdd7cca14cf9585 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Mon, 5 Jan 2015 22:02:48 +0100 Subject: Make slider less ugly --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/theme/redbasic/css') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c37d29d40..842e7063a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2352,6 +2352,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { border: 1px solid #cccccc; } +/* Abusing theme-green is less work than makeing a new new one */ +.theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important } /* Turn checkboxes into switches */ -- cgit v1.2.3