From dd7fea10c1b70534b76bc4d5ea044187cd4cb77b Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 21:28:42 +0100 Subject: split out widgets.css --- view/theme/redbasic/css/style.css | 112 +++++++++++--------------------------- 1 file changed, 33 insertions(+), 79 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e13bc1edb..d716680ce 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -331,7 +331,8 @@ footer { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected, .search-selected, .active { +/*TODO: we should use .active class for all this, nets-selected probably obsolete */ +.group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } @@ -671,36 +672,6 @@ footer { box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } - -#datebrowse-sidebar select { - margin-left: 25px; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - opacity: 0.3; - filter:alpha(opacity=30); -} - -#datebrowse-sidebar select:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -#posted-date-selector { - margin-left: 30px !important; - margin-top: 5px !important; - margin-right: 0px !important; - margin-bottom: 0px !important; -} - -#posted-date-selector:hover { - box-shadow: 4px 4px 3px 0 #444444; - margin-left: 25px !important; - margin-top: 0px !important; - margin-right: 5px !important; - margin-bottom: 5px !important; - -} - #side-bar-photos-albums { margin-top: 15px; } @@ -777,17 +748,16 @@ footer { width: 12px; } -#sidebar-group-list li, -.saved-search-li { +#sidebar-group-list li { margin-top: 3px; } - -.nets-ul, .fileas-ul, .categories-ul { +/* might be obsolete +.nets-ul { list-style-type: none; } -.nets-ul li, .fileas-ul li, .categories-ul li { +.nets-ul li { margin-top: 10px; } @@ -797,14 +767,7 @@ footer { .nets-all { margin-left: 42px; } - -.fileas-link, .categories-link { - margin-left: 24px; -} - -.fileas-all, .categories-all { - margin-left: 0px; -} +*/ #search-save { margin-left: 5px; @@ -813,20 +776,6 @@ footer { margin-right: 10px; } -#saved-search-ul { - list-style-type: none; -} - -.saved-search-li i { - opacity: 0; -} - -.saved-search-li:hover i { - opacity: 1; -} - - - .savedsearchterm { margin-left: 10px; } @@ -835,7 +784,8 @@ footer { #side-follow-wrapper { margin-top: 20px; } -#side-follow-url, #side-peoplefind-url { + +#side-peoplefind-url { margin-top: 5px; } @@ -851,7 +801,7 @@ footer { font-family: FontAwesome; } -#side-follow-submit, #side-peoplefind-submit { +#side-peoplefind-submit { margin-top: 15px; } @@ -860,7 +810,7 @@ footer { } -.widget, .pmenu { +.pmenu { border-bottom: 1px solid #eec; padding: 8px; margin-top: 5px; @@ -1679,12 +1629,6 @@ div.jGrowl div.info { text-overflow: ellipsis; } -#datebrowse-sidebar select { - margin-left: 25px; -} - - - .jslider .jslider-scale ins { color: #333; font-size: $body_font_size; @@ -2255,8 +2199,7 @@ text-decoration: none; list-style-type: none; } -.group-edit-icon, -.savedsearchdrop { +.group-edit-icon { opacity: 0; } @@ -2395,8 +2338,6 @@ img.mail-list-sender-photo { max-width: $converse_width; } -/* conv_item */ - .wall-item-content-wrapper { border-radius: $radiuspx; background-color: $item_colour; @@ -2500,8 +2441,6 @@ img.mail-list-sender-photo { color: $toolicon_colour; } -/* comment_item */ - .my-comment-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; @@ -2538,14 +2477,29 @@ img.mail-list-sender-photo { .comment-edit-text-full { color: black; } -.suggest-widget-more { margin-top: 10px; } +/* widgets */ -#note-text { - width: 190px; - max-width: 190px; - height: 150px; +.widget { + border-bottom: 1px solid #eec; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; +} + +#saved-search-ul { + list-style-type: none; } -#note-save { margin-top: 10px; } +.fileas-ul { + list-style-type: none; +} +#datebrowse-sidebar select { + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; +} + +.categories-ul { + list-style-type: none; +} -- cgit v1.2.3 From 169266b4547460296355b63c06dd0643667093d0 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 21:46:03 +0100 Subject: unify styling a little --- view/theme/redbasic/css/style.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d716680ce..ce13fa94c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2487,6 +2487,12 @@ img.mail-list-sender-photo { border-radius: $radiuspx; } +#note-text { + border: 1px solid #ccc; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; +} + #saved-search-ul { list-style-type: none; } @@ -2496,6 +2502,7 @@ img.mail-list-sender-photo { } #datebrowse-sidebar select { + border: 1px solid #ccc; border-radius: $radiuspx; -moz-border-radius: $radiuspx; } -- cgit v1.2.3 From ebc788a69af4ee93bf683a856ac02956d413aec8 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 22:02:46 +0100 Subject: also add group widget to widgets.css --- view/theme/redbasic/css/style.css | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ce13fa94c..4df791e73 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -327,11 +327,7 @@ footer { margin-bottom: 15px; } -#group-sidebar { - margin-bottom: 10px; -} - -/*TODO: we should use .active class for all this, nets-selected probably obsolete */ +/*TODO: we should use .selected class for all this, nets-selected probably obsolete */ .group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } @@ -738,20 +734,6 @@ footer { #netsearch-box { margin-bottom: 5px; } -#sidebar-group-list ul { - list-style-type: none; -} - -#sidebar-group-list .icon, #sidebar-group-list .iconspacer { - display: inline-block; - height: 12px; - width: 12px; -} - -#sidebar-group-list li { - margin-top: 3px; -} - /* might be obsolete .nets-ul { list-style-type: none; @@ -772,14 +754,6 @@ footer { #search-save { margin-left: 5px; } -.groupsideedit { - margin-right: 10px; -} - -.savedsearchterm { - margin-left: 10px; -} - #side-follow-wrapper { margin-top: 20px; @@ -2199,10 +2173,6 @@ text-decoration: none; list-style-type: none; } -.group-edit-icon { - opacity: 0; -} - .admin-icons { color: $toolicon_colour; margin-right: 10px; @@ -2510,3 +2480,7 @@ img.mail-list-sender-photo { .categories-ul { list-style-type: none; } + +#sidebar-group-list ul { + list-style-type: none; +} -- cgit v1.2.3 From e8821d78d517c838a630766bfc3bafb145a6be15 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 11 Dec 2013 22:11:06 +0100 Subject: .selected is in use for something else already --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4df791e73..fa5bf51ef 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -327,7 +327,7 @@ footer { margin-bottom: 15px; } -/*TODO: we should use .selected class for all this, nets-selected probably obsolete */ +/*TODO: we should use one class for all this, nets-selected probably obsolete */ .group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } -- cgit v1.2.3 From 40e2900326a25ba0e2feedb802d38b7052b194cc Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 14:54:36 -0800 Subject: comanchify all the simple cases - those that only load a profile. Rework permission checks for the profile sidebar so that it is all done internally. Remove crepair which we aren't using. --- view/theme/redbasic/css/style.css | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e13bc1edb..b7883f42e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2549,3 +2549,55 @@ img.mail-list-sender-photo { #note-save { margin-top: 10px; } +/* need to put these back in the theme for now - used in more than one module */ + +.contact-entry-wrapper { + float: left; + width: 120px; + height: 120px; + padding: 10px; +} + +#contacts-search { + font-size: 1em; + width: 300px; +} + +#contacts-search-end { + margin-bottom: 10px; +} + +.contact-entry-photo img { + border: none; +} +.contact-entry-photo-end { + clear: both; +} +.contact-entry-name { + float: left; + margin-left: 0px; + margin-right: 10px; + width: 120px; + overflow: hidden; +} +.contact-entry-edit-links { + margin-top: 6px; + margin-left: 10px; + width: 16px; +} +.contact-entry-nav-wrapper { + float: left; + margin-left: 10px; +} + +.contact-entry-edit-links img { + border: none; + margin-right: 15px; +} +.contact-entry-photo { + float: left; + position: relative; +} +.contact-entry-end { + clear: both; +} -- cgit v1.2.3 From 4d187918528f12256ee7ae145b0e0e25578df8b4 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Dec 2013 15:42:28 -0800 Subject: missing brace in redbasic style.css --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9b45102cf..a67742c81 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2529,6 +2529,7 @@ img.mail-list-sender-photo { } .contact-entry-end { clear: both; +} .categories-ul { list-style-type: none; -- cgit v1.2.3 From 8f6af66a730250c7688168eecf8ba9b99df2536b Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 12 Dec 2013 14:39:21 +0100 Subject: move affinity slider to widgets.css and minor cleanup --- view/theme/redbasic/css/style.css | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a67742c81..e02f55520 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1610,21 +1610,6 @@ div.jGrowl div.info { text-align: center; } - -.slider { - margin-top: 10px; - margin-bottom: 45px; -} - - -#main-slider { - position: relative; - left: 5px; - width: 90%; - -} - - #contact-slider { position: relative; left: 5%; @@ -2477,6 +2462,13 @@ img.mail-list-sender-photo { -moz-border-radius: $radiuspx; } +.categories-ul { + list-style-type: none; +} + +#sidebar-group-list ul { + list-style-type: none; +} /* need to put these back in the theme for now - used in more than one module */ @@ -2530,11 +2522,3 @@ img.mail-list-sender-photo { .contact-entry-end { clear: both; } - -.categories-ul { - list-style-type: none; -} - -#sidebar-group-list ul { - list-style-type: none; -} -- cgit v1.2.3 From b994faee9d24a6290e342b6389c56fa7f9ecfac1 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 12 Dec 2013 15:15:01 +0100 Subject: mark some things for deletion --- view/theme/redbasic/css/style.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e02f55520..0db9caa4e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -676,7 +676,7 @@ footer { list-style: none; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { +/* .contact-entry-photo img, */ .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; @@ -2488,12 +2488,16 @@ img.mail-list-sender-photo { margin-bottom: 10px; } +/* seems oblolete .contact-entry-photo img { border: none; } +*/ + .contact-entry-photo-end { clear: both; } + .contact-entry-name { float: left; margin-left: 0px; @@ -2501,11 +2505,14 @@ img.mail-list-sender-photo { width: 120px; overflow: hidden; } + +/* seems obsolete .contact-entry-edit-links { margin-top: 6px; margin-left: 10px; width: 16px; } + .contact-entry-nav-wrapper { float: left; margin-left: 10px; @@ -2515,10 +2522,13 @@ img.mail-list-sender-photo { border: none; margin-right: 15px; } + .contact-entry-photo { float: left; position: relative; } +*/ + .contact-entry-end { clear: both; } -- cgit v1.2.3 From ae95269c6dd5b354d5f807c96a4b237b543a9b53 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 16 Dec 2013 15:41:23 +0100 Subject: remove some cruft and a typo --- view/theme/redbasic/css/style.css | 61 +++------------------------------------ 1 file changed, 4 insertions(+), 57 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0db9caa4e..7c7d450aa 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -234,7 +234,7 @@ header #banner #logo-text { background-color: #aec0d3; color: #565854; -moz-border-radius: $radiuspx; - border-radius: $radiuspx;; + border-radius: $radiuspx; } nav .nav-link { @@ -327,8 +327,8 @@ footer { margin-bottom: 15px; } -/*TODO: we should use one class for all this, nets-selected probably obsolete */ -.group-selected, /* .nets-selected, */ .fileas-selected, .categories-selected, .search-selected, .active { +/*TODO: we should use one class for all this. */ +.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; } @@ -676,7 +676,7 @@ footer { list-style: none; } -/* .contact-entry-photo img, */ .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { +.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; @@ -734,23 +734,6 @@ footer { #netsearch-box { margin-bottom: 5px; } -/* might be obsolete -.nets-ul { - list-style-type: none; -} - -.nets-ul li { - margin-top: 10px; -} - -.nets-link { - margin-left: 24px; -} -.nets-all { - margin-left: 42px; -} -*/ - #search-save { margin-left: 5px; } @@ -2002,13 +1985,6 @@ ul.menu-popup { .reshared-content { margin-left: 30px; } .shared_header img { margin-right: 10px; } -/* might be obsolete -span.mail-delete { -float: left; -width: 30px; -} -*/ - .tag1 { font-size : 1.0em !important; } @@ -2488,12 +2464,6 @@ img.mail-list-sender-photo { margin-bottom: 10px; } -/* seems oblolete -.contact-entry-photo img { - border: none; -} -*/ - .contact-entry-photo-end { clear: both; } @@ -2506,29 +2476,6 @@ img.mail-list-sender-photo { overflow: hidden; } -/* seems obsolete -.contact-entry-edit-links { - margin-top: 6px; - margin-left: 10px; - width: 16px; -} - -.contact-entry-nav-wrapper { - float: left; - margin-left: 10px; -} - -.contact-entry-edit-links img { - border: none; - margin-right: 15px; -} - -.contact-entry-photo { - float: left; - position: relative; -} -*/ - .contact-entry-end { clear: both; } -- cgit v1.2.3 From afc86875d242027434cb4ffca10e086d53cbbbb8 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 16 Dec 2013 15:46:18 +0100 Subject: move some stuff back to mod_connections.css --- view/theme/redbasic/css/style.css | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7c7d450aa..9ac021a54 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2445,37 +2445,3 @@ img.mail-list-sender-photo { #sidebar-group-list ul { list-style-type: none; } - -/* need to put these back in the theme for now - used in more than one module */ - -.contact-entry-wrapper { - float: left; - width: 120px; - height: 120px; - padding: 10px; -} - -#contacts-search { - font-size: 1em; - width: 300px; -} - -#contacts-search-end { - margin-bottom: 10px; -} - -.contact-entry-photo-end { - clear: both; -} - -.contact-entry-name { - float: left; - margin-left: 0px; - margin-right: 10px; - width: 120px; - overflow: hidden; -} - -.contact-entry-end { - clear: both; -} -- cgit v1.2.3 From b6bb3c02525843caeaee3f6409f1b97b160ea8a2 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 19:47:00 +0100 Subject: fix a typo --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9ac021a54..68ddcf7a2 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2265,7 +2265,7 @@ img.mail-list-sender-photo { border-left: 2px solid #eee; } -.thread-wrapper .toplevel_item { +.thread-wrapper.toplevel_item { max-width: $converse_width; } -- cgit v1.2.3 From 6e28c40c2732daa40d4e54ad3231af5798964fa2 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 20:22:22 +0100 Subject: we make this with css now --- view/theme/redbasic/js/redbasic.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e89c51119..e41fde2b8 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -47,16 +47,6 @@ $('.savedsearchdrop').hover( $(this).css('opacity','0');} ); -$('.savedsearchterm').hover( - function() { - id = $(this).attr('id'); - $('#dropicon-' + id).css('opacity','1.0');}, - - function() { - id = $(this).attr('id'); - $('#dropicon-' + id).css('opacity','0'); - }); - }); @@ -72,4 +62,4 @@ $(document).ready(function(){ } }; setInterval(function () {checkNotify();}, 10 * 1000); -}); \ No newline at end of file +}); -- cgit v1.2.3 From 176fe3256428c8a2226030c4e1de89723e37cca7 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 21:13:48 +0100 Subject: show drop-icon on wall-item hover only --- view/theme/redbasic/css/style.css | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 68ddcf7a2..411356d80 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2087,12 +2087,12 @@ margin-right: 50px; } a .drop-icons { - color: #777; + color: $toolicon_colour;; font-size: 1.2em; text-decoration: none; } -.drop-icons:hover { +a .drop-icons:hover { color: #FF0000; } @@ -2364,10 +2364,6 @@ img.mail-list-sender-photo { color: $toolicon_activecolour; } -.drop-icons.item-tool { - color: $toolicon_colour; -} - .like-rotator { color: $toolicon_colour; } -- cgit v1.2.3 From 125543adedfe00b3d5cea8548d1a66096a173a6b Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 02:16:14 -0800 Subject: more comanche migration --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 411356d80..5f532a861 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2122,6 +2122,10 @@ a .drop-icons:hover { margin-right: 10px; } +.design-tools ul { + list-style-type: none; +} + .design-icons { margin-right: 10px; } -- cgit v1.2.3 From 0dd7d936744cccfac4228cabecddc59ce05eb26c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Dec 2013 04:25:55 -0800 Subject: basic edit and delete for things --- view/theme/redbasic/css/style.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5f532a861..397148c05 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2445,3 +2445,8 @@ img.mail-list-sender-photo { #sidebar-group-list ul { list-style-type: none; } + +.profile-thing-list img, .thing-show img, .thing-edit-links a { + margin-top: 8px; + margin-right: 15px; +} -- cgit v1.2.3 From 4c541bb680823b7488a2614b5ef0231ad38b42c8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Dec 2013 15:41:42 -0800 Subject: expose profile things in the UI --- view/theme/redbasic/css/style.css | 9 --------- 1 file changed, 9 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 397148c05..325685607 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -582,15 +582,6 @@ footer { .thread-end-wrapper { margin-left: 50px; } - -#profile-listing-desc { - margin-left: 30px; -} - -#profile-listing-new-link-wrapper { - margin-left: 30px; - margin-bottom: 30px; -} .profile-listing-photo-wrapper { float: left; } -- cgit v1.2.3 From 41df51a8151a5c1f35abe3c04f94e43b673e29ff Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 6 Jan 2014 17:10:53 -0800 Subject: add "self" to access control lists with special marking to indicate it's special (for instance you can't really deny access to yourself). But this lets us make something private to our eyes only; whatever it may be. --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 325685607..f039b7374 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2441,3 +2441,7 @@ img.mail-list-sender-photo { margin-top: 8px; margin-right: 15px; } + +.abook-self { + background-color: #ffdddd; +} \ No newline at end of file -- cgit v1.2.3 From 6920c203d16df3571c98d818636b1b2c765ce2b7 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 16 Jan 2014 04:18:19 +0000 Subject: Remove deprecated CSS - there is a dark schema now, and shadows and stuff are cofigurable. --- view/theme/redbasic/css/dark.css | 186 -------------------------------------- view/theme/redbasic/css/fancy.css | 107 ---------------------- 2 files changed, 293 deletions(-) delete mode 100644 view/theme/redbasic/css/dark.css delete mode 100644 view/theme/redbasic/css/fancy.css (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css deleted file mode 100644 index 3bcf15bc9..000000000 --- a/view/theme/redbasic/css/dark.css +++ /dev/null @@ -1,186 +0,0 @@ -/* This file is deprecated. We'll keep it here as reference until somebody -defines a dark colour scheme */ - - -body { font-family: sans-serif; - font-size: 12px; - background-color: #101010; - background-image: -moz-linear-gradient(top, #000 16%, #101010 82%); - background-image: linear-gradient(bottom, #000 16%, #101010 82%); - background-image: -o-linear-gradient(bottom, #000 16%, #101010 82%); - background-image: -webkit-linear-gradient(bottom, #000 16%, #101010 82%); - background-image: -ms-linear-gradient(bottom, #000 16%, #101010 82%); - background-repeat: no-repeat; - background-attachment: fixed; - color: #eec; - -} - -aside { -border: none; -color: #fff; -} - -.fn { - color: #fff; -} - -.acl-list-item, -.profile-jot-net { - color: #000; -} - - -.tab.active { - color: #fff; -} - -blockquote {color: #000;} - -.wall-item-content-wrapper { - background: #262626; - border-radius: 5px; - box-shadow: 12px 12px 12px #000; - margin-bottom: 20px; -} - -.wall-item-content-wrapper.comment { - margin-left: 50px; - box-shadow: 5px 5px 5px #000; -} - -.comment-edit-text-empty, .comment-edit-text-full { - border-radius: 5px 5px 5px 5px; - box-shadow: 5px 5px 5px #000 inset; -} - - -#profile-jot-text { - height: 20px; - color:#000; - border: 1px solid #cccccc; - padding: 8px; - margin-right: 0px; - width: 90%; - -moz-border-radius: 5px; - border-radius: 5px; - box-shadow: 4px 4px 3px 0 #666 inset; -} -#profile-jot-text:hover { - color: #000000; -} - -#profile-jot-submit { - height: auto; - background-color: #0080FF; - color: #eeeeec; - font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 2px outset #222420 !important; - margin: 0; - float: right; - text-shadow: 1px 1px #111; - width: auto; - box-shadow: 5px 5px 5px #444; -} - - -.widget { - border-bottom: 1px solid #eec; - padding: 8px; - margin-top: 5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - -} - -nav a, -nav a:active, -nav a:visited, -nav a:link { - color: #ffffff; - text-decoration: none; - outline: none; -} - -.nav-menu.selected a { - color: #0080ff !important; -} - -nav .nav-menu-icon { - position: relative; - height: 22px; - padding: 5px; -/* margin: 3px 10px; */ - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -nav .nav-notify { - background-color: #0080FF; - color: #fff; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; - opacity: 0.6; - filter:alpha(opacity=60); - -} -.nav-notify:hover, nav .nav-notify.selected span { - color: #ffffff; -} - -ul.menu-popup { - - position: absolute; - display: none; - width: 10em; - background: #000; - color: #fff; - padding: 0px; - list-style: none; - border-radius: 0px 0px 20px 20px; - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -ul.menu-popup a { - display: block; - color: #FFFFFF; - padding: 5px 10px; - text-decoration: none; -} - - -ul.menu-popup a:hover { - background-color: #888888; - color: #FFFFFF; -} -ul.menu-popup .menu-sep { - border-top: 1px solid #9eabb0; -} - -.wall-item-photo, -.photo, -.contact-block-img, -.my-comment-photo { - border-radius: 5px; - box-shadow: 4px 4px 3px #000; -} - - -div#pagelist-content-wrapper { -width: 80%; -background: #111; -margin-left: auto; -margin-right: auto; -} - -div.page-list-item { -margin: 20px; -} diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css deleted file mode 100644 index 9b8899d2f..000000000 --- a/view/theme/redbasic/css/fancy.css +++ /dev/null @@ -1,107 +0,0 @@ -/*This file is deprecated. We'll keep it for reference until we provide window decorations */ - - -aside { -border-radius: $radiuspx;} - - -.tab { - height: auto; - background-color: #f00; - color: #fff !important; - font-weight: bold; - -webkit-border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - margin: 0; - width: auto; - margin-left: 8px; - padding: 4px; - text-align: center; -} -.tab:hover, .tab.active:hover { - background: #d00; - color: #fff; - ; -} -.tab:active { - background: #fff; - color: #f00; -} -.tab.active { - background: #f00; - color: #fff; - box-shadow: 3px 3px 3px #333 inset; - padding: 5px; /* strageness of the human mind - has to be larger than inactive tabs, or it looks smaller than them */ -} - - - -.wall-item-content-wrapper { - position: relative; - border-radius: $radiuspx; - box-shadow: 8px 8px 8px #000; - border: 1px solid #eec; -} - -.wall-item-content-wrapper.comment { - margin-top: 15px; -} - -.wall-item-like:hover, .wall-item-dislike:hover{ -opacity: 1; -} - -.wall-item-author { - margin-top: 10px; -} - -.comment-edit-wrapper { - margin-top: 15px; - background: #ffffff; - margin-left: 50px; -} - -#profile-jot-submit { - background-color: #dd0000; -} - -ul.menu-popup { - background: #dd0000; - color: #eec; - border-radius: $radiuspx; - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -ul.menu-popup a { - color: #eec; -} -ul.menu-popup a:hover { - background-color: #eec; - color: #f00; -} - -section { -left: 0px; -width: 800px; -margin-left: auto; -margin-right: auto; -} -body {background-color: #d00 !important;} - -.page-content-wrapper {background: #fff; - color: #000; - border-radius: 20px; - box-shadow: 5px 5px 5px #111; -} - -h3.page-title { -padding-top: 30px; - color: #033} -.page-body {padding: 40px;} - -.page-body strong {color: #033;} - -.nav-links {margin-top: 5px;} -- cgit v1.2.3 From 4b66a399e4a43d615372cd6a818bafe70bea8bb0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 25 Jan 2014 02:53:31 -0800 Subject: get rid of bootstrap's blockqote margin css which is just bloody wrong and can't easily be over-ridden --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f039b7374..b2f90cbc1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -91,6 +91,7 @@ blockquote { border-left: 4px solid #dae4ee; padding: 0.4em; color: #000; + margin-left: 20px; } .ccollapse-wrapper { -- cgit v1.2.3 From cc11535e34f1cc91251d7ca3f38ef38997774857 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 28 Jan 2014 17:07:25 -0800 Subject: online indication on profile sidebar --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b2f90cbc1..02832b5f0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2445,4 +2445,8 @@ img.mail-list-sender-photo { .abook-self { background-color: #ffdddd; +} +.online-now { + color: red; + cursor: pointer; } \ No newline at end of file -- cgit v1.2.3 From a2761213e025d55f96803847712db10ac5f8e78c Mon Sep 17 00:00:00 2001 From: Tazman DeVille Date: Sun, 2 Feb 2014 04:26:56 +0100 Subject: link colour options --- view/theme/redbasic/css/style.css | 6 +++--- view/theme/redbasic/php/config.php | 3 +++ view/theme/redbasic/php/style.php | 3 +++ view/theme/redbasic/tpl/theme_settings.tpl | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 02832b5f0..c4eddc179 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -40,11 +40,11 @@ abbr { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; - color: #0080FF; + color: #7b0000; text-decoration: none; } -a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } +a:hover, .fakelink:hover { color: #c40003; text-decoration: underline; } .fakelink { cursor: pointer; @@ -2449,4 +2449,4 @@ img.mail-list-sender-photo { .online-now { color: red; cursor: pointer; -} \ No newline at end of file +} diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 20355197f..d6adf5381 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -7,6 +7,7 @@ function theme_content(&$a) { $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' ); $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); @@ -33,6 +34,7 @@ function theme_post(&$a) { if (isset($_POST['redbasic-settings-submit'])) { set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']); + set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']); set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); @@ -88,6 +90,7 @@ if(feature_enabled(local_user(),'expert')) '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), + '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours), '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9956ccd31..85420fbaf 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -63,6 +63,8 @@ $nav_bg_3 = "#f00"; $nav_bg_4 = "#b00"; } + if (! $link_colour) + $link_colour = "#7b0000"; if (! $banner_colour) $banner_colour = "fff"; if (! $bgcolour) @@ -141,6 +143,7 @@ $options = array ( '$nav_bg_2' => $nav_bg_2, '$nav_bg_3' => $nav_bg_3, '$nav_bg_4' => $nav_bg_4, +'$link_colour' => $link_colour, '$banner_colour' => $banner_colour, '$search_background' => $search_background, '$bgcolour' => $bgcolour, diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index e0f546896..ca05986a2 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -6,6 +6,7 @@ {{if $expert}} {{include file="field_select.tpl" field=$nav_colour}} {{include file="field_input.tpl" field=$banner_colour}} +{{include file="field_input.tpl" field=$link_colour}} {{include file="field_input.tpl" field=$bgcolour}} {{include file="field_input.tpl" field=$background_image}} {{include file="field_input.tpl" field=$item_colour}} -- cgit v1.2.3 From bd8378339117f307c73e176e80a3417c8fb2a3f4 Mon Sep 17 00:00:00 2001 From: Tazman DeVille Date: Sun, 2 Feb 2014 04:32:43 +0100 Subject: link colours --- view/theme/redbasic/php/style.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 85420fbaf..35fe54fe4 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -10,6 +10,7 @@ // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme // wants to implement that $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); + $link_colour = get_pconfig($uid, "redbasic", "link_colour"); // Load the owners pconfig $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); -- cgit v1.2.3 From de412abe88a697f08755f09694fd16f9230482cb Mon Sep 17 00:00:00 2001 From: Tazman DeVille Date: Sun, 2 Feb 2014 05:19:29 +0100 Subject: user configured link colour --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c4eddc179..1a36c1c43 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -40,7 +40,7 @@ abbr { a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; - color: #7b0000; + color: $link_colour; text-decoration: none; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 35fe54fe4..fcb762891 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -10,10 +10,10 @@ // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme // wants to implement that $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); - $link_colour = get_pconfig($uid, "redbasic", "link_colour"); // Load the owners pconfig $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); + $link_colour = get_pconfig($uid, "redbasic", "link_colour"); $schema = get_pconfig($uid,'redbasic','schema'); $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); $background_image = get_pconfig($uid, "redbasic", "background_image"); -- cgit v1.2.3 From 17436f060f54e1c218296bce0bdc7b05abe4ee33 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 1 Feb 2014 21:12:26 -0800 Subject: fix default link color --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1a36c1c43..fe6d24f18 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -44,7 +44,7 @@ a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { text-decoration: none; } -a:hover, .fakelink:hover { color: #c40003; text-decoration: underline; } +a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } .fakelink { cursor: pointer; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index fcb762891..981aaddb2 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -65,7 +65,7 @@ $nav_bg_4 = "#b00"; } if (! $link_colour) - $link_colour = "#7b0000"; + $link_colour = "#0080FF"; if (! $banner_colour) $banner_colour = "fff"; if (! $bgcolour) -- cgit v1.2.3 From 16e818def78ce22527dcdd91d57dca8ee55b9069 Mon Sep 17 00:00:00 2001 From: Tazman DeVille Date: Sun, 2 Feb 2014 14:01:12 +0100 Subject: link hover colour remains user set link_colour (w/o change default, Mike) --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fe6d24f18..776b4c31a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -44,7 +44,7 @@ a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { text-decoration: none; } -a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } +a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; } .fakelink { cursor: pointer; -- cgit v1.2.3 From d2b55f5eeab330b08410424d96211f40050d7a1f Mon Sep 17 00:00:00 2001 From: Tazman DeVille Date: Mon, 3 Feb 2014 02:06:07 +0100 Subject: added Thomas' additional navbar colours from APW to redbasic --- view/theme/redbasic/php/config.php | 14 +++++++++++--- view/theme/redbasic/php/style.php | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index d6adf5381..68a72fffd 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -74,9 +74,17 @@ function redbasic_form(&$a, $arr) { $nav_colours = array ( '' => t('Scheme Default'), - 'red' => t('red'), - 'black' => t('black'), - 'silver' => t('silver'), + 'red' => 'red', + 'pink' => 'pink', + 'green' => 'green', + 'blue' => 'blue', + 'purple' => 'purple', + 'black' => 'black', + 'orange' => 'orange', + 'brown' => 'brown', + 'grey' => 'grey', + 'gold' => 'gold', + 'silver' => t('silver'), ); if(feature_enabled(local_user(),'expert')) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 981aaddb2..aec27961e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -133,6 +133,38 @@ $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; $search_background = '#EEEEEE'; } + if($nav_colour === "pink") { + $nav_bg_1 = $nav_bg_3 = "#FFC1CA"; + $nav_bg_2 = $nav_bg_4 = "#FFC1CA"; + } + if($nav_colour === "green") { + $nav_bg_1 = $nav_bg_3 = "#5CD65C"; + $nav_bg_2 = $nav_bg_4 = "#5CD65C"; + } + if($nav_colour === "blue") { + $nav_bg_1 = $nav_bg_3 = "#1872a2"; + $nav_bg_2 = $nav_bg_4 = "#1872a2"; + } + if($nav_colour === "purple") { + $nav_bg_1 = $nav_bg_3 = "#551A8B"; + $nav_bg_2 = $nav_bg_4 = "#551A8B"; + } + if($nav_colour === "orange") { + $nav_bg_1 = $nav_bg_3 = "#FF3D0D"; + $nav_bg_2 = $nav_bg_4 = "#FF3D0D"; + } + if($nav_colour === "brown") { + $nav_bg_1 = $nav_bg_3 = "#330000"; + $nav_bg_2 = $nav_bg_4 = "#330000"; + } + if($nav_colour === "grey") { + $nav_bg_1 = $nav_bg_3 = "#2e2f2e"; + $nav_bg_2 = $nav_bg_4 = "#2e2f2e"; + } + if($nav_colour === "gold") { + $nav_bg_1 = $nav_bg_3 = "#FFAA00"; + $nav_bg_2 = $nav_bg_4 = "#FFAA00"; + } // Apply the settings -- cgit v1.2.3 From baf3b052f645d7826ada25a05c742d1e5d4a0b51 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 2 Feb 2014 18:18:22 -0800 Subject: don't load any configs from DB if installing - especially in style.pcss --- view/theme/redbasic/php/style.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index aec27961e..8d5c23a03 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,5 +1,7 @@ install) { + // Get the UID of the channel owner $uid = get_theme_uid(); if($uid) @@ -32,6 +34,8 @@ $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); +} + // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema // Setting $scheme to '' wasn't working for some reason, so we'll check it's -- cgit v1.2.3 From 97739920ebfa0d7b0db95c61187d5820c0939f14 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 8 Feb 2014 00:48:19 -0800 Subject: create a new "subdued" CSS class for things that shouldn't be in your face unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead. --- view/theme/redbasic/css/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 776b4c31a..209399d0c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -114,6 +114,15 @@ blockquote { margin-right: 5px; } +.subdued { + opacity: 0.3; + filter:alpha(opacity=30); +} + +.subdued:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} #langselector { -- cgit v1.2.3 From 176b0881ce6fd9b820c9dffaa926b542007f98df Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 9 Feb 2014 01:39:37 +0100 Subject: . --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 209399d0c..6164407e8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2459,3 +2459,4 @@ img.mail-list-sender-photo { color: red; cursor: pointer; } + -- cgit v1.2.3 From 4fc0126661f2389843599a4a6829d8eb79a109e4 Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 9 Feb 2014 23:52:09 +0100 Subject: theming chat a little --- view/theme/redbasic/css/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6164407e8..08129aabb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2455,8 +2455,16 @@ img.mail-list-sender-photo { .abook-self { background-color: #ffdddd; } + .online-now { color: red; cursor: pointer; } +.chat-item-photo { + border-radius: $radiuspx; +} + +.chat-item-text { + border-radius: $radiuspx; +} -- cgit v1.2.3 From 46153e4a5795a6ad6f088304233a4524a1e8409c Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 9 Feb 2014 23:59:19 +0100 Subject: moving background-color to style.css --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 08129aabb..8a43f5a51 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2467,4 +2467,5 @@ img.mail-list-sender-photo { .chat-item-text { border-radius: $radiuspx; + background-color:#eee; } -- cgit v1.2.3 From 3ad9cf67c6e28f41c191dea52fac664471e5b107 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 10 Feb 2014 00:00:35 +0100 Subject: whitespace --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8a43f5a51..78fdac0cd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2467,5 +2467,5 @@ img.mail-list-sender-photo { .chat-item-text { border-radius: $radiuspx; - background-color:#eee; + background-color: #eee; } -- cgit v1.2.3 From ec99cac9e8abdb85c1a8355b7617556f238d4c91 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Feb 2014 00:52:54 -0800 Subject: very simple scheme --- view/theme/redbasic/schema/notred.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 view/theme/redbasic/schema/notred.php (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/schema/notred.php b/view/theme/redbasic/schema/notred.php new file mode 100644 index 000000000..5a6dda336 --- /dev/null +++ b/view/theme/redbasic/schema/notred.php @@ -0,0 +1,5 @@ + Date: Wed, 19 Feb 2014 18:42:37 +0100 Subject: bootstrapify the nav --- view/theme/redbasic/css/style.css | 88 ++++++++++++++++-------------- view/theme/redbasic/tpl/theme_settings.tpl | 4 +- 2 files changed, 50 insertions(+), 42 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 78fdac0cd..127f09683 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -140,6 +140,8 @@ blockquote { filter:alpha(opacity=100); } +/* this is not yet supported + nav { background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); @@ -151,8 +153,6 @@ nav { } - - nav:hover { background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); @@ -163,7 +163,7 @@ nav:hover { filter:alpha(opacity=100); } - +*/ nav #site-location { color: #888a85; @@ -204,15 +204,15 @@ header #site-location { } header #banner { - overflow: hidden; text-align: center; - font-size: 1.4em; + font-size: 14px; font-family: tahoma, "Lucida Sans", sans; color: $banner_colour; font-weight: bold; - margin-top: 1px; + margin: 14px; } + header #banner a, header #banner a:active, header #banner a:visited, @@ -879,8 +879,8 @@ footer { } #nav-search-spinner { - float: right; - margin: 12px 12px 0px 0px; + float: left; + margin: 25px 0px 0px 25px; color: #fff; } @@ -892,6 +892,7 @@ footer { #nav-search-text { height: 20px; + margin: 15px; padding: 0px 5px 0px 5px; border-radius: 10px; border: none; @@ -919,11 +920,6 @@ footer { font-family: FontAwesome; } -#nav-user-linkmenu img { - border-radius: $radiuspx; - margin-top: -4px; -} - .nav-dropdown-indicator { opacity: 0.8; filter:alpha(opacity=80); @@ -1548,8 +1544,8 @@ div.jGrowl div.info { #nav-search-text-ac .autocomplete { position: fixed; - top: 24px; - border: 1px solid $nav_bg_1; + top: 51px; + border: 1px solid #222; border-top: none; } @@ -1628,26 +1624,6 @@ nav .fakelink:hover { text-decoration: none; } color: #000000; } -nav ul { - margin: 0px; - padding: 0px 20px; -} -nav ul li { - list-style: none; - margin: 0px; - padding: 0px; - float: left; -} -nav ul li .menu-popup { - left: 0px; - right: auto; - top: 33px; -} - -#nav-user-linkmenu { - margin-left: 5px; -} - nav .nav-menu-icon { position: relative; height: 22px; @@ -1785,13 +1761,10 @@ header { position: fixed; left: 43%; right: 43%; - top: 0px; margin: 0px; padding: 0px; - /*width: 100%; height: 12px; */ - - z-index: 110; - color: #ffffff; + z-index: 1400; + color: #fff; } @@ -2469,3 +2442,38 @@ img.mail-list-sender-photo { border-radius: $radiuspx; background-color: #eee; } + +/* nav bootstrap */ +nav i { + font-size: 14px; +} + +nav img { + height: 47px; + width: 47px; + margin: 2px 0px 1px 10px; + border-radius: $radiuspx; +} + +nav ul li { + max-height: 50px +} + +nav a, +nav a:active, +nav a:visited, +nav a:link { + color: #333; +} + +nav .badge { + border-radius: $radiuspx; +} + +nav .dropdown-menu { + font-size: $body_font_size; + border-top-right-radius: 0px; + border-top-left-radius: 0px; + border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radiuspx; +} diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index ca05986a2..cc573d99e 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -4,7 +4,7 @@ {{if $expert}} -{{include file="field_select.tpl" field=$nav_colour}} +{{* include file="field_select.tpl" field=$nav_colour *}} {{include file="field_input.tpl" field=$banner_colour}} {{include file="field_input.tpl" field=$link_colour}} {{include file="field_input.tpl" field=$bgcolour}} @@ -19,7 +19,7 @@ {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$converse_width}} -{{include file="field_input.tpl" field=$nav_min_opacity}} +{{* include file="field_input.tpl" field=$nav_min_opacity *}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} {{include file="field_checkbox.tpl" field=$sloppy_photos}} -- cgit v1.2.3 From 82b028173c89f559b97bc819d232b4b0fa0330e0 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 19 Feb 2014 20:08:02 +0100 Subject: another correction --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 127f09683..5d603c810 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -210,7 +210,7 @@ header #banner { font-family: tahoma, "Lucida Sans", sans; color: $banner_colour; font-weight: bold; - margin: 14px; + margin-top: 14px; } header #banner a, -- cgit v1.2.3 From 9db40322abaccd036a71252633f755ad46064798 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 20 Feb 2014 18:51:35 -0800 Subject: move jgrowl (alert popup) out of the now taller navbar --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5d603c810..b7338346a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1530,7 +1530,7 @@ div.jGrowl div.info { padding-left: 58px; } #jGrowl.top-right { - top: 15px; + top: 65px; right: 15px; } -- cgit v1.2.3 From 052be3c92b466fcfd2c1adc12df8a368aa9bc740 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 21 Feb 2014 12:16:26 +0100 Subject: cleanup style.css --- view/theme/redbasic/css/style.css | 271 +------------------------------------- 1 file changed, 2 insertions(+), 269 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b7338346a..5a8470a60 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -231,49 +231,6 @@ header #banner #logo-text { font-size: 22px; } -.nav-commlink, .nav-login-link { - display: block; - height: 15px; - margin-top: 67px; - margin-right: 2px; - padding: 6px 3px; - float: left; - bottom: 140px; - border: 1px solid #babdb6; - border-bottom: 0px; - background-color: #aec0d3; - color: #565854; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -nav .nav-link { - float: right; - margin: 0.2em 0em; - padding: 0em 0.5em; - background-color: transparent !important; -} - -.nav-commlink.active { - background-color: #ffffff; - border-bottom: 1px solid #ffffff; - color: #000000 !important; - margin-top: 64px; - padding-top: 6px; - padding-bottom: 8px; -} - -.nav-ajax-left { - font-size: 0.8em; - float: left; - margin-top: 62px; -} - - -nav #nav-link-wrapper .nav-link { - border-right: 1px solid #babdb6; -} - .tabs { height: 28px; border-bottom: 1px solid #aaaaaa; @@ -920,17 +877,6 @@ footer { font-family: FontAwesome; } -.nav-dropdown-indicator { - opacity: 0.8; - filter:alpha(opacity=80); -} - -.nav-dropdown-indicator:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - - .location-label, .gender-label, .marital-label, .homepage-label { float: left; text-align: right; @@ -1596,25 +1542,15 @@ div.jGrowl div.info { width: 90%; } -a.rconnect, -nav a, -nav a:active, -nav a:visited, -nav a:link { +a.rconnect { color: #ffffff; text-decoration: none; outline: none; } -a.rconnect:hover, nav a:hover { +a.rconnect:hover { color: #0080FF; } -nav .fakelink { - color: #ffffff; - text-decoration: none; - outline: none; -} -nav .fakelink:hover { text-decoration: none; } #profiles-menu li a { color: #ffffff; @@ -1624,138 +1560,7 @@ nav .fakelink:hover { text-decoration: none; } color: #000000; } -nav .nav-menu-icon { - position: relative; - height: 22px; - padding: 5px; -/* margin: 3px 10px; */ - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; -} -nav .nav-menu-icon.active { - background-color: #FF0000; -} -nav .nav-menu-icon img { - width: 22px; - height: 22px; -} -nav .nav-menu-icon .nav-notify { - top: 3px; -} -nav .nav-menu { - position: relative; - height: 16px; - padding: 5px; - margin: 0px 5px 0px; - font-size: 1.0em; -/* border-bottom: 3px solid #f88; */ -} - -nav:hover .nav-menu { -/* border-bottom: 3px solid #f00; */ -} - -nav .nav-menu.active i { - color: $active_colour; -} - -nav .nav-notify { - background-color: #0080FF; - color: #fff; - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; -/* opacity: 0.6; - filter:alpha(opacity=60); */ - -} -.nav-notify:hover, nav .nav-notify.active span { - color: #ffffff; -} - -nav .nav-notify.show { - display: block; -} -nav #nav-help-link, -nav #nav-login-link, -nav #nav-search-link, -nav #nav-directory-link, -nav #nav-apps-link { - float: right; -} -nav #nav-help-link .menu-popup, -nav #nav-search-link .menu-popup, -nav #nav-directory-link .menu-popup, -nav #nav-apps-link .menu-popup, -nav #nav-site-linkmenu .menu-popup { - right: 0px; - left: auto; -} -nav #nav-notifications-linkmenu.on .icon.s22.notify, -nav #nav-notifications-linkmenu.active .icon.s22.notify { - background-image: url("../../../../images/icons/22/notify_on.png"); -} -nav #nav-apps-link.active { - background-color: #364e59; -} -ul.menu-popup { - position: absolute; - display: none; - width: 10em; - background: #0080FF; - color: #eec; - padding: 0px; - list-style: none; -/* border-radius: 0px 0px 20px 20px; */ - z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -} -ul.menu-popup a { - display: block; - color: #FFFFFF; - padding: 5px 10px; - text-decoration: none; -} - -ul.menu-popup a:hover { - background-color: #888888; - color: #FFFFFF; -} -ul.menu-popup .menu-sep { - border-top: 1px solid #9eabb0; -} -ul.menu-popup li { - float: none; - overflow: auto; - height: auto; - display: block; -} -ul.menu-popup li img { - float: left; - width: 16px; - height: 16px; - padding-right: 5px; -} -ul.menu-popup .empty { - padding: 5px; - text-align: center; - color: #9eabb0; -} -ul.menu-popup .toolbar { - background-color: #9eabb0; - height: auto; - overflow: auto; -} -ul.menu-popup .toolbar a { - float: right; -} -ul.menu-popup .toolbar a:hover { - background-color: #ffffff; -} /* header */ header { position: fixed; @@ -1767,66 +1572,6 @@ header { color: #fff; } - -/* notifications popup menu */ -.nav-notify { - display: none; - position: absolute; - font-size: 10px; - padding: 1px 3px; - top: 0px; - right: -5px; - min-width: 15px; - text-align: right; -} -.nav-notify.show { - display: block; -} -ul.menu-popup { - position: absolute; - display: none; - width: 10em; - margin: 0px; - padding: 0px; - list-style: none; - z-index: 100000; -/* top: 90px; */ -/* left: 400px; */ -} - -.notify-menus { - width: 320px !important; - max-height: 400px; - overflow-y: scroll;overflow-style:scrollbar; -} - -#nav-notifications-menu { - width: 320px; - max-height: 400px; - overflow-y: scroll;overflow-style:scrollbar; - background-color:#FFFFFF; - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; - border: 1px solid #888; -} -#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } -#nav-notifications-menu img { float: left; margin-right: 5px; } -#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; } -#nav-notifications-menu li { - padding: 7px 0px 7px 10px; - word-wrap:normal; - border-bottom: 1px solid #000; -} - -#nav-notifications-menu li:hover { - -} - -#nav-notifications-menu a:hover { - text-decoration: underline; -} - .notif-item a { color: #000000; } @@ -2055,11 +1800,6 @@ margin-right: 50px; color: $toolicon_colour; } -.nav-icon { - font-size: 1.4em; - margin-right: 15px; -} - a .drop-icons { color: $toolicon_colour;; font-size: 1.2em; @@ -2459,13 +2199,6 @@ nav ul li { max-height: 50px } -nav a, -nav a:active, -nav a:visited, -nav a:link { - color: #333; -} - nav .badge { border-radius: $radiuspx; } -- cgit v1.2.3 From 593631d8f5089e07b00288bfabd34c18878d7e41 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 21 Feb 2014 13:03:32 +0100 Subject: oups... to much cleaning... --- view/theme/redbasic/css/style.css | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5a8470a60..b8c6da0eb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -494,6 +494,64 @@ footer { top: 22px; } +ul.menu-popup { + position: absolute; + display: none; + width: 10em; + background: #0080FF; + color: #eec; + padding: 0px; + list-style: none; +/* border-radius: 0px 0px 20px 20px; */ + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #FFFFFF; + padding: 5px 10px; + text-decoration: none; +} + + +ul.menu-popup a:hover { + background-color: #888888; + color: #FFFFFF; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +ul.menu-popup .toolbar { + background-color: #9eabb0; + height: auto; + overflow: auto; +} +ul.menu-popup .toolbar a { + float: right; +} +ul.menu-popup .toolbar a:hover { + background-color: #ffffff; +} + #profile-in-dir-yes-label, -- cgit v1.2.3 From 8c37a01f7459b5f53d367fd0fd9bf6b1765fad50 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 21 Feb 2014 13:57:00 +0100 Subject: dont allow bootstrap to mess with blockquote font-size --- view/theme/redbasic/css/style.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b8c6da0eb..3e902a116 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2268,3 +2268,8 @@ nav .dropdown-menu { border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; } + +/* bootstrap overrides */ +blockquote { + font-size: $body_font_size; +} -- cgit v1.2.3 From 32d0189b560582ef3086e4316aca9dbce1ac781e Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 21 Feb 2014 14:38:21 +0100 Subject: remove some design fixes which got fixed in bootstrap 3.1.1 --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3e902a116..2402e514e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2249,7 +2249,7 @@ nav i { nav img { height: 47px; width: 47px; - margin: 2px 0px 1px 10px; + margin-top: 2px; border-radius: $radiuspx; } -- cgit v1.2.3 From f9eddb89eff2601f8ef4318f16a8360296613935 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 22 Feb 2014 16:10:46 +0100 Subject: Add option for narrow navbar instead of the bootstrap default thick version --- view/theme/redbasic/css/narrow_navbar.css | 27 +++++++++++++++++++++++++++ view/theme/redbasic/php/config.php | 3 +++ view/theme/redbasic/php/style.php | 4 ++++ view/theme/redbasic/tpl/theme_settings.tpl | 1 + 4 files changed, 35 insertions(+) create mode 100644 view/theme/redbasic/css/narrow_navbar.css (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css new file mode 100644 index 000000000..51a0ec196 --- /dev/null +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -0,0 +1,27 @@ +.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;} +.navbar {min-height:18px !important;} +nav img { +height: 25px; +width: 25px; +margin: 2px 0px 1px 10px; +border-radius: 0px; +} +.navbar-left{height: 30px;} +.container-fluid {min-height:30px;} +.collapse .navbar-collapse {min-height:30px; max-height:30px;} +#nav-search-text {margin:5px;} +header #banner {margin-top:5px;} +nav .dropdown-menu { +top: 30px;} +nav .badge { + position: relative; + top: -30px; + float: right; + font-size: 10px; + padding: 2px 6px; + cursor: pointer; +} +#jGrowl.top-right { + top: 30px; + right: 15px; +} \ No newline at end of file diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 68a72fffd..2235a9742 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -6,6 +6,7 @@ function theme_content(&$a) { $arr = array(); $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); + $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' ); $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); $arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' ); $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); @@ -33,6 +34,7 @@ function theme_post(&$a) { if (isset($_POST['redbasic-settings-submit'])) { set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); + set_pconfig(local_user(), 'redbasic', 'narrow_navbar', $_POST['redbasic_narrow_navbar']); set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']); set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']); set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); @@ -97,6 +99,7 @@ if(feature_enabled(local_user(),'expert')) '$expert' => $expert, '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), + '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']), '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours), '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 8d5c23a03..901d06af7 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -14,6 +14,7 @@ if(! $a->install) { $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); // Load the owners pconfig + $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); $link_colour = get_pconfig($uid, "redbasic", "link_colour"); $schema = get_pconfig($uid,'redbasic','schema'); @@ -213,3 +214,6 @@ echo str_replace(array_keys($options), array_values($options), $x); if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css'); } +if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { + echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); +} diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index cc573d99e..af2969397 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -5,6 +5,7 @@ {{if $expert}} {{* include file="field_select.tpl" field=$nav_colour *}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$banner_colour}} {{include file="field_input.tpl" field=$link_colour}} {{include file="field_input.tpl" field=$bgcolour}} -- cgit v1.2.3 From a5f70f6c10705c655ad31e906626ac3513da00fe Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 22 Feb 2014 20:30:41 +0100 Subject: little tweaks --- view/theme/redbasic/css/narrow_navbar.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 51a0ec196..b05f46797 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,5 +1,5 @@ .navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;} -.navbar {min-height:18px !important;} +.navbar {min-height:25px !important;} nav img { height: 25px; width: 25px; @@ -8,7 +8,7 @@ border-radius: 0px; } .navbar-left{height: 30px;} .container-fluid {min-height:30px;} -.collapse .navbar-collapse {min-height:30px; max-height:30px;} +.collapse .navbar-collapse {min-height:30px;} #nav-search-text {margin:5px;} header #banner {margin-top:5px;} nav .dropdown-menu { -- cgit v1.2.3