diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 188 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 18 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 90 |
3 files changed, 107 insertions, 189 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c632dbc74..caebd04d5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -54,28 +54,27 @@ main { } h1, .h1 { - font-size: 2em; + font-size: 2rem; } h2, .h2 { - font-size: 1.667em; + font-size: 1.6rem; } h3, .h3 { - font-size: 1.334em; + font-size: 1.2rem; } h4, .h4 { - font-size: 1em; - font-weight: bold; + font-size: 1.05rem; } h5, .h5 { - font-size: 1em; + font-size: 0.9rem; } h6, .h6 { - font-size: 0.75em; + font-size: 0.75rem; } @@ -213,7 +212,7 @@ nav #banner #logo-text a:hover { text-decoration: none; } header #banner { z-index: 1040; - margin-top: 14px; + margin-top: 10px; text-align: center; text-shadow: 1px 1px 2px rgba(0,0,0,.5); font-size: 14px; @@ -348,7 +347,7 @@ footer { .fn { font-weight: bold; - font-size: 16px; + font-size: $font_size; color: #444444; } @@ -570,36 +569,25 @@ footer { display: none; } -#nav-searchbar { - float: right; - margin-top: 2px; - margin-right: 10px; -} - #nav-search-spinner { float: left; margin: 25px 0px 0px 25px; color: $nav_active_icon_colour; } -#nav-search-text:hover, -#nav-search-text:focus { - background-color: #fff; - color: #000; -} - +/* #nav-search-text { font-size: 12px; width: 200px; height: 20px; - margin: 15px; + margin-right: 15px; padding: 0px 5px 0px 5px; border-radius: $radiuspx; border-color: $nav_bd; background-color: #eee; transition: background-color 300ms ease 0s; } - +*/ #nav-search-text::-webkit-input-placeholder { font-family: FontAwesome, sans-serif; } @@ -609,7 +597,7 @@ footer { } nav .acpopup { - top: 50px !important; + top: 46px !important; margin-left: -35px; width: 290px; } @@ -930,9 +918,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding-top: 2px; font-weight: bold; line-height: 1em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; display: block; } @@ -1181,9 +1166,15 @@ margin-right: 50px; } .generic-icons { - font-size: 1.2em; + font-size: 1rem; color: $toolicon_colour; - margin-right: 7px; + margin-right: 0.5rem; +} + +.generic-icons-right { + font-size: 1rem; + color: $toolicon_colour; + margin-left: 0.5rem; } .generic-icons:hover { @@ -1320,9 +1311,10 @@ img.mail-conv-sender-photo { /* conversation */ -.nsfw-wrap { - text-align: center; - font-size: $body_font_size; + +.top-radius { + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; } .wall-event-item { @@ -1339,10 +1331,6 @@ img.mail-conv-sender-photo { border-top-left-radius: $radiuspx; } -.wall-item-title { - font-size: $font_size; -} - .wall-item-footer { font-size: $body_font_size; margin-top: 2em; @@ -1413,18 +1401,14 @@ img.mail-conv-sender-photo { .wall-item-ago, .dropdown-sub-text { color: #777; - font-size: 0.833em; -} - -.wall-item-ago i { - font-size: 0.833em; } .wall-item-content, .mail-conv-body, .page-body, .chat-item-text, -.chat-item-text-self { +.chat-item-text-self, +#doco-content { font-size: $font_size; clear: both; } @@ -1486,6 +1470,11 @@ img.mail-conv-sender-photo { color: $toolicon_colour; } +.widget .nav-item:hover { + background-color: #eee; + border-radius: $radiuspx; +} + #note-text { border: 1px solid #ccc; border-radius: $radiuspx; @@ -1540,26 +1529,11 @@ nav img { 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; -} - -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:focus, -.dropdown-menu > .active > a:hover { - color: #333; - background-color: #f5f5f5; -} - .dropdown-menu-img-sm { - float: left; - width: 36px; - height: 36px; + width: 3em; + height: 3em; margin-right: 5px; + float: left; } .dropdown-menu-img-xs { @@ -1568,16 +1542,14 @@ nav .dropdown-menu { margin-right: 5px; } -#usermenu-caret { - color: $nav_icon_colour; +.usermenu { + width: 2rem; + height: 2rem; } -.usermenu-head { - float: left; -} - -.usermenu-head:hover #usermenu-caret { - color: $nav_active_icon_colour; +.usermenu img { + width: 100%; + height: 100%; } .page-title { @@ -1613,8 +1585,12 @@ nav .dropdown-menu { text-overflow: ellipsis; } +.section-subtitle-wrapper h3 { + padding: 3px; +} + .section-subtitle-wrapper { - padding: 7px 10px; + padding: 4px 10px; background-color: $item_colour; border-bottom: 3px solid $comment_item_colour; } @@ -1734,6 +1710,10 @@ nav ul li .notify-unseen /* bootstrap overrides */ +.btn { + font-size: $body_font_size; +} + .panel { background-color: transparent; border: 0px solid transparent; @@ -1754,17 +1734,6 @@ blockquote { margin: 0px; } -.badge { - border-radius: $radiuspx; -} - -nav .badge.home-update, -nav .badge.notify-update, -nav .badge.intro-update, -nav .badge.mail-update { - background-color: #C9302C; -} - .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; @@ -1774,6 +1743,7 @@ nav .badge.mail-update { border-radius: $radiuspx; } +/* .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); background-image: linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%); @@ -1782,6 +1752,7 @@ nav .badge.mail-update { border-color: $nav_bd; } + .navbar-inverse .navbar-collapse { border-color: $nav_bd; } @@ -1826,26 +1797,9 @@ nav .badge.mail-update { .navbar-inverse .navbar-toggle .icon-bar { background-color: $nav_active_icon_colour; } +*/ -.navbar-toggle-extra { - color: $nav_active_icon_colour; - padding: 7px 10px; -} - -.navbar-toggle-extra-left { - float: left; - margin-left: 15px; - margin-right: 0px; - color: $nav_active_icon_colour; - padding: 7px 10px; -} - -a.navbar-toggle-extra:hover, -a.navbar-toggle-extra-left:hover { - color: $nav_active_icon_colour; - text-decoration: none; -} - +/* .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); border-top-left-radius: 4px; @@ -1863,24 +1817,13 @@ a.navbar-toggle-extra-left:hover { .nav-tabs > li.active > a:focus { background-color: transparent; } +*/ #tabs-collapse-1 { padding: 0px; margin-bottom: 25px; } -.btn { - font-size: $body_font_size; -} - -.btn-xs { - font-size: 0.75rem; -} - -.btn-default { - background-color: transparent; -} - @media screen and (max-width: 767px) { aside#region_1 { @@ -1901,16 +1844,6 @@ a.navbar-toggle-extra-left:hover { border:1px; } - .wall-item-photo { - width: 48px !important; - height: 48px !important; - } - - .comment .wall-item-photo { - width: 32px !important; - height: 32px !important; - } - .acl-list-item { width: 98%; /* fallback if browser does not support calc() */ width: calc(100% - 10px); @@ -2067,7 +2000,7 @@ dl.bb-dl > dd > li { .field.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; - background-color: #337AB7; + background-color: #0275d8; } .help-searchlist { @@ -2100,17 +2033,6 @@ dl.bb-dl > dd > li { border-left: 3px solid #eee; } -.nav-pills-stacked-icons { - padding: 6px 10px; - float: right; - position: relative; - z-index:1; -} - -.nav-pills-stacked-icons:hover + a { - background-color: #eee; -} - .app-icon { font-size: 80px; color: $toolicon_colour; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 81a95c68b..1ed5e520f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -40,21 +40,17 @@ $(document).ready(function() { left_aside_height = $('#left_aside_wrapper').height(); } }); - - if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) { - $('#expand-aside').hide(); - } - +/* $('#expand-tabs').click(function() { - if(!$('#tabs-collapse-1').hasClass('in')){ - $('html, body').animate({ scrollTop: 0 }, 'slow'); + if($('#tabs-collapse-1').hasClass('show')){ + $('#tabs-collapse-1').removeClass('show'); } $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); - - $('.usermenu-head').click(function() { - if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){ - $('#navbar-collapse-1, #navbar-collapse-2').removeClass('in'); +*/ + $('.usermenu').click(function() { + if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); } }); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9b994ebdf..6e8a43a47 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -10,33 +10,33 @@ if(! App::$install) { } // Load the owners pconfig - $nav_bg = get_pconfig($uid, "redbasic", "nav_bg"); - $nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top"); - $nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom"); - $nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top"); - $nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom"); - $nav_bd = get_pconfig($uid, "redbasic", "nav_bd"); - $nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour"); - $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); + $nav_bg = get_pconfig($uid, 'redbasic', 'nav_bg'); + $nav_gradient_top = get_pconfig($uid, 'redbasic', 'nav_gradient_top'); + $nav_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_gradient_bottom'); + $nav_active_gradient_top = get_pconfig($uid, 'redbasic', 'nav_active_gradient_top'); + $nav_active_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_active_gradient_bottom'); + $nav_bd = get_pconfig($uid, 'redbasic', 'nav_bd'); + $nav_icon_colour = get_pconfig($uid, 'redbasic', 'nav_icon_colour'); + $nav_active_icon_colour = get_pconfig($uid, 'redbasic', 'nav_active_icon_colour'); $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); - $link_colour = get_pconfig($uid, "redbasic", "link_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"); + $bgcolour = get_pconfig($uid, 'redbasic', 'background_colour'); + $background_image = get_pconfig($uid, 'redbasic', 'background_image'); $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); - $item_colour = get_pconfig($uid, "redbasic", "item_colour"); - $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); - $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); - $comment_indent = get_pconfig($uid, "redbasic", "comment_indent"); - $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); - $font_size = get_pconfig($uid, "redbasic", "font_size"); - $font_colour = get_pconfig($uid, "redbasic", "font_colour"); - $radius = get_pconfig($uid, "redbasic", "radius"); - $shadow = get_pconfig($uid,"redbasic","photo_shadow"); - $converse_width=get_pconfig($uid,"redbasic","converse_width"); - $align_left=get_pconfig($uid,"redbasic","align_left"); + $item_colour = get_pconfig($uid, 'redbasic', 'item_colour'); + $comment_item_colour = get_pconfig($uid, 'redbasic', 'comment_item_colour'); + $comment_border_colour = get_pconfig($uid, 'redbasic', 'comment_border_colour'); + $comment_indent = get_pconfig($uid, 'redbasic', 'comment_indent'); + $body_font_size = get_pconfig($uid, 'redbasic', 'body_font_size'); + $font_size = get_pconfig($uid, 'redbasic', 'font_size'); + $font_colour = get_pconfig($uid, 'redbasic', 'font_colour'); + $radius = get_pconfig($uid, 'redbasic', 'radius'); + $shadow = get_pconfig($uid,'redbasic','photo_shadow'); + $converse_width=get_pconfig($uid,'redbasic','converse_width'); + $align_left=get_pconfig($uid,'redbasic','align_left'); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); @@ -86,59 +86,59 @@ if (! $schema) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) - $nav_bg = "#222"; + $nav_bg = '#222'; if (! $nav_gradient_top) - $nav_gradient_top = "#3c3c3c"; + $nav_gradient_top = '#3c3c3c'; if (! $nav_gradient_bottom) - $nav_gradient_bottom = "#222"; + $nav_gradient_bottom = '#222'; if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#222"; + $nav_active_gradient_top = '#222'; if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#282828"; + $nav_active_gradient_bottom = '#282828'; if (! $nav_bd) - $nav_bd = "#222"; + $nav_bd = '#222'; if (! $nav_icon_colour) - $nav_icon_colour = "#999"; + $nav_icon_colour = '#999'; if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#fff"; + $nav_active_icon_colour = '#fff'; if (! $link_colour) - $link_colour = "#337AB7"; + $link_colour = '#0275d8'; if (! $banner_colour) - $banner_colour = "#fff"; + $banner_colour = '#fff'; if (! $bgcolour) - $bgcolour = "rgb(254,254,254)"; + $bgcolour = 'rgb(254,254,254)'; if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "rgb(238,238,238)"; + $item_colour = 'rgb(238,238,238)'; if (! $comment_item_colour) - $comment_item_colour = "rgb(255,255,255)"; + $comment_item_colour = 'rgb(255,255,255)'; if (! $comment_border_colour) - $comment_border_colour = "rgb(255,255,255)"; + $comment_border_colour = 'rgb(255,255,255)'; if (! $toolicon_colour) $toolicon_colour = '#777'; if (! $toolicon_activecolour) $toolicon_activecolour = '#000'; if (! $item_opacity) - $item_opacity = "1"; + $item_opacity = '1'; if (! $font_size) - $font_size = "0.9rem"; + $font_size = '1rem'; if (! $body_font_size) - $body_font_size = "0.75rem"; + $body_font_size = '0.9rem'; if (! $font_colour) - $font_colour = "#4d4d4d"; + $font_colour = '#4d4d4d'; if (! $radius) - $radius = "4"; + $radius = '4'; if (! $shadow) - $shadow = "0"; + $shadow = '0'; if (! $converse_width) - $converse_width = "790"; + $converse_width = '790'; if(! $top_photo) - $top_photo = '48px'; + $top_photo = '2.2rem'; if(! $comment_indent) $comment_indent = '0px'; if(! $reply_photo) - $reply_photo = '32px'; + $reply_photo = '2.2rem'; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; |