diff options
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r-- | view/theme/redbasic/css/narrow_navbar.css | 13 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 215 | ||||
-rw-r--r-- | view/theme/redbasic/js/redbasic.js | 11 | ||||
-rw-r--r-- | view/theme/redbasic/php/style.php | 24 | ||||
-rw-r--r-- | view/theme/redbasic/schema/bluegrid.css | 30 | ||||
-rw-r--r-- | view/theme/redbasic/schema/dark.css | 40 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.css | 33 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.css | 48 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.css | 49 |
9 files changed, 376 insertions, 87 deletions
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 9d14beb33..faa18dfe5 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,4 +1,13 @@ @media screen and (min-width: 760px) { + + aside { + padding-top: 52px; + } + + section { + padding-top: 52px; + } + .navbar-nav > li > a { padding-top:7px !important; padding-bottom:3px !important; @@ -56,4 +65,8 @@ top: 30px; right: 15px; } + + .contextual-help-content-open { + top: 32px; + } } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 903900e7f..6cc3e2f10 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -113,9 +113,6 @@ pre code { } code { - font-size: 1em; - padding: 1em 1.5em; - border: 1px solid #ccc; background: #ccc; color: #000; } @@ -200,6 +197,50 @@ header #banner #logo-text { font-size: 22px; } +/* contextual help */ +.contextual-help-content { + display: none; + +} + +.contextual-help-content-open { + display: block; + position: fixed; + top: 51px; + width: 100%; + max-height: 50%; + background: $comment_item_colour; + padding: 20px; + border-bottom: #ccc 1px solid; + overflow: auto; + -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); + -webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); + box-shadow: 0px 3px 3px rgba(0,0,0,0.2); +} + +.contextual-help-content dd { + margin-bottom: 1em; +} + +.contextual-help-tool { + padding: 7px; + filter: alpha(opacity=20); + opacity: .2; +} + +.contextual-help-tool:hover { + filter: alpha(opacity=50); + opacity: .5; + text-decoration: none; +} + +.contextual-help-tool i { + color: #000; + font-size: 16px; +} + +/* contextual help end */ + /* footer */ footer { @@ -482,6 +523,10 @@ footer { clear: both; } +#nav-notifications-template { + display: none; +} + #nav-searchbar { float: right; margin-top: 2px; @@ -868,32 +913,65 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { clear: both; } +.modal-header .contextual-help-tool { + /* Mostly duplicating ".modal-header .close" and ".close" layout settings from bootstrap */ + float: right; + font-size: 21px; + padding: 0; + margin-top: -4px; + margin-right: 15px; + line-height: 1; +} + #acl-search { - margin-top: 20px; - padding: 8px; + padding: 4px; border: 1px solid #ccc; width: 100%; } #acl-search::-webkit-input-placeholder { - font-family: FontAwesome; + /* non-fontawesome fonts set a fallback for text parts of the placeholder*/ + font-family: FontAwesome, sans-serif, arial, freesans; } #acl-search::-moz-placeholder { - font-family: FontAwesome; + /* non-fontawesome fonts set a fallback for text parts of the placeholder*/ + font-family: FontAwesome, sans-serif, arial, freesans; +} + +#aclModal .modal-body { + padding-top: 10px; +} + +#acl-showlimited-description { + font-size: 90%; + color: #888; + margin-left: 10px; + margin-bottom: 4px; } #acl-list { - display: block; border: 1px solid #ccc; + -webkit-border-radius: $radiuspx ; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; +} + +#acl-search-wrapper { + padding: 7px 10px; + background-color: $item_colour; + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; + border-bottom: 1px solid #ccc; +} + +#acl-list-content-wrapper { + display: block; overflow: auto; clear: both; min-height: 62px; - margin-top: 20px; padding: 10px 10px 0px 0px; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; + } #jotnets-wrapper, #jotnets-collapse { @@ -913,6 +991,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { -webkit-border-radius: $radiuspx ; -moz-border-radius: $radiuspx; border-radius: $radiuspx; + background-color: white; } .acl-list-item.grouphide { @@ -951,6 +1030,34 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { margin-left: 5px; } +#acl-showlimited-caption, +#acl-showall-caption { + font-size: 115%; +} + +#acl-radiowrapper-showall { + margin-top: 20px; + margin-bottom: 20px; +} +#acl-radiowrapper-showlimited { + margin-bottom: 0; +} + +#acl-showall + i { + font-size: 140%; +} + +#acl-info-icon, +#acl-info-icon:active { + font-size: 110%; + color: $link_colour; + text-decoration: none; +} + +#acl-showall-caption { + margin-left: 0.35em; +} + .contact-block-content { margin-top: 10px; } @@ -1029,18 +1136,31 @@ margin-right: 50px; list-style-type: none; } +.generic-icons { + font-size: 1.2em; + color: $toolicon_colour; + margin-right: 7px; +} + +.generic-icons:hover { + color: $toolicon_colour; +} + .admin-icons { font-size: 1.2em; color: $toolicon_colour; - margin-right: 10px; + margin-right: 7px; } +.drop-icons, a .drop-icons { color: $toolicon_colour; font-size: 1.2em; text-decoration: none; + cursor: pointer; } - + +.drop-icons:hover, a .drop-icons:hover { color: #FF0000; } @@ -1108,22 +1228,15 @@ img.mail-conv-sender-photo { } #profile-jot-text { - resize: none; - border-width: 0px; border-radius: $radiuspx; } -#profile-jot-text:focus { - resize: vertical; -} - - #profile-jot-text::-webkit-input-placeholder { - font-size:16px; + font-size: 16px; } #profile-jot-text::-moz-placeholder { - font-size:16px; + font-size: 16px; } #profile-jot-text:focus::-webkit-input-placeholder { @@ -1303,9 +1416,6 @@ img.mail-conv-sender-photo { display: block; border-top: 1px dashed #ccc; text-align: center; - font-size: $body_font_size; - color: $link_colour; - cursor: pointer; } .divgrow-showmore:hover { @@ -1346,9 +1456,8 @@ img.mail-conv-sender-photo { -moz-border-radius: $radiuspx; } -.profile-thing-list img, .thing-show img, .thing-edit-links a { - margin-top: 8px; - margin-right: 15px; +.thing-show img { + margin: 10px; } .abook-self { @@ -1546,6 +1655,7 @@ main.fullscreen .section-content-wrapper-np { display: none; } +.atoken-index-row:hover td, .chatroom-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, @@ -1645,9 +1755,7 @@ nav .badge.mail-update:hover { .navbar-inverse .navbar-nav > li > a { - font-size: 12px; color: $nav_icon_colour; - text-shadow: 0px 0px 0px; } .navbar-inverse .navbar-nav > li > a:hover, @@ -1681,7 +1789,8 @@ nav .badge.mail-update:hover { } #expand-aside, -#expand-tabs { +#expand-tabs, +#context-help-btn { color: $nav_active_icon_colour; padding: 7px 10px; } @@ -1789,8 +1898,29 @@ nav .badge.mail-update:hover { margin-top:-3px; } +dl.bb-dl > dt { + /* overriding the default dl style from bootstrap, as bootstrap's + style of a bold unindented line followed by a plain unindented + line is already acheivable in bbcode without dl */ + font-weight: normal; +} +dl.dl-terms-monospace > dt { font-family: monospace; } +dl.dl-terms-bold > dt { font-weight: bold; } +dl.dl-terms-italic > dt { font-style: italic; } +dl.dl-terms-underline > dt { text-decoration: underline; } +dl.dl-terms-large > dt { font-size: 120%; } +dl.bb-dl:not(.dl-horizontal) > dd { + display: block; + margin-left: 2em; +} +dl.bb-dl > dd > li { + /* adding some indent so bullet-list items will line up better with + dl descriptions if someone wants to be impure and combine them */ + margin-left: 1em; +} + .bootstrap-tagsinput .tag:before { - /* Copied from icon-asterisk, is there a better way to do it? */ + /* Copied from fa-asterisk, is there a better way to do it? */ font-family: FontAwesome; font-weight: normal; font-style: normal; @@ -1815,7 +1945,10 @@ nav .badge.mail-update:hover { } /* 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 } +.theme-green .back-bar .selected-bar { + background-color: #000000; + background-image: none !important; +} /* Turn checkboxes into switches */ @@ -1891,10 +2024,6 @@ nav .badge.mail-update:hover { background-color: #337AB7; } -/*.channels_ckbx, .pending_ckbx, .users_ckbx { - margin-top: -5px !important; -}*/ - .help-searchlist { list-style-type: none; } @@ -1902,3 +2031,13 @@ nav .badge.mail-update:hover { .help-searchlist a { font-size: 130%; } + +.embed-photo-selected-photo { + border-color: blue; + border-style: solid; + border-width: 5px; +} + +#wiki-preview img { + max-width: 100%; +}
\ No newline at end of file diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 877bcd840..999b46268 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -17,7 +17,7 @@ $(document).ready(function() { $('#css3-calc').remove(); // Remove the test element $('#expand-aside').click(function() { - $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); + $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); $('main').toggleClass('region_1-on'); }); @@ -29,7 +29,7 @@ $(document).ready(function() { if(!$('#tabs-collapse-1').hasClass('in')){ $('html, body').animate({ scrollTop: 0 }, 'slow'); } - $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); + $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); if($('#tabs-collapse-1').length === 0) { @@ -56,13 +56,14 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { $('main').css({'transition': 'none'}).addClass('fullscreen'); - $('#fullscreen-btn, header, nav, aside').css({'display': 'none'}); + $('header, nav, aside, #fullscreen-btn').hide(); + $('#tabs-collapse-1').css({'visibility': 'hidden'}); $('#inline-btn').show(); - } else { $('main').removeClass('fullscreen'); - $('#fullscreen-btn, header, nav, aside').css({'display': ''}); + $('header, nav, aside, #fullscreen-btn').show(); + $('#tabs-collapse-1').css({'visibility': ''}); $('#inline-btn').hide(); $('main').css({'transition': ''}); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 83c35935a..2db0d4c44 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -153,6 +153,18 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); + if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { + $x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); + } + + if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { + $x .= file_get_contents('view/theme/redbasic/css/align_left.css'); + } + + if($schemecss) { + $x .= $schemecss; + } + $aside_width = 287; // left aside and right aside are 285px + converse width @@ -204,18 +216,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) { } -if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { - echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); -} - -if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { - echo file_get_contents('view/theme/redbasic/css/align_left.css'); -} - -if($schemecss) { - echo $schemecss; -} - // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index 36e26302a..64e5a2c95 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -333,6 +333,15 @@ input { text-decoration: none; } +.section-content-info-wrapper { + color: #fff; + background-color: #43488A; +} + +.section-content-info-wrapper a { + color: #fff; +} + .btn, #event-edit-form .btn, input.directory-rating-submit { border: 1px solid #FFF; color: #FFF; @@ -433,7 +442,7 @@ input { border-color: #AC2925 !important; } -a:hover > .icon-trash { +a:hover > .fa-trash-o { color: #C9302C !important; } @@ -450,10 +459,10 @@ a:hover > .icon-trash { .navbar-inverse .navbar-toggle .icon-bar { background-color: #FFF; } - .navbar-inverse .navbar-toggle .icon-circle-arrow-down, .navbar-inverse .navbar-toggle .icon-circle-arrow-right, .navbar-inverse .navbar-toggle .icon-circle-arrow-up, .navbar-inverse .navbar-toggle .icon-circle-arrow-left { + .navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left, .navbar-inverse .navbar-toggle .fa-question-circle { color: #FFF; } - .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-left, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-left { + .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left { color: #43488A; } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { @@ -464,4 +473,19 @@ a:hover > .icon-trash { } } +.help-content { + color: #FFF; + border: none; +} + +.help-content a { + color: #FFF; + font-weight: 600; +} + +.help-content-open { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 6ed2501e1..ea50f50ec 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -63,7 +63,7 @@ background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%); } -.alert-info { +.alert-info, .section-content-info-wrapper { color: #CCC; background-color:#333; border-color: #444; @@ -79,16 +79,35 @@ color: #fff; } +#acl-select { + background-color:#333; + border: 1px solid #444; + color: #FFF; +} + #acl-showall { - color: #fff; + color: #FFF; } + #acl-list { - border: 1px solid #333; + border: 1px solid #444; +} + +#acl-search-wrapper { + border-bottom: 1px solid #444; } .acl-list-item { - border: 1px solid #333; + border: 1px solid #222; + color: #CCC; + background-color:#333; +} + +.abook-self { + border: 1px solid #222; + color: #555; + background-color:#111; } .modal-content { @@ -312,7 +331,7 @@ pre { background-image: none; } -.open .dropdown-toggle.btn-default { +.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { color: #ccc; background-color: #222; border-color: #222; @@ -360,3 +379,14 @@ pre { .table > tbody > tr > td { border-color: #888; } + +.help-content { + border-bottom: #222 thin solid; +} + +.help-content-open { + -moz-box-shadow: 0px 3px 3px #222; + -webkit-box-shadow: 0px 3px 3px #222; + box-shadow: 0px 3px 3px #222; +} + diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index ba9771a40..b7cca0930 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -51,8 +51,21 @@ background-image: linear-gradient(to bottom, #fff 0px, #fff 100%); } +#acl-select { + border: 1px solid #000; + color: #000; +} + +.acl-list-item { + border: 1px solid #000; + background-color: #FFF; + +} + .abook-self { - background-color: #fff; + border: 1px solid #EEE; + color: #ccc; + background-color: #EEE; } .acl-button-show, @@ -60,18 +73,10 @@ color: #000; } -#acl-showall { - color: #000; -} - #acl-list { border: 1px solid #fff; } -.acl-list-item { - border: 1px solid #fff; -} - .modal-content { background-color: #fff; } @@ -275,3 +280,13 @@ pre { background-color: inherit; border: none; } + +.help-content { + border-bottom: #000 thin solid; +} + +.help-content-open { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index e6901143b..990980e8f 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -51,8 +51,30 @@ background-image: linear-gradient(to bottom, #000 0px, #000 100%); } +.section-content-info-wrapper { + color: #50f148; + background-color:#000; + border: 1px solid #143D12 !important; +} + +.modal-header { + border-bottom: 1px solid #143D12; +} + +.modal-footer { + border-top: 1px solid #143D12; +} + +#acl-select { + background-color: #000; + border: 1px solid #143D12; + color: #50f148; +} + .abook-self { - background-color: #000; + color: #333; + background-color: #000 !important; + border: 1px solid #111; } .acl-button-show, @@ -60,16 +82,18 @@ color: #fff; } -#acl-showall { - color: #fff; +#acl-list { + border: 1px solid #143D12; } -#acl-list { - border: 1px solid #000; +#acl-search-wrapper { + border-bottom: 1px solid #143D12; } .acl-list-item { - border: 1px solid #000; + border: 1px solid #111; + background-color:#111; + } .modal-content { @@ -267,7 +291,7 @@ pre { background-image: none; } -.open .dropdown-toggle.btn-default { +.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { color: #50f148; background-color: #000; border-color: #143D12; @@ -305,3 +329,13 @@ pre { .table > tbody > tr > td { border-color: #143D12; } + +.help-content { + border-bottom: #143D12 thin solid; +} + +.help-content-open { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index a2d024881..c23dbaf68 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -47,8 +47,30 @@ background-image: linear-gradient(to bottom, #000 0px, #000 100%); } +.section-content-info-wrapper { + color: #fff; + background-color:#000; + border: 1px solid #fff !important; +} + +.modal-header { + border-bottom: 1px solid #000; +} + +.modal-footer { + border-top: 1px solid #000; +} + +#acl-select { + background-color: #000; + border: 1px solid #fff; + color: #fff; +} + .abook-self { - background-color: #000; + color: #333; + background-color: #111 !important; + border: 1px solid #111; } .acl-button-show, @@ -56,16 +78,17 @@ color: #fff; } -#acl-showall { - color: #fff; +#acl-list { + border: 1px solid #000; } -#acl-list { - border: 1px solid #000; +#acl-search-wrapper { + border-bottom: 1px solid #000; } .acl-list-item { - border: 1px solid #000; + border: 1px solid #fff; + background-color:#000; } .modal-content { @@ -246,10 +269,10 @@ pre { background-image: none; } -.open .dropdown-toggle.btn-default { +.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { color: #fff; background-color: #000; - border-color: #000; + border-color: #fff; } .preview { @@ -279,3 +302,13 @@ pre { .table > tbody > tr > td { border-color: #FFF; } + +.help-content { + border-bottom: #FFF thin solid; +} + +.help-content-open { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} |