harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	view/theme/redbasic/tpl/theme_settings.tpl

reset to upstream
This commit is contained in:
Tony Baldwin
2014-03-09 19:22:54 -04:00
parent 67166180bb a79072ce47
commit 5cca00ddc7
393 changed files with 24959 additions and 14060 deletions
Download Patch File Download Diff File Expand all files Collapse all files
view/theme/redbasic/css/narrow_navbar.css
+27
View File
@@ -0,0 +1,27 @@
.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;}
.navbar {min-height:25px !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;}
#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;
}
view/theme/redbasic/css/style.css
+125 -292
View File
@@ -74,6 +74,10 @@ input[type="submit"] {
text-decoration: none;
}
pre code {
border: none;
}
code {
font-family: Courier, monospace;
display: block;
@@ -228,49 +232,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;
@@ -469,6 +430,11 @@ footer {
text-decoration: none;
}
.vcard .dropdown-menu {
position: absolute;
left: 200px;
top: 18px;
}
#profile-extra-links {
clear: both;
@@ -485,9 +451,7 @@ footer {
margin-top: 5px;
}
.profile-edit-side-div {
float: right;
}
.profile-edit-side-link {
opacity: 0.3;
filter:alpha(opacity=30);
@@ -528,14 +492,6 @@ footer {
padding: 12px;
}
#profiles-menu.menu-popup {
left: 200px;
right: auto;
top: 22px;
}
#profile-in-dir-yes-label,
#profile-in-dir-no-label,
#profile-in-netdir-yes-label,
@@ -775,6 +731,24 @@ footer {
}
.pmenu.horizontal {
padding: 0 0 0 0;
border-bottom: none;
}
.pmenu.horizontal .pmenu-title {
display: none;
}
.pmenu.horizontal ul {
-moz-padding-start: 0;
}
.pmenu.horizontal li {
margin-left: 0;
display: inline;
padding-right: 15px;
}
#settings-default-perms-menu {
margin-top: 15px;
margin-bottom: 15px;
@@ -789,7 +763,7 @@ footer {
display: block;
color: #FFFFFF;
margin-top: 15px;
background-color: $nav_bg_2;
background-color: $nav_bg;
-webkit-border-radius: $radiuspx ;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -878,7 +852,7 @@ footer {
#nav-search-spinner {
float: left;
margin: 25px 0px 0px 25px;
color: #fff;
color: $nav_active_icon_colour;
}
#nav-search-text:hover,
@@ -892,7 +866,7 @@ footer {
margin: 15px;
padding: 0px 5px 0px 5px;
border-radius: 10px;
border: none;
border-color: $nav_bd;
background-color: $search_background;
transition: background-color 300ms ease 0s;
}
@@ -917,17 +891,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;
@@ -1141,12 +1104,6 @@ footer {
margin-bottom: 15px;
}
#language-selector {
position: absolute;
top: 0px;
left: 16px;
}
#group-members {
margin-top: 20px;
padding: 10px;
@@ -1527,7 +1484,7 @@ div.jGrowl div.info {
padding-left: 58px;
}
#jGrowl.top-right {
top: 15px;
top: 65px;
right: 15px;
}
@@ -1542,7 +1499,7 @@ div.jGrowl div.info {
#nav-search-text-ac .autocomplete {
position: fixed;
top: 51px;
border: 1px solid #222;
border: 1px solid $nav_bd;
border-top: none;
}
@@ -1593,25 +1550,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;
@@ -1621,138 +1568,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;
@@ -1764,66 +1580,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;
}
@@ -2052,11 +1808,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;
@@ -2441,6 +2192,7 @@ img.mail-list-sender-photo {
}
/* nav bootstrap */
nav i {
font-size: 14px;
}
@@ -2448,7 +2200,7 @@ nav i {
nav img {
height: 47px;
width: 47px;
margin: 2px 0px 1px 10px;
margin-top: 2px;
border-radius: $radiuspx;
}
@@ -2456,13 +2208,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;
}
@@ -2474,3 +2219,91 @@ nav .dropdown-menu {
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
}
#usermenu-caret {
color: $nav_icon_colour;
}
#avatar:hover + #usermenu-caret {
color: $nav_active_icon_colour;
}
/* bootstrap overrides */
blockquote {
font-size: $body_font_size;
}
.dropdown-menu {
font-size: $body_font_size;
border-radius: $radiuspx;
}
.dropdown-menu img {
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%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_gradient_top, endColorstr=$nav_gradient_bottom, GradientType=0);
background-color: $nav_bg;
border-color: $nav_bd;
}
.navbar-inverse .navbar-collapse {
border-color: $nav_bd;
}
.navbar-inverse .navbar-nav > .active > a {
background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
background-image: linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_active_gradient_top, endColorstr=$nav_active_gradient_bottom, GradientType=0);
}
.navbar-inverse .navbar-nav > li > a {
color: $nav_icon_colour;
text-shadow: 0px 0px 0px;
}
.navbar-inverse .navbar-nav > li > a:hover,
.navbar-inverse .navbar-nav > li > a:focus {
color: $nav_active_icon_colour;
}
.navbar-inverse .navbar-nav > .active > a,
.navbar-inverse .navbar-nav > .active > a:hover,
.navbar-inverse .navbar-nav > .active > a:focus {
color: $nav_active_icon_colour;
}
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus {
background-color: $nav_bd;
color: $nav_active_icon_colour;
}
.navbar-inverse .navbar-toggle {
border-color: $nav_bd;
}
.navbar-inverse .navbar-toggle:hover,
.navbar-inverse .navbar-toggle:focus {
background-color: $nav_bg;
}
.navbar-inverse .navbar-toggle .icon-bar {
background-color: $nav_active_icon_colour;
}
#expand-aside {
color: $nav_active_icon_colour;
padding: 7px 10px;
}
@media (max-width:767px) {
aside#region_1 {
background: rgba(0, 0, 0, .1);
border-right: 1px solid $nav_bd;
}
}