Commit 3bf84db7 authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon

Theme changes from Evonne

behatnotneeded: Theme changes only; can't be Behat-tested

Conflicts:
	htdocs/theme/default/sass/features/_dashboard-widget.scss
	htdocs/theme/default/sass/layout/_layout.scss
	htdocs/theme/default/sass/typography/_icons.scss
	htdocs/theme/default/sass/lib/_tinymce.scss

Change-Id: Iea4be6d016c989a0cdc57c604f3ad65db0e8b643
parent 0d393906
/*
Additional styles for the configurable theme.
The bulk of the styles live in htdocs/theme/raw/templates/customcss.tpl
*/
......@@ -31,7 +31,7 @@
.static-nav {
.toolbar-affix.affix {
top: 160px;
@media (max-width: $screen-sm-min) {
top: 0;
}
......@@ -41,7 +41,7 @@
.dropdown-nav {
.toolbar-affix.affix {
top: 130px;
@media (max-width: $screen-sm-min) {
top: 0;
}
......@@ -49,7 +49,7 @@
}
// viewfooter
// viewfooter
.viewfooter {
padding: 15px !important;
background-color: #f7f7f7;
......
......@@ -18,7 +18,7 @@
&.nav > li {
> a, button {
color: $arrow-link-color;
@media (max-width: $screen-sm-min) {
margin-top: 2px;
margin-bottom: 2px;
......@@ -28,7 +28,7 @@
color: $arrow-link-hover-color;
}
}
&.active > a,
&.active > a,
&.active > button, {
&:hover,
&:focus {
......
......@@ -17,7 +17,7 @@
@include gradient-vertical($start-color: #FFFFFF, $end-color: #ececec, $start-percent: 10%, $end-percent: 100%);
border-color: #dddddd;
color: #676767;
&:focus,
&:hover {
border-color: #a6a6a6;
......@@ -34,7 +34,7 @@
color: #FFFFFF;
text-shadow: rgba(0, 0, 0, 0.1) 0 1px 0;
font-weight: normal;
&:focus,
&:hover {
border-color: #202c01;
......@@ -43,17 +43,19 @@
}
// cleans up some btns that went bung after the styles above
.btn-links,
.form-group.submitcancel .cancel {
background: none;
background: none;
text-shadow: none;
color: $theme-primary-color;
}
// forum buttons
.forum-post-btns {
border-top: 1px dotted #ececec;
padding: 10px;
a {
color: $theme-primary-color;
}
}
\ No newline at end of file
}
.header {
.navbar-toggle {
margin-top: 15px;
@include gradient-vertical($start-color: #FFFFFF, $end-color: #ececec, $start-percent: 10%, $end-percent: 100%);
border-color: #dddddd;
color: #676767;
&:focus,
&:hover {
@include gradient-vertical($start-color: #ececec, $end-color: #ececec, $start-percent: 10%, $end-percent: 100%);
......
......@@ -36,13 +36,13 @@ $logged-in-height-mobile: 125px;
font-weight: 400;
@media (max-width: $screen-sm-min ) {
font-size: 20px;
font-size: 18px;
margin-top: 0;
}
}
p {
margin: 0 40px;
margin: 0 16px;
font-size: 13px;
text-align: center;
color: $text-color;
......@@ -92,18 +92,18 @@ $logged-in-height-mobile: 125px;
vertical-align: middle;
display: block;
border: 0;
@media (max-width: $screen-sm-min ) {
width: 180px;
display: inline-block;
vertical-align: inherit;
}
p {
margin-top: 10px;
margin-bottom: 0;
color: $text-color;
@media (max-width: $screen-sm-min ) {
font-size: 12px;
padding: 0;
......@@ -128,11 +128,11 @@ $logged-in-height-mobile: 125px;
display: block;
margin-right: 0;
}
&.last {
margin-right: 0;
}
.widget {
text-align: center;
}
......@@ -158,12 +158,13 @@ $logged-in-height-mobile: 125px;
font-weight: 400;
@media (max-width: $screen-sm-min ) {
font-size: 20px;
font-size: 18px;
margin-top: 0;
}
}
p {
color: $text-color;
margin: 0 16px;
}
}
......@@ -217,7 +218,7 @@ $logged-in-height-mobile: 125px;
opacity: 1;
margin-top: -$logged-in-height;
border: 0;
@media (max-width: $screen-sm-min) {
margin-top: -$logged-in-height-mobile;
}
......@@ -227,7 +228,7 @@ $logged-in-height-mobile: 125px;
display: table-cell;
vertical-align: middle;
height: $logged-in-height;
@media (max-width: $screen-sm-min) {
height: $logged-in-height-mobile;
font-size: 11px;
......
......@@ -44,63 +44,3 @@
}
}
// when there is a static second level nav
.static-nav {
padding-top: 138px;
@media (max-width: $screen-sm-min) {
padding-top: 0;
}
.header {
height: 138px;
border-bottom: 1px solid #ddd;
@media (max-width: $screen-sm-min) {
height: auto;
border-bottom: 0;
}
}
// when in the admin and it wraps two lines
&.admin {
padding-top: 168px;
@media (max-width: $screen-sm-min) {
padding-top: 0;
}
.header {
height: 168px;
@media (max-width: $screen-sm-min) {
height: auto;
}
}
}
}
// when there is a dropdown second level nav
.dropdown-nav {
padding-top: 105px;
@media (max-width: $screen-sm-min) {
padding-top: 0;
}
.header {
height: 105px;
@media (max-width: $screen-sm-min) {
height: auto;
}
}
}
// when there is no nav
.no-nav {
padding-top: 65px;
@media (max-width: $screen-sm-min) {
padding-top: 0;
}
.header {
height: auto;
}
}
.loggedout {
padding-top: 65px;
@media (max-width: $screen-sm-min) {
padding-top: 0;
}
}
......@@ -35,7 +35,7 @@
}
}
}
.pull-right {
float: none !important;
}
......
......@@ -27,7 +27,7 @@
font-family: $font-family-serif;
font-size: $font-size-large;
margin-top: 8px;
@media (max-width: $screen-sm-min) {
display: none;
}
......@@ -44,7 +44,7 @@
+ .container {
// resets margin if there are no site-messages
margin-top: 0;
@media (max-width: $screen-sm-min) {
// resets margin as site-messages are hidden
margin-top: 0 !important;
......
......@@ -2,82 +2,44 @@
* Base structure
*/
body {
max-width:100%;
overflow-x:hidden;
padding-top: 65px;
background-color: #f1f1f1;
&.admin {
background-color: lighten($brand-default, 5%);
}
.main {
margin: 0px 0 20px;
padding-top: 20px;
padding-bottom: 0;
@media (min-width: $screen-sm-min) {
padding-bottom:50px;
}
@media (max-width: $screen-sm-min) {
padding-top: 0;
}
}
.main {
max-width: 100%;
}
.content-main {
@media (min-width: 768px) {
margin-left: 250px;
.middle-container-wrap {
width: 100%;
background-color: #FFFFFF;
clear: both;
display: table;
}
}
.sidebar {
padding-top: 0;
@media (min-width: $screen-sm-min) {
padding-top: 30px;
.main-content {
margin-top: 0;
padding-top: 25px;
.main {
padding-top: 0;
}
}
}
// Expose a section of the page
.expose {
background-color: $brand-default;
margin-bottom: 40px;
margin-top: -109px;
padding: 40px 0px 20px;
}
.subpage {
clear:both;
}
.wallpost:first-child {
margin-top: 20px;
}
.columns3,
.columns4,
.columns5 {
.wallpost .panel-heading {
font-size: 12px;
padding-right:40px;
h4 {
font-size: 12px;
&.admin {
background-color: lighten($brand-default, 2%);
.container {
margin-top: 0px;
}
.main-nav {
.container {
margin-top: 0px;
}
}
.main-content {
margin-top: 0;
padding-top: 20px;
}
}
}
.viewfooter {
clear: both;
}
// Needed to clear the float when dropzone is visible
.blocktype {
&.ui-draggable:before {
display: none;
}
}
.blockinstance {
clear: both;
.list-group{
margin-bottom: 0;
}
}
.sidebar {
padding-top: 0px;
}
}
\ No newline at end of file
.sidebar {
.profile-block.panel-heading {
min-height: 80px;
.username {
&:hover {
text-decoration: underline;
......@@ -9,7 +9,7 @@
}
a {
color: #FFFFFF;
&:after {
border-radius: 30px;
bottom: 0px;
......
......@@ -6,7 +6,7 @@
background-color: #eef3e9;
border-bottom: 2px solid #ddd;
}
.nav > li > a {
padding: 10px 20px;
}
......@@ -15,7 +15,8 @@
&.dropdown-adminnav,
&.adminnav {
background: none;
margin-bottom: 0;
@media (max-width: $screen-sm-min) {
background-color: #f1f1f1;
}
......@@ -24,7 +25,7 @@
padding: 10px 10px;
font-family: $font-family-serif;
font-size: 16px;
@media (max-width: $screen-sm-min) {
padding: 10px 20px;
}
......@@ -43,7 +44,7 @@
padding: 10px 20px;
font-weight: 300;
color: $theme-primary-color;
&:hover, &:focus {
background-color: #eff6eb;
font-weight: 300;
......
......@@ -2,8 +2,7 @@
background-color: #FFFFFF;
border-left: 0;
border-right: 0;
border-bottom: 0;
min-height: 26px;
border-bottom: 1px solid #ddd;
margin-top: 0;
.nav {
......
.navbar {
margin-bottom: 0;
min-height: auto;
}
.navbar.header {
......@@ -21,7 +22,7 @@
width:100%;
margin:0;
padding: 10px 0;
.container > & {
margin: 0 auto;
}
......@@ -30,9 +31,9 @@
.navbar-inverse {
background-color: transparent;
.navbar-nav {
> li {
> a {
font-family: $font-family-serif;
......@@ -44,7 +45,7 @@
color: $navbar-default-link-hover-color;
}
}
>.active {
> a {
font-weight: 300;
......@@ -56,7 +57,7 @@
background-color: #FFFFFF;
color: $navbar-default-link-color;
font-weight: 300;
@media (max-width: $screen-sm-min - 1) {
border-top-color: 0;
color: $navbar-inverse-link-hover-color;
......@@ -67,53 +68,51 @@
}
}
.navbar-default {
.navbar-link {
color: $link-color;
margin-top: 11px;
margin-bottom: 0;
&:focus,
&:hover {
color: $link-hover-color;
}
@media (max-width: $screen-sm-min) {
padding: 10px 15px;
display: block;
margin-top: 0;
}
.navbar-text {
margin-bottom: 0;
margin-top: 11px;
font-size: 13px;
@media (max-width: $screen-sm-min) {
padding: 10px 15px;
display: block;
margin-top: 0;
}
}
.navbar-default .navbar-link {
&:focus,
&:hover {
color: $theme-primary-color;
}
}
// hidding the search next to the top nav until its required for mobile, and vice versa for the search box next to the main-nav
.navbar {
.header-search-form {
display: none;
@media (max-width: $screen-md-min) {
display: inline-block;
margin-top: 6px;
}
.header .navbar-form.navbar-collapse {
display: none !important;
padding: 0;
margin: 0;
height: auto !important;
@media (max-width: $screen-lg-min) {
display: inline-block !important;
clear: none;
margin-top: 13px;
}
.container {
@media (max-width: $screen-sm-min) {
background-color: #f5f6f6;
@media (max-width: $screen-sm-min) {
margin: 0;
display: none !important;
&.in {
display: inline-block !important;
}
}
}
.main-nav {
.mainnav-search {
margin-top: 0;
margin-top: 3px;
margin-bottom: 0;
}
.navbar-form {
@media (max-width: $screen-sm-min) {
display: none;
}
}
.header-search-form {
.navbar-form.navbar-collapse {
display: inline-block;
@media (max-width: $screen-md-min) {
display: none;
@media (max-width: $screen-lg-min) {
display: none !important;
}
}
}
\ No newline at end of file
......@@ -3,7 +3,7 @@
padding: 0;
font-size: 13px;
text-align: right;
@media (max-width: $screen-md-min) {
position: inherit;
right: auto;
......@@ -15,6 +15,11 @@
> li {
> a {
padding: 10px;
@media (max-width: $screen-md-min) {
padding: 10px 5px;
}
&:focus,
&:hover {
color: lighten($theme-primary-color, 8%);
......@@ -40,4 +45,31 @@
}
}
}
}
// when logged out and language options are available
.loggedout {
.top-nav {
margin-right: 0;
> li {
form {
margin-top: 5px;
@media (max-width: $screen-sm-min) {
display: inline-block;
label {
display: none;
}
div {
display: inline-block;
}
.picker {
width: 125px;
}
}
}
}
}
}
\ No newline at end of file