Test suite now relies on requirejs as well
diff --git a/dev/scss/header.scss b/dev/scss/header.scss
index 9876f80..2a49312 100644
--- a/dev/scss/header.scss
+++ b/dev/scss/header.scss
@@ -52,6 +52,54 @@
margin: 0px;
position: relative;
}
+
+ .button {
+ &.right {
+ float: right;
+ display: inline-block;
+ }
+ &.top {
+ position: absolute;
+ display: block;
+ top: 0;
+ right: 0;
+ margin-right: 0;
+ width: 22px;
+ background-color: $dark-green;
+ text-align: center;
+ height: 100%;
+ }
+ color: $nearly-white;
+ line-height: 2em;
+ margin-right: $right-distance;
+ > a {
+ color: $nearly-white;
+ cursor:pointer;
+ position: relative;
+ font-size: 120%;
+ > span {
+ @include blind;
+ }
+ }
+ > a::after {
+ font-family: 'FontAwesome';
+ }
+ > a.tutorial::after {
+ content: $fa-tutorial;
+ }
+ > a.align.left::after {
+ content: $fa-left-align;
+ }
+ > a.align.right::after {
+ content: $fa-right-align;
+ }
+ > a.question::after {
+ content: $fa-question;
+ }
+ > a.login::after {
+ content: $fa-login;
+ }
+ }
}
diff --git a/dev/scss/searchbar.scss b/dev/scss/searchbar.scss
index ac9927d..00c65e2 100644
--- a/dev/scss/searchbar.scss
+++ b/dev/scss/searchbar.scss
@@ -2,7 +2,6 @@
@import "util";
$border-size: 2px;
-$right-distance: 30px;
/**
* Input field
@@ -108,32 +107,3 @@
}
}
}
-
-#button-right {
- display: inline-block;
- float: right;
- color: $nearly-white;
- line-height: 2em;
- margin-right: $right-distance;
- > a {
- color: $nearly-white;
- cursor:pointer;
- position: relative;
- font-size: 120%;
- > span {
- @include blind;
- }
- }
- > a::after {
- font-family: 'FontAwesome';
- }
- > a.tutorial::after {
- content: '\f19d';
- }
- > a.align.left::after {
- content: '\f036';
- }
- > a.align.right::after {
- content: '\f038';
- }
-}
diff --git a/dev/scss/sidebar.scss b/dev/scss/sidebar.scss
index a94c1d8..3adc1b4 100644
--- a/dev/scss/sidebar.scss
+++ b/dev/scss/sidebar.scss
@@ -3,7 +3,7 @@
$border-size: 2px;
-#sidebar {
+aside {
// box-shadow: 2px 2px 5px darken($dark-green, 15%);
// box-shadow: $choose-box-shadow;
outline: none;
@@ -122,7 +122,7 @@
}
-#sidebar:not(:focus):not(.active) {
+aside:not(:focus):not(.active) {
margin-left: -1 * ($logo-left-distance - 15px);
// box-shadow: none;
/*
diff --git a/dev/scss/tutorial.scss b/dev/scss/tutorial.scss
index 0b03cd0..4b4345b 100644
--- a/dev/scss/tutorial.scss
+++ b/dev/scss/tutorial.scss
@@ -44,7 +44,7 @@
body.embedded {
background-color: $nearly-white;
- #sidebar {
+ aside {
/*
border-right: {
width: $border-size;
diff --git a/dev/scss/util.scss b/dev/scss/util.scss
index 3321de1..6d2172f 100644
--- a/dev/scss/util.scss
+++ b/dev/scss/util.scss
@@ -90,9 +90,11 @@
* Margins
*/
$standard-margin: 30px;
+$right-distance: 30px;
$right-match-distance: 20px;
$logo-left-distance: 230px;
+
@mixin blind {
position: absolute;
margin-left: -3000px;
@@ -156,14 +158,20 @@
/**
* Font Awesome symbols
*/
-$fa-bars: "\f0c9";
-$fa-extlink: "\f08e";
-$fa-up: "\f0d8";
-$fa-down: "\f0d7";
-$fa-close: "\f00d";
-$fa-info: "\f05a";
-$fa-elipsis: "\f141";
-$fa-previous: "\f0d9";
-$fa-next: "\f0da";
-$fa-search: "\f002";
-$fa-rewrite: "\f040"; // "\f14b"
\ No newline at end of file
+$fa-bars: "\f0c9";
+$fa-extlink: "\f08e";
+$fa-up: "\f0d8";
+$fa-down: "\f0d7";
+$fa-close: "\f00d";
+$fa-info: "\f05a";
+$fa-elipsis: "\f141";
+$fa-previous: "\f0d9";
+$fa-next: "\f0da";
+$fa-search: "\f002";
+$fa-rewrite: "\f040"; // "\f14b"
+$fa-login: "\f090";
+$fa-logout: "\f08b";
+$fa-tutorial: "\f19d";
+$fa-left-align: "\f036";
+$fa-right-align: "\f038";
+$fa-question: "\f128"; // "\f059";
\ No newline at end of file