Commit fbd59ac7 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

Dashboard and fontawesome (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework
Dashboard and font awesome
Icon upgrade (bootstrap)

Change-Id: I76485618a595e0c4dc5269922d8f5ac94a30c2ae
parent 0d5637a6
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
This diff is collapsed.
......@@ -3,8 +3,8 @@
.attach-files[aria-expanded="false"] {
&.collapsed:after,
&:after {
@extend .glyphicon;
content: "";
@extend .fa;
content: "\f078";
}
span {
display: none;
......
......@@ -5,7 +5,7 @@ span.help {
padding-left:10px;
display: inline-block;
.glyphicon {
.fa {
color: $mahara-blue;
}
}
......
// Generic custom css (anything longer than a screen view should have its own component file)
.btn-sm,
.btn-xs {
.fa {
font-size: $fa-font-size-base;
}
}
.collapse > .collapse {
display: block ; // fix for not being able to put a class just on the wrapper
visibility: visible;
}
\ No newline at end of file
......@@ -51,12 +51,11 @@ $logged-in-height-mobile: 100px;
height: 60px;
text-align:center;
.glyphicon {
padding-left:2px;
.fa {
color: #fff;
padding-top:16px;
font-size: 25px;
&.glyphicon-user {
font-size: 30px;
&.fa-user {
padding-left:0; // the only one that is actually centered by defualt
}
}
......
......@@ -50,7 +50,7 @@
margin-top: 10px;
padding-left: 15px;
li .glyphicon {
li .fa {
color: $mahara-green;
}
}
......
......@@ -161,7 +161,7 @@ select {
// hide unwanted elements
.nav-tabs + .submit,
.pieform-fieldset legend {
.tab-content legend {
display: none;
}
.radio-aligned {
......
......@@ -13,15 +13,12 @@ body {
background-color: $brand-default;
.main {
margin: 10px 5px;
background-color: #fff;
@media (min-width: 768px) {
margin:20px 0;
}
padding-top: 0;
margin-top: 0;
}
}
.main {
// margin: 20px 0;
margin: 20px 0;
padding-top: 20px;
padding-bottom: 0;
@media (min-width: $screen-sm-min) {
......@@ -32,7 +29,6 @@ body {
.main {
max-width: 100%;
}
.content-main {
......
......@@ -50,7 +50,7 @@
margin-left:0;
border:0;
}
.glyphicon {
.fa {
top:3px;
}
}
......
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