diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 23 | ||||
| -rw-r--r-- | view/css/conversation.css | 16 | ||||
| -rw-r--r-- | view/css/default.css | 9 | ||||
| -rw-r--r-- | view/css/widgets.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 106 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 16 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/common_tabs.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 |
10 files changed, 69 insertions, 126 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index aff35bf85..10d341691 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,28 +1,9 @@ /* override some bootstrap settings */ -*, -*:before, -*:after { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} html { font-size: 100%; } -.panel-body .form-control{ - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.profile-jot-text{ - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - - h1, .h1 { font-size: 24px; @@ -121,6 +102,10 @@ nav .navbar-collapse .navbar-right { margin-right: 5px; } +.nav-tabs.nav-justified > li { + white-space: nowrap; +} + code { white-space: normal; } diff --git a/view/css/conversation.css b/view/css/conversation.css index 188dbaccc..8d7404b5d 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,16 +1,12 @@ /* jot */ -#profile-jot-wrapper { - margin-top: 25px; -} - #jot-title, #jot-category, #jot-pagetitle { border: 0px; margin: 0px; padding: 8px; - height: 1.8em; + height: 3.4em; width: 70%; margin-bottom: 5px; } @@ -20,10 +16,10 @@ } #profile-jot-text { - height: 1.8em; + height: 3.4em; padding: 8px; margin-right: 0px; - width: 90%; + width: 100%; } #profile-jot-text-loading { @@ -33,11 +29,11 @@ #profile-jot-submit-wrapper { margin-top: 10px; - width: 90%; + width: 100%; } #profile-jot-submit { - height: 22px; + height: 30px; width: 70px; float: right; } @@ -373,7 +369,7 @@ } .comment-edit-text-empty { - height: 1.2em; + height: 2.8em; width: 30%; overflow: auto; margin-bottom: 10px; diff --git a/view/css/default.css b/view/css/default.css index f8d00d34c..c6a8fe58e 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -14,11 +14,12 @@ main { } aside#region_1 { - width: 210px; - min-width: 210px; + width: 231px; + min-width: 231px; + max-width: 231px; display: table-cell; vertical-align: top; - padding: 65px 7px 7px 7px; + padding: 65px 7px 0px 7px; } aside input[type='text'] { @@ -29,5 +30,5 @@ section { width: 100%; display: table-cell; vertical-align: top; - padding: 65px 15px 200px 7px; + padding: 65px 13px 200px 13px; } diff --git a/view/css/widgets.css b/view/css/widgets.css index dcda66b81..7c2a03c3b 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -22,8 +22,8 @@ /* notes */ #note-text { - width: 190px; - max-width: 190px; + width: 100%; + resize: vertical; height: 150px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3b61ceab1..ecb9352ec 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -138,51 +138,10 @@ blockquote { filter:alpha(opacity=100); } - -#langselector { - position: fixed; - top: 3px; - left: 5px; - z-index:9999; - opacity: 0.3; - filter:alpha(opacity=30); - - -} -#langselector:hover { - opacity: 1.0; - 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%); - background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); +nav, +header { opacity: $nav_float_min_opacity; filter:alpha(opacity=$nav_percent_min_opacity); - -} - -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%); - background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - opacity: 1.0; - filter:alpha(opacity=100); - -} -*/ - -nav #site-location { - color: #888a85; - font-size: 0.8em; - position: absolute; } .error-message { @@ -213,10 +172,6 @@ nav #banner #logo-text a { } nav #banner #logo-text a:hover { text-decoration: none; } -header #site-location { - display: none; -} - header #banner { overflow: hidden; text-align: center; @@ -245,31 +200,6 @@ header #banner #logo-text { font-size: 22px; } -.tabs { - height: 28px; - border-bottom: 1px solid #aaaaaa; - padding:0px; - width: 100%; -} - -.tabs li { margin: 0px; list-style: none; } -.tab { - display:block; - float:left; - margin-right: 15px ; -} - -.tab.active { - color: #444444; -} - -ul.tabs { - margin-top: 0px; - margin-bottom: 0px; - list-style-type: none; - -} - /* footer */ footer { @@ -427,6 +357,10 @@ footer { color: #444444; } +.vcard { + padding: 8px; +} + .vcard .title { margin-bottom: 5px; } @@ -499,9 +433,9 @@ footer { #profile-photo-wrapper img { - width:175px; - height:175px; padding: 12px; + width: 201px; + height: 201px; } #profile-in-dir-yes-label, @@ -797,6 +731,7 @@ footer { #contact-block { margin-top: 25px; + padding: 8px; } #contact-block-numcontacts { @@ -806,8 +741,8 @@ footer { .contact-block-div { float: left; - width: 52px; - height: 52px; + width: 50px; + height: 50px; } .contact-block-textdiv { float: left; @@ -1310,7 +1245,7 @@ brain is weird like that */ background-image:url("../../../../images/onoff.jpg"); background-repeat: no-repeat; padding: 4px 2px 2px 2px; - height: 16px; + height: 24px; text-decoration: none; } .field .onoff .off { @@ -1500,6 +1435,9 @@ div.jGrowl div.info { right: 15px; } +div.jGrowl div.jGrowl-notification { + min-height: 60px; +} #id_term_label { width:75px; @@ -2308,11 +2246,19 @@ blockquote { background-color: $nav_active_icon_colour; } -#expand-aside { +#expand-aside, +#expand-tabs { color: $nav_active_icon_colour; padding: 7px 10px; } +#tabs-collapse-1 { + padding: 0px; + margin-bottom: 25px; + border-top: none; + box-shadow: none; +} + @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); @@ -2326,8 +2272,8 @@ blockquote { } main { - left: -227px; - width: calc( 100% + 227px ); + left: -231px; + width: calc( 100% + 231px ); } main.region_1-on { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index bec7c55c8..c58711e94 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -1,5 +1,3 @@ - - function cmtBbOpen(comment, id) { if($(comment).hasClass('comment-edit-text-full')) { $(".comment-edit-bb-" + id).show(); @@ -22,11 +20,23 @@ function cmtBbClose(comment, id) { $(document).ready(function() { -$('[data-toggle=offcanvas]').click(function() { +$('#expand-aside').click(function() { $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); $('main').toggleClass('region_1-on'); }); +if ($('aside').html().length == 0) { + $('#expand-aside').hide(); +} + +$('#expand-tabs').click(function() { + $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); +}); + +if($('#tabs-collapse-1').length == 0) { + $('#expand-tabs').hide(); +} + $('.group-edit-icon').hover( function() { $(this).css('opacity','1.0');}, diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 34c04e91c..fc9388f2e 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -27,7 +27,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}} diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl index 3d34d7c57..fa6bfbdfa 100755 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -1,6 +1,8 @@ -<ul class="tabs"> - {{foreach $tabs as $tab}} - <li {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> - {{/foreach}} -</ul> +<div id="tabs-collapse-1" class="navbar-collapse collapse"> + <ul class="nav nav-tabs nav-justified"> + {{foreach $tabs as $tab}} + <li class="{{$tab.sel}}" {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> + {{/foreach}} + </ul> +</div> <div class="tabs-end"></div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index fbdf28f76..5aa3b0f01 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -5,6 +5,9 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> + <button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1"> + <i class="icon-circle-arrow-down" id="expand-tabs-icon"></i> + </button> <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> <i class="icon-circle-arrow-right" id="expand-aside-icon"></i> </button> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 49dff4822..acea86015 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -67,9 +67,9 @@ {{include file="field_yesno.tpl" field=$blocktags}} -{{include file="field_input.tpl" field=$maxreq}} -{{include file="field_input.tpl" field=$cntunkmail}} +{{include file="field_input.tpl" field=$expire}} + </div> <div id="settings-default-perms" class="settings-default-perms" > |