Commit 2e289834 authored by Robert Lyon's avatar Robert Lyon

More changes to mahara css

Change-Id: I40a988078f3f285ad9d796cd1f25794ffd15852a
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent c580884c
......@@ -34,6 +34,13 @@ body:not(.admin) .navbar.minor-nav {
.navbar-form {
padding-right: 0;
clear: right;
margin-top: 0;
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
clear: none;
}
@media (max-width: $screen-sm-min - 1) {
width:100%;
margin:0;
......
......@@ -4,7 +4,7 @@
padding: 0 10px;
@media (min-width: $screen-sm-min) {
margin-top: 7px;
margin-top: 0;
clear:none;
float:none;
margin-right: 0;
......@@ -16,6 +16,7 @@
@media (min-width: $screen-md-min) {
padding:0;
font-size: 13px;
margin-top: 7px;
}
> li {
......
.drag-default-button {
@extend .btn-default; // Button like styling for drag element
}
.btn-draggable .btn-group-vertical > .btn {
@extend .icon;
padding: $padding-base-vertical $padding-base-horizontal $padding-base-vertical $grid-gutter-width;
......
.graphtitle {
font-weight: bold;
display: block;
font-size: 13px;
}
.graphlegend ul {
list-style: none;
......
......@@ -36,3 +36,6 @@ label.sr-only + div.mce-tinymce {
width: 99%;
}
.mce-container .mce-wordcount {
text-align: right;
}
\ No newline at end of file
......@@ -5,6 +5,7 @@
.#{$fa-css-prefix}-rotate-90 { @include fa-icon-rotate(90deg, 1); }
.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); }
.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); }
.#{$fa-css-prefix}-rotate-315 { @include fa-icon-rotate(315deg, 3); }
.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); }
......@@ -16,6 +17,7 @@
:root .#{$fa-css-prefix}-rotate-90,
:root .#{$fa-css-prefix}-rotate-180,
:root .#{$fa-css-prefix}-rotate-270,
:root .#{$fa-css-prefix}-rotate-315,
:root .#{$fa-css-prefix}-flip-horizontal,
:root .#{$fa-css-prefix}-flip-vertical {
filter: none;
......
......@@ -12,7 +12,6 @@
@import "utilities/brand-variables"; // Import our brand variables
@import "utilities/bootstrap-variables"; // ...and our custom bootstrap variables file
@import "utilities/custom-variables"; // ...and our custom variables file
@import "../../raw/sass/utilities/bootstrap-index"; // bootstrap scss dependency file
@import "utilities/index"; // raw sass files (if you want heavier customisation you can copy this file and replace partials with your own sass)
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins";
// Reset and dependencies
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/normalize";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/print";
// Core CSS
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/scaffolding";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/type";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/code";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/grid";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/tables";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/forms";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/buttons";
// Components
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/component-animations";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/dropdowns";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/button-groups";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/input-groups";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/navs";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/navbar";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/breadcrumbs";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/pagination";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/pager";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/labels";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/badges";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/jumbotron";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/thumbnails";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/alerts";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/progress-bars";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/media";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/list-group";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/panels";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/responsive-embed";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/wells";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/close";
// Components w/ JavaScript
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/modals";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/tooltip";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/popovers";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/carousel";
// Utility classes
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/utilities";
@import "../../../lib/bootstrap/assets/stylesheets/bootstrap/responsive-utilities";
// END bootstrap //
......@@ -87,7 +87,7 @@
@import "../lib/star";
@import "../lib/tinymce";
@import "../lib/draggable";
@import "../lib/chart";
@import "../lib/graph";
// Keep these files last to override all other style sheets
@import "../custom";
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment