menu & editor toolbar

3 files changed, 66 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index c38fa4e..d0eaf0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea
 *.iml
+archive
diff --git a/css/codeq.css b/css/codeq.css
index 53d61dc..f4a7894 100644
--- a/css/codeq.css
+++ b/css/codeq.css
@@ -6,6 +6,7 @@ body {
     border-right: 1px solid #e5e5e5;
     border-bottom: 1px solid #e5e5e5;
     padding: 0;
+    min-height: 4em;
 }
 
 .block-label {
@@ -133,4 +134,48 @@ body {
 ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
-}
\ No newline at end of file
+}
+
+/*toolbar
+
+#editor-toolbar {
+    width: 100%;
+    padding-left: 15px;
+    height: 25px;
+    display: inline-block;
+}
+
+#editor-toolbar .tool-icon {
+    font-size: 16px;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+.nav-xs {
+    list-style:none;
+    padding-left: 0;
+    float:left;
+    white-space:nowrap;
+    margin-bottom: 0;
+}
+
+.nav-xs>li {
+    list-style: none;
+    white-space: nowrap;
+    position: relative;
+    display: inline-block !important;
+    background-color: transparent;
+    background: linear-gradient(to bottom, #2a3f53 0%,#192f42 100%);
+    border-right: 1px solid #000;
+}
+
+.nav-xs>li>a {
+    display: block;
+    padding: 2px 6px 3px 6px;
+    font-size: 12px;
+}
+.nav-xs>li>a{
+    color: #fff;
+}
+
+*/
\ No newline at end of file
diff --git a/prolog.html b/prolog.html
index d9d4656..3ff90d6 100644
--- a/prolog.html
+++ b/prolog.html
@@ -26,36 +26,27 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="#">CodeQ</a>
+                <a class="navbar-brand" href="#" title="Intelligent tutor system">CodeQ</a>
             </div>
             <div class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
-                    <li class="active"><a href="#">Home</a></li>
-                    <li><a href="#">Services</a></li>
-                    <li><a href="#">Portfolio</a></li>
+                    <li><a href="#">Run</a></li>
+                    <li><a href="#">Break</a></li>
+                    <li><a href="#">Hint</a></li>
                 </ul>
-                <ul class="nav navbar-nav navbar-left">
+                <ul class="nav navbar-nav navbar-right">
+                    <li><a href="#"><span class="glyphicon glyphicon glyphicon-wrench" aria-hidden="true"></span></a></li>
                     <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Pages <span class="caret"></span></a>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
+                            <span class="glyphicon glyphicon glyphicon-user"></span>
+                        </a>
                         <ul class="dropdown-menu">
-                            <li><a href="#">Blog Single</a></li>
-                            <li><a href="#">Pricing</a></li>
-                            <li><a href="#">Shortcodes</a></li>
+                            <li><a href="#">Profile</a></li>
+                            <li><a href="#">Login or Signup</a></li>
+                            <li><a href="#">Logout</a></li>
                         </ul>
                     </li>
                 </ul>
-                <ul class="nav navbar-nav navbar-right">
-                    <ul class="nav navbar-nav navbar-left">
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon glyphicon-user"></span></a>
-                            <ul class="dropdown-menu">
-                                <li><a href="#">Profile</a></li>
-                                <li><a href="#">Logout</a></li>
-                            </ul>
-                        </li>
-                    </ul>
-                    <li><a href="#"><span class="glyphicon glyphicon glyphicon-wrench" aria-hidden="true"></span></a></li>
-                </ul>
             </div><!--/.nav-collapse -->
 
         </div>
@@ -68,6 +59,13 @@
                 <div class="block-label">Instructions</div>
             </div>
             <div class="col-lg-3 col-md-6 col-sm-12 block">
+                <!-- <div id="editor-toolbar">
+                    <ul class="nav-xs pull-left">
+                        <li><a title="Run" href="" class="tip tool-icon">Run</a></li>
+                        <li><a title="Break" href="" class="tip tool-icon">Break</a></li>
+                        <li><a title="Hint" href="" class="tip tool-icon">Hint</a></li>
+                    </ul>
+                </div> -->
                 <div id="code_editor"></div>
                 <div class="block-label">Code</div>
             </div>