2012-06-14 06:10:23 +08:00
|
|
|
@import 'environment';
|
2012-05-30 06:06:10 +08:00
|
|
|
|
|
|
|
// Can remove this when we upgrade to bootstrap 2.0.3
|
|
|
|
$boxSizingBaseLineHeight: $baseLineHeight + 8;
|
|
|
|
|
|
|
|
.quickStartBar {
|
2012-06-13 05:20:36 +08:00
|
|
|
margin-top: -1em; // this resets the padding on #content
|
|
|
|
font-size: 14px;
|
|
|
|
min-height: 118px;
|
|
|
|
color: inherit;
|
|
|
|
/* hide box-shadow */
|
|
|
|
overflow: hidden;
|
|
|
|
|
2012-05-30 06:06:10 +08:00
|
|
|
textarea {
|
|
|
|
@include box-sizing(border-box);
|
|
|
|
}
|
|
|
|
input[type=text] {
|
|
|
|
@include box-sizing(border-box);
|
|
|
|
height: $boxSizingBaseLineHeight;
|
|
|
|
}
|
2012-06-13 05:20:36 +08:00
|
|
|
.pick-an-item {
|
|
|
|
padding-top: 4px;
|
|
|
|
padding-bottom: 4px;
|
|
|
|
background: #fff;
|
|
|
|
font-weight: bold;
|
|
|
|
}
|
2012-05-30 06:06:10 +08:00
|
|
|
|
|
|
|
|
2012-06-13 05:20:36 +08:00
|
|
|
/* kill bootstrap stuff */
|
|
|
|
.nav {
|
|
|
|
margin: 0;
|
|
|
|
margin-left: 20px;
|
|
|
|
border: none;
|
|
|
|
|
|
|
|
/* kill bootstrap stuff */
|
|
|
|
> li > a {
|
|
|
|
line-height: 22px;
|
|
|
|
font-size: 12px;
|
|
|
|
color: #8d8d8d;
|
|
|
|
border: none;
|
|
|
|
|
|
|
|
/* kill bootstrap stuff */
|
|
|
|
&:hover,
|
|
|
|
&.active {
|
|
|
|
border: none;
|
|
|
|
background: inherit;
|
|
|
|
color: $black;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-05-30 06:06:10 +08:00
|
|
|
|
2012-06-13 05:20:36 +08:00
|
|
|
.new-text {
|
|
|
|
font-size: 16px;
|
|
|
|
display: block;
|
|
|
|
padding: 9px 4px 4px 22px;
|
|
|
|
color: #000;
|
|
|
|
}
|
2012-05-30 06:06:10 +08:00
|
|
|
|
2012-06-13 05:20:36 +08:00
|
|
|
/* override default datetime_suggest styles */
|
|
|
|
.datetime_suggest {
|
|
|
|
display: inline;
|
|
|
|
margin-left: 10px;
|
|
|
|
font-weight: normal;
|
Fully adopt Bootstrap & update css to work with it, closes: #CNVS-1344
this commit does the following:
* upgrade bootstrap-sass gem to most recent version
* switches to using bootstrap's normalize.css and forms.css
which fixes a whole bunch of misformatting of how bootstrap
stuff is supposed to look, but changing those 2 affects
a lot of our old stylesheets.
* gets rid of unified_buttons.sass and just uses bootstraps buttons.
.ui-button @extends these because we still have to support .ui-button
for modals & buttonsets. but .button is no longer supported.
* a lot of css file reorganization (there's no more 'blue' and
'normal canvas', there's just canvas)
* a bunch of files had to be tweaked to look good with these changes.
test plan:
This change touches every page in canvas so, no kidding, we need to make
sure every page looks OK. In order to do that:
1. each sprint team needs to give a +1 after they make sure all the
pages in the features they are over look good.
2. the QA person on each team needs to look at the pages for their
teams features for a QA +1
things to look for specifically when testing:
* buttons: this gets rid of all those red 'cancel' links
that are actually buttons, make sure all the buttons you see
look right. if you see 2 plain gray buttons next to each other
like [Save] [Cancel], we should make the primary one blue (by
adding the .btn-primary class)
* Forms: a lot of this change has to do with how form elements look,
especially <select>s, <input>s and <label>s. look at the diffs
for the ones that have the most changes and make sure those look
good, but also check for the ones I missed and make sure those
look good too.
* and just random style changes, if something looks ugly or broken
(and it didn't before), we should fix that.
Also:
just use a link instead of a drop-menu for adding event from sidebar
we used to have a drop down menu for adding events
to cal2 from the sidebar where you'd hit a cog
and it'd ask you if you wanted to add an event or
an assignment. this just simplifies it to an add
icon.
this: http://cl.ly/image/133a2A3q3q1M
instead of: http://cl.ly/image/46463o2s3W0g
Change-Id: I384fe273934bca96bf28423afb1402c7792d8766
Reviewed-on: https://gerrit.instructure.com/15422
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2012-12-21 14:46:28 +08:00
|
|
|
// color: $blueGray;
|
2012-06-13 05:20:36 +08:00
|
|
|
}
|
2012-05-30 06:06:10 +08:00
|
|
|
|
2012-06-13 05:20:36 +08:00
|
|
|
[class*=icon-], [class^=icon-] {
|
|
|
|
margin-right: 5px;
|
|
|
|
}
|
2012-05-30 06:06:10 +08:00
|
|
|
|
|
|
|
&.not-expanded input, &.not-expanded textarea {
|
|
|
|
// too much space under when not expanded
|
|
|
|
margin-bottom: 0;
|
|
|
|
}
|
2012-06-13 05:20:36 +08:00
|
|
|
|
|
|
|
.contextSearch {
|
|
|
|
width: 100%;
|
|
|
|
}
|
|
|
|
|
2012-05-30 06:06:10 +08:00
|
|
|
}
|
|
|
|
|
2012-06-13 05:20:36 +08:00
|
|
|
// kill bootstrap styles
|
|
|
|
.newItemForm {
|
|
|
|
margin-bottom: 0;
|
2012-05-30 06:06:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
.not-expanded .expander textarea {
|
|
|
|
height: $boxSizingBaseLineHeight;
|
|
|
|
overflow: hidden;
|
|
|
|
}
|
|
|
|
|
|
|
|
.expandee {
|
|
|
|
display: none;
|
2012-06-13 05:20:36 +08:00
|
|
|
.expanded & {
|
|
|
|
display: block;
|
|
|
|
}
|
2012-05-30 06:06:10 +08:00
|
|
|
}
|