From b18d320bd10f71e1d2ea135ea24b4cf01c32f59e Mon Sep 17 00:00:00 2001 From: Alison Loney Date: Wed, 3 Sep 2014 13:07:28 -0400 Subject: [PATCH] WEB-32, WEB-12, WEB-17, WEB-14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added about, contact, login buttons to top right header. Added lesson buttons above lesson. Added ‘heads-up’ display for hints, params etc in a right sidebar in main body. --- newDesign/assets/css/main.css | 34 ++++++++++++++---- newDesign/index.html | 66 ++++++++++++++++++++++++++++------- 2 files changed, 81 insertions(+), 19 deletions(-) diff --git a/newDesign/assets/css/main.css b/newDesign/assets/css/main.css index 0f30cb9fd..4df7127d6 100644 --- a/newDesign/assets/css/main.css +++ b/newDesign/assets/css/main.css @@ -100,7 +100,8 @@ img { color: #F6F6F6; } #header .toggle-navigation.toggle-left { - margin: 23px 0 0 20px; + margin-top: 5px; + margin-left: 20px; display: inline-block; } #header .btn-default { @@ -119,10 +120,31 @@ img { cursor: pointer; color: #797979; } +#header .btn-default .fa-info, +#header .btn-default .fa-envelope, +#header .btn-default .fa-user { + color: #797979; +} +#header .user-nav button:hover, +#header .user-nav button:active { + background: #e84c3d; +} +#header .user-nav button:hover i { + color: #F6F6F6; +} +#header .lessonTitle { + display: inline-block; + margin:0 0 0 20px; +} +#header .pull-right { + float: right !important; + margin-top:25px; + margin-right:20px; +} /* Sidebar */ .sidebar { width: 240px; - height: auto; + height: 100%; background: #222; position: absolute; -webkit-transition: all 0.3s ease-in-out; @@ -324,8 +346,8 @@ a.btn-primary:visited { a.btn-primary:hover, a.btn-primary:active { color: #ffffff; - background-color: #1dd2af; - border-color: #1dd2af; + background-color: #C62F28; + border-color: #C62F28; } .btn-primary:hover, .btn-primary:focus, @@ -333,8 +355,8 @@ a.btn-primary:active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #ffffff; - background-color: #1dd2af; - border-color: #1dd2af; + background-color: #C62F28; + border-color: #C62F28; } .btn-primary:active, .btn-primary.active, diff --git a/newDesign/index.html b/newDesign/index.html index 98dea8fa6..1db9c762d 100644 --- a/newDesign/index.html +++ b/newDesign/index.html @@ -1,4 +1,4 @@ -s + @@ -53,6 +53,20 @@ s +
+

Lesson Title in here

+
+
+ + + +