diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 11 | ||||
| -rw-r--r-- | view/css/default.css | 4 | ||||
| -rw-r--r-- | view/css/mod_help.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 62 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 24 |
6 files changed, 52 insertions, 57 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 7861c7db6..1369ea5c8 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -3,19 +3,15 @@ /* nav overrides */ nav .badge { + font-size: 100%; position: absolute; top: 1px; left: 1px; - font-size: 10px; - line-height: 20px; - padding: 0px 5px; - height: 20px; - min-width: 20px; - border-radius: 10px; + } #navbar-collapse-1 i { - font-size: 14px; + font-size: 1rem; } /* nav overrides end */ @@ -27,7 +23,6 @@ aside .nav-pills > li > a, } nav .dropdown-menu { - margin-top: 0px; max-height: 70vh; overflow: auto; } diff --git a/view/css/default.css b/view/css/default.css index a51461201..0f975bd99 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -18,7 +18,7 @@ aside { position: relative; display: table-cell; vertical-align: top; - padding: 71px 7px 0px 7px; + padding: 5rem 7px 0px 7px; } section { @@ -26,5 +26,5 @@ section { width: 100%; display: table-cell; vertical-align: top; - padding: 71px 7px 200px 7px; + padding: 5rem 7px 200px 7px; } diff --git a/view/css/mod_help.css b/view/css/mod_help.css index f59a40894..20e91c39b 100644 --- a/view/css/mod_help.css +++ b/view/css/mod_help.css @@ -12,13 +12,9 @@ } #doco-content h4 { - text-decoration: underline; + font-weight: bold; } -#doco-content h5 { - text-decoration: underline; -} - #region_1 .widget ul ul { list-style-type: none; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0b82202c7..7250ff961 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: 1.75em; } h2, .h2 { - font-size: 1.667em; + font-size: 1.5rem; } h3, .h3 { - font-size: 1.334em; + font-size: 1.25rem; } h4, .h4 { - font-size: 1em; - font-weight: bold; + font-size: 1rem; } h5, .h5 { - font-size: 1em; + font-size: 0.75rem; } h6, .h6 { - font-size: 0.75em; + font-size: 0.5rem; } @@ -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; @@ -576,10 +575,19 @@ footer { color: $nav_active_icon_colour; } +/* #nav-search-text { - width: 250px; + font-size: 12px; + width: 200px; + height: 20px; + 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; } @@ -589,7 +597,7 @@ footer { } nav .acpopup { - top: 50px !important; + top: 46px !important; margin-left: -35px; width: 290px; } @@ -1400,11 +1408,13 @@ img.mail-conv-sender-photo { 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; } @@ -1520,6 +1530,7 @@ nav img { border-radius: $radiuspx; } +/* nav .dropdown-menu { font-size: $body_font_size; border-top-right-radius: 0px; @@ -1528,12 +1539,14 @@ nav .dropdown-menu { border-bottom-left-radius: $radiuspx; } -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:focus, -.dropdown-menu > .active > a:hover { + +.dropdown-menu > .show > a, +.dropdown-menu > .show > a:focus, +.dropdown-menu > .show > a:hover { color: #333; background-color: #f5f5f5; } +*/ .dropdown-menu-img-sm { float: left; @@ -1549,8 +1562,8 @@ nav .dropdown-menu { } .usermenu { - width: 32px; - height: 32px; + width: 2rem; + height: 2rem; } .usermenu img { @@ -1732,17 +1745,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; @@ -1752,6 +1754,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%); @@ -1760,6 +1763,7 @@ nav .badge.mail-update { border-color: $nav_bd; } + .navbar-inverse .navbar-collapse { border-color: $nav_bd; } @@ -1804,7 +1808,7 @@ nav .badge.mail-update { .navbar-inverse .navbar-toggle .icon-bar { background-color: $nav_active_icon_colour; } - +*/ .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); border-top-left-radius: 4px; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9b994ebdf..85b495792 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -122,7 +122,7 @@ if (! $toolicon_activecolour) if (! $item_opacity) $item_opacity = "1"; if (! $font_size) - $font_size = "0.9rem"; + $font_size = "1rem"; if (! $body_font_size) $body_font_size = "0.75rem"; if (! $font_colour) diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 25334a068..9d54420a5 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -78,10 +78,10 @@ <div class="collapse navbar-collapse " id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.network}} - <li class="nav-item dropdown {{$sel.network}} net-button" style="display: none;"> + <li class="nav-item dropdown net-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> <i class="fa fa-fw fa-th"></i> - <span class="net-update"></span> + <span class="badge badge-pill badge-default net-update"></span> </a> <div id="nav-network-menu" class="dropdown-menu" rel="network"> <a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a> @@ -91,10 +91,10 @@ </li> {{/if}} {{if $nav.home}} - <li class="nav-item dropdown {{$sel.home}} home-button" style="display: none;"> + <li class="nav-item dropdown home-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu"> <i class="fa fa-fw fa-home"></i> - <span class="home-update"></span> + <span class="badge badge-pill badge-danger home-update"></span> </a> <div id="nav-home-menu" class="dropdown-menu" rel="home"> <a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a> @@ -104,10 +104,10 @@ </li> {{/if}} {{if $nav.messages}} - <li class="nav-item dropdown {{$sel.messages}} mail-button" style="display: none;"> + <li class="nav-item dropdown mail-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu"> <i class="fa fa-fw fa-envelope"></i> - <span class="mail-update"></span> + <span class="badge badge-pill badge-danger mail-update"></span> </a> <div id="nav-messages-menu" class="dropdown-menu" rel="messages"> <a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a> @@ -117,10 +117,10 @@ </li> {{/if}} {{if $nav.all_events}} - <li class="nav-item dropdown {{$sel.all_events}} all_events-button" style="display: none;"> + <li class="nav-item dropdown all_events-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu"> <i class="fa fa-fw fa-calendar"></i> - <span class="all_events-update"></span> + <span class="badge badge-pill badge-default all_events-update"></span> </a> <div id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> <a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a> @@ -130,10 +130,10 @@ </li> {{/if}} {{if $nav.intros}} - <li class="nav-item dropdown {{$sel.intros}} intro-button" style="display: none;"> + <li class="nav-item dropdown intro-button" style="display: none;"> <a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu"> <i class="fa fa-fw fa-users"></i> - <span class="intro-update"></span> + <span class="badge badge-pill badge-danger intro-update"></span> </a> <div id="nav-intros-menu" class="dropdown-menu" rel="intros"> <a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a> @@ -142,10 +142,10 @@ </li> {{/if}} {{if $nav.notifications}} - <li class="nav-item dropdown {{$sel.notifications}} notify-button" style="display: none;"> + <li class="nav-item dropdown notify-button" style="display: none;"> <a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu"> <i class="fa fa-fw fa-exclamation"></i> - <span class="notify-update"></span> + <span class="badge badge-pill badge-danger notify-update"></span> </a> <div id="nav-notify-menu" class="dropdown-menu" rel="notify"> <a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a> |