Commit a39fb01c authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Updating the 'Default' theme by Evonne"

parents faad280a 2d8d5d80
.arrow-bar {
border-radius: $border-radius-base;
overflow: hidden;
margin-top: 10px;
margin-bottom: $grid-gutter-width;
line-height: 46px;
display: block;
width: 100%;
background-color: lighten($arrow-color, 5%);
.right-text,
.arrow {
padding: 5px 15px;
position: relative;
display: block;
}
.arrow {
float: left;
position: relative;
display: block;
background-color: $arrow-color;
width: 25%;
width: auto;
@media (max-width: $screen-md-min) {
width: 20%;
}
&:after {
border-bottom: 29px solid transparent;
border-left: 14px solid $arrow-color;
border-top: 30px solid transparent;
content: "";
height: 40px;
position: absolute;
right: -40px;
top: -2px;
width: 40px;
}
.text {
@include ellipsis(true);
display: block;
color: $arrow-text-color;
font-weight: 700;
width: auto;
}
}
.right-text {
float: right;
text-align: right;
@media (max-width: $screen-sm-min) {
float: none;
text-align: center;
......@@ -58,11 +17,6 @@
.nav-inpage {
&.nav > li {
> a, button {
@include transition-duration(0.3s);
border-radius: $border-radius-base;
padding: 0 8px;
line-height: 2em;
margin-top: 9px;
color: $arrow-link-color;
font-size: $font-size-small;
......@@ -72,15 +26,11 @@
}
&:hover,
&:focus {
@include transition-duration(0.3s);
background: #fff;
color: $arrow-link-hover-color;
}
}
&.active > a,
&.active > button, {
color: $arrow-link-active-color;
background: #fff;
&:hover,
&:focus {
color: $arrow-link-hover-color;
......
.fileupload {
padding: 20px;
border: 1px solid $gray-lighter;
background-color: #ffffff;
@include clearfix;
.intro {
font-weight: bold;
}
.description {
color: $gray-light;
font-size: $font-size-base - 1;
}
}
.uploadform.userfile {
width: 50%;
float: left;
margin-bottom: 20px;
}
.filelist {
.file-move-list {
list-style-type: none;
margin-top: 10px;
padding-left: 15px;
li .icon {
color: $theme-primary-color;
}
}
}
// file browser inside modal screen
.modal-filebrowser {
margin-top: 50px;
padding: 10px 20px 20px;
.close {
width: 100%;
text-align: right;
float: none;
margin-bottom: 10px;
}
}
.folderhover td{
background-color: $state-warning-bg;
}
// Collapsible columns.
// Used for the page builder
.col-collapse {
@extend .col-md-2;
@extend .col-xs-3;
@media (max-width: $screen-sm-min) {
.title,
.indicator {
font-size: 0.7em;
}
}
.col-collapsed & {
@extend .col-md-1;
@extend .col-xs-2;
}
}
.col-with-collapse {
@extend .col-md-10;
@extend .col-xs-9;
.col-collapsed & {
@extend .col-md-11;
@extend .col-xs-10;
}
}
.col-collapse-offset {
@extend .col-md-offset-2;
.col-collapsed & {
@extend .col-md-offset-1;
}
}
.col-collapsed .hide-title-collapsed .title {
position: absolute;
width: 1px;
height: 1px;
margin: -1px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
}
.collapse-expand {
.icon-angle-double-right {
display:none;
}
.col-collapsed &{
.icon-angle-double-left {
display:none;
}
.icon-angle-double-right {
display:inline-block;
}
}
}
/*
* Non-bootstrap column layout. Used by the page builder
*/
$columns: 8; //up to 8
@for $i from 1 through $columns {
.columns#{$i} {
width: 100 / $i - 2%;
}
}
.column-content {
min-height: 50px;
}
.col-row,
.row-content {
padding-bottom: 50px;
.column .post,
.column-layout .post {
padding: 0;
}
}
.column {
-ms-word-break: break-all;
word-break: break-all;
word-break: break-word;
vertical-align: top;
float: left;
margin: 0;
padding: 0 0.9% 10px 0.9%;
max-width: 98%;
position: relative;
&:first-child {max-width: 98%;
padding-left:0;
}
&:last-child {
padding-right:0;
}
}
.column-layout {
max-width: 98%;
float: left;
@media (min-width: $screen-sm-min + 1) {
margin-left: 2%;
}
@media (max-width: $screen-sm-min) {
width: 100% !important; // override inline style
}
}
// Target all 3 col layouts with equal width
.column-layout.columns3.col-width-33 {
width: 31.3% !important; // override inline style with a more accurate width
}
.row-content {
clear: both;
@media (min-width: $screen-sm-min + 1) {
margin-left: -2%;
}
}
.footer {
max-width: 100%;
width: 100%;
background: #f1f1f1;
padding: 0;
margin: 0;
text-align: center;
.footer-nav {
font-size: $font-size-small;
}
.footer-performance-info {
font-size: $font-size-small;
}
.footer-inner {
margin-bottom: 15px;
margin-top: 15px;
margin-left: auto;
margin-right: auto;
......@@ -62,11 +52,5 @@
}
}
.admin & {
border-radius: $border-radius-base;
padding: 10px;
background: #FCFCFC;
border: 1px solid #ddd;
}
}
}
......@@ -4,9 +4,6 @@
background-position: left top;
.site-logo{
padding-top: 3px;
float: left;
padding-left: 5px;
margin-bottom: 10px;
margin-top: 8px;
......@@ -15,8 +12,6 @@
}
a {
float:left;
@media (max-width: $screen-xs-min) {
width: 23px;
overflow-x: hidden;
......@@ -24,8 +19,6 @@
}
img {
max-height: 45px;
@media (max-width: $screen-xs-min) {
width: 150px;
max-width: 150px;
......@@ -34,18 +27,13 @@
}
.admin-title {
display:none;
position: absolute;
line-height: 65px;
top: 0;
clear: none;
margin-left: 25px;
background-color: transparent;
padding: 0;
font-family: $font-family-serif;
font-size: $font-size-large;
margin-top: 8px;
@media (min-width: 768px) {
display: inline-block;
margin-top: 0;
}
a {
......@@ -58,6 +46,12 @@
color: $theme-primary-color;
}
}
&:before {
display: none;
}
&:after {
display: none;
}
}
}
.panel-default > .profile-block.panel-heading {
padding: 0;
.profile-block.panel-heading {
min-height: 80px;
.username {
padding: 10px 75px 10px 15px;
display: block;
&:hover {
text-decoration: underline;
}
}
.user-icon {
z-index: 5;
width: 60px;
height: 60px;
position: absolute;
right: 10px;
top: 10px;
padding: 5px; // override more specific padding
img {
display: table-cell;
vertical-align: middle;
}
}
a {
color: #FFFFFF;
&:after {
@include transition(opacity 0.5s);
@include fa-icon();
border-radius: 30px;
bottom: 0px;
background: darken(#f5f5f5, 1%);
color: #333;
padding:3px;
content: "\f040";
display: block;
opacity:0;
position: absolute;
right: 0px;
visibility: hidden;
}
}
}
.user-panel {
> .panel-default {
border: 0;
......
......@@ -2,11 +2,9 @@
* Primary navigation menu
*/
.main-nav {
padding-top: 30px;
border-bottom: 1px solid #dcdcdc;
@media (max-width: $screen-sm-min) {
padding-top: 0;
border-bottom: 0;
}
......@@ -18,90 +16,28 @@
}
}
.container {
@media (max-width: $screen-sm-min) {
padding:0;
}
}
ul {
min-width: 0;
margin:0;
@media (min-width: $screen-md-min) {
margin: 0px -5px 0px -15px;
}
@media (min-width: $screen-sm-min) and (max-width: $screen-md-min - 1) {
margin: 0px -5px 0px 0px;
}
}
.navbar-header{
margin:0;
@media (min-width: $screen-sm-min) {
margin-left:-15px;
}
@media (min-width: $screen-md-min) {
+ ul {
margin-left:0;
}
}
}
li {
margin: 0;
}
.navbar-brand {
padding: 10px 15px;
margin-left: -10px;
width:100%;
border-bottom: 0;
font-style: italic;
font-size: $font-size-base;
@media (min-width: $screen-sm-min) {
width:auto;
margin-left:0;
}
.icon {
top:3px;
}
a {
color: $theme-primary-color !important;
}
}
.nav > li > a {
border-top:1px solid darken($navbar-inverse-bg, 2%);
border-bottom:1px solid lighten($navbar-inverse-bg, 2%);
padding: 10px 20px;
line-height: 20px;
font-weight:normal;
@media (min-width: $screen-sm-min) {
border:none;
padding: 10px 20px;
}
@media (min-width: $screen-sm-min) and (max-width: $screen-md-min - 1) {
padding: 15px 10px;
}
&:hover, &:focus {
text-decoration:none;
}
}
// Only shown on mobile, or when dropdowns are turned on
.child-nav {
background-color: darken($navbar-inverse-bg, 5%);
border-top:0;
min-width: 200px;
max-width: 100%;
overflow: hidden;
padding: 0;
li {
display: block;
a { //styles that need to override bootstrap specificity
padding: 10px 20px;
font-weight: normal;
&:hover, &:focus {
text-decoration:none;
background-color: $theme-primary-color;
color: #FFFFFF;
}
......@@ -110,7 +46,6 @@
// If this link is the current page or section
.active > a {
font-weight: bold;
background-color: $theme-primary-color;
color: #FFFFFF;
......@@ -125,61 +60,18 @@
background-color: darken($theme-primary-color, 5%);
}
}
a { // styles that don't need to override bootstrap specificity
display:block;
width:100%;
@include text-overflow;
@media (min-width: $screen-sm-min) {
border:0;
max-width: 300px;
color:$link-color;
}
}
}
// on hover, if dropdown. show
@media (min-width: $screen-sm-min) {
ul.nav > li:hover > ul.has-dropdown.child-nav {
display: block;
visibility: visible;
}
}
.has-dropdown {
@media (min-width: $screen-sm-min) {
max-width: 350px;
position: absolute;
top: 100%;
left: 0;
z-index: $zindex-dropdown;
display: none; // none by default, but block on "open" of the menu
float: left;
padding: 0;
margin: 0 0 0 -1px; // override default ul
list-style: none;
font-size: $font-size-base;
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
background-color: $dropdown-bg;
border: 1px solid $dropdown-fallback-border; // IE8 fallback
border: 1px solid $dropdown-border;
border-top:0;
@include box-shadow(0 6px 12px rgba(0,0,0,.175));
background-clip: padding-box;
// Links within the dropdown menu
> li a {
padding: 9px 15px;
clear: both;
font-weight: normal;
line-height: $line-height-base;
white-space: nowrap; // prevent links from randomly breaking onto new lines
color: $dropdown-link-color;
}
.dropdown-tertiary {
padding:0;
margin: 0;
font-size: $font-size-base - 1;
> li a {
......@@ -188,9 +80,4 @@
}
}
}
}
.dropdown-menu .btn-link:not(.btn-link-danger) {
color: $text-color;
}
}
\ No newline at end of file
// Display objects in panels differently
.panel-body {
ul {
font-size: 0.9em;
&:not(.list-unstyled):not(.unstyled):not(.select2-selection__rendered) {
padding-left: 20px;
margin: 0 0 20px;
&.select2-choices {
margin-bottom: 0;
}
}
}
.sidebar & .form-group {
padding: 0;
}
.form-group.login{
.sidebar & .form-group,
.login-panel & .form-group {
padding: 0;
.form-group {
padding: 0;
}
}
> .panel-footer,
form .panel-footer {
clear:both;
margin: 15px -15px -16px; //alter padding for panel footers inside panel-body (needed for some forms) c.f. login form
}
}
// This file handles/modifies both real collapsible panels,
// and collapsible pieform fieldsets (which are styled to look like panels)
.panel.collapsible {
border-radius: 0;
.panel-heading a {
border-radius: 0;
}
&.form-group {
display:block;
}
.panel {
border-radius: 0;
}
> .panel-heading, .panel-heading-nested {
border-bottom: 0;
......@@ -21,191 +7,3 @@
}
}
}
.pieform-fieldset,
.panel {
&.collapsible {
@include box-shadow(none);
&.last {
legend,
.panel-heading {
border-bottom-radius: 3px;
a {
&.collapsed {
border-bottom-radius: 3px;
}
}
}
legend {
a {
border-bottom: 1px solid $panel-default-border;
}
}
.fieldset-body {
border-top:0;
border-bottom-radius: 3px;
}
}
&.first .panel-heading a {
@include border-top-radius(3px);
}
legend {
margin-bottom: 0;
border:0;
}
.type-icon {
display:inline-block;
width: 32px;
}
&.has-attachment .panel-heading,
.collapsible-group & .panel-heading,
legend h4,
legend h3 {
margin: 0;
font-size: 16px;
padding: 0;
.pieform > .collapsible-group:first-child & {
@include border-top-radius(3px);
}