Skip to content

Commit

Permalink
Issue #466 modifying right side bar
Browse files Browse the repository at this point in the history
  • Loading branch information
Mohab authored and Mohab committed May 9, 2014
1 parent 655f164 commit 7a33cd3
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 112 deletions.
6 changes: 5 additions & 1 deletion tutor/app/assets/stylesheets/style.css
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
.handle:hover{cursor: move;}
.handle:hover{cursor: move;}

.cont {
width: 99%;
}
68 changes: 37 additions & 31 deletions tutor/app/assets/stylesheets/tabs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,45 +57,51 @@ li.active a, li.active a:hover {
/*background-color:#999;*/
float:left;"
}
.navtab{
margin-left: -16px;
width: 100%;
padding-bottom: 10px;
margin-top:0px;

.navigation-list li{
border-radius:3px 3px 0px 0px;
background:#7FB5DA;
font-size:16px;
font-weight:600;
color:#4c4c4c;

}
.navigation-list li a{
color : black;
font-weight:600;
.navtab .row {
text-align: center;
transition:all linear 0.15s;
padding-top: 10px;
padding-bottom: 10px;
/* border-bottom: 1px solid black;*/
/* box-shadow: -1px 1px 1px grey;*/
margin-left: 0px;
margin-right: -30px;
transition:all linear 0.5s;
border-left: solid 2px #C1C1C1;

}

.navigation-list {
margin-bottom: 0;
padding-left: 0;
list-style: none;
}

.navigation-list > li {
position: relative;
display: block;
.navtab .row:hover{
background: red;
}

.navigation-list > li > a {
position: relative;
display: block;
padding: 10px 15px;
.navtab .row:last-child{
/* border-bottom: none;*/
}
/*.navtab .row:first-child{
border-top: solid 1px grey;
}*/
.navtab .row:last-child:hover{
background: none;
}
.navtab .row:first-child:hover{
background: none;
}
.navtab .active{
border-left: none;
background: #eeefe9;
pointer-events: none;
cursor: default;
box-shadow: none;
box-shadow: 3px 0px 3px grey;

.navigation-list > li > a:hover{
text-decoration: none;
background-color: #a7cce5;
}
.navtab .active:hover{
background: none;

.navigation-list > li.disabled > a {
color: #b4bcc2;
}
}
56 changes: 25 additions & 31 deletions tutor/app/views/layouts/_right_side_bar.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,74 @@
# [View Layout - Story 1.2]
# General layout for right side bar
<!-- # [View Layout - Story 1.2]
# General layout for right side bar -->
<!--
Author: Ahmed Elassuty
right nagigation bar
-->
<!--
Author:Rania Abdel Fattah
-->
<div id="right_side_bar" class="pull-right side-right" style="width:20%;min-width:200px;
position:static;overflow:auto">
<div style="margin-bottom:12px" class="well">


<div>

<ul class="navigation-list">
<!-- <div style="padding-top: 30px; style="width:100%;""> -->
<div class="navtab">
<% if student_signed_in? %>
<li><%= link_to image_tag("glyphicons_003_user.png") +
<div class="row" ><br></div>
<div class="row active"><%= link_to image_tag("glyphicons_003_user.png") +
" Profile",
{:controller => 'site', :action => 'index'},
style: "margin-left:auto;
margin-right:auto; margin-bottom: 5px;
width: 100%", method: :get %>
</li>
<li><%= link_to image_tag("glyphicons_136_cogwheel.png") +
</div>
<div class="row"><%= link_to image_tag("glyphicons_136_cogwheel.png") +
" Dashboard",
{:controller => 'site', :action => 'index'},
style: "margin-left:auto;
margin-right:auto; margin-bottom: 5px;
width: 100%", method: :get %>
</li>
<li><%= link_to image_tag("glyphicons_318_more_items.png") +
</div>
<div class="row"><%= link_to image_tag("glyphicons_318_more_items.png") +
" Courses",
{:controller => 'courses', :action => 'index'},
style: "margin-left:auto;
margin-right:autox; margin-bottom: 5px;
width: 100%", method: :get %>
</li>
<li><%= link_to image_tag("glyphicons_280_settings.png") +
</div>
<div class="row"><%= link_to image_tag("glyphicons_280_settings.png") +
" Settings",
{:controller => 'site', :action => 'index'},
style: "margin-left:auto;
margin-right:auto;
width: 100%", method: :get %>
</li>
</div>
<div class="row" ><br></div>
<% else %>
<li><%= link_to image_tag("glyphicons_003_user.png") +
<div class="row" ><br></div>
<div class="row"><%= link_to image_tag("glyphicons_003_user.png") +
"Profile",
{:controller => 'site', :action => 'index'},
style: "margin-left:auto;
margin-right:auto; margin-bottom: 5px;
width: 100%", method: :get %>
</li>
<li><%= link_to image_tag("glyphicons_318_more_items.png") +
</div>
<div class="row"><%= link_to image_tag("glyphicons_318_more_items.png") +
"Courses",
{:controller => 'courses', :action => 'index'},
style: "margin-left:auto;
margin-right:auto; margin-bottom: 5px;
width: 100%", method: :get %>
</li>
<li><%= link_to image_tag("glyphicons_280_settings.png") +
</div>
<div class="row"><%= link_to image_tag("glyphicons_280_settings.png") +
"Settings",
{:controller => 'site', :action => 'index'},
style: "margin-left:auto;
margin-right:auto;
width: 100%", method: :get %>
</li>
<% end %>
</ul>
</div>
</div>
<div class="row" ><br></div>
<% end %>
</div>


</div>
<!--end of Rania's story -->
<div class="well">

<% if student_signed_in? %>
<div>
<% next_problems_to_solve = current_student.get_next_problems_to_solve %>
Expand Down Expand Up @@ -133,6 +128,5 @@
</table>
</div>
<% end %>
</div>
</div>

57 changes: 11 additions & 46 deletions tutor/app/views/layouts/application.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,57 +14,22 @@
<%= csrf_meta_tags %>
</head>
<body>
<div class="navbar navbar-default navbar-fixed-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="../" class="navbar-brand">CoolSoft - Java Tutor</a>
</div>
<div class="navbar-collapse navbar-responsive-collapse collapse" style="height: 1px;">
<% if signed_in? %>
<%= render "layouts/search_form"%>
<% end %>
<ul class="nav navbar-nav navbar-right">
<% if signed_in? %>
<li style="padding-right:10px">
<%= render "layouts/log_out_form" %>
</li>
<% else %>
<li class="dropdown" style="padding-right:10px">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Sign in <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="../lecturers/sign_in">Lecturer</a></li>
<li><a href="../teaching_assistants/sign_in">Teaching Assistant</a></li>
<li><a href="../students/sign_in">Student</a></li>
</ul>
</li>
<% end %>
</ul>
</div>
</div>
</br>
<div id="main home" class="container" style="width:100%;min-width:1000px;">
<div class="cont">
<% if signed_in? %>
<div class="row">
<%= render "layouts/right_side_bar" %>
<div class="well main-content" style="min-height:600px;">
<%= yield %>
<div class="row" style="background: #eeefe9; padding-top:30px;">
<div class="col-xs-10" style="background: #eeefe9;">
<%= yield %>
</div>
<!-- <div class="col-xs-2" style="background: #eeefe9; box-shadow: -2px 3px 5px -2px grey;"> -->
<div class="col-xs-2" style="background: #E9E6DF;">
<%= render "layouts/right_side_bar" %>
</div>
</div>
<% else %>
<div align="center" class="well container main-content" style="min-height:700px;">
<%= yield %>
</div>
<div class="row" style="background: #eeefe9;">
<%= yield %>
</div>
<% end %>
</div>
</br>
<div align="center" class="navbar navbar-default
navbar-static-bottom footer" style="width:100%;min-width:1000px;">
<%= render "layouts/footer" %>
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion tutor/app/views/site/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</div>
<% end %>
<div class="bs-docs-section">
<div class="row">
<div >
<div class="col-lg-12">
<div class="bs-component">
<div class="jumbotron" style="text-align:center">
Expand Down
4 changes: 2 additions & 2 deletions tutor/vendor/assets/stylesheets/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ html {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
body {
font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 15px;
font-family: "Lato", sans-serif;
font-size: 14px;
line-height: 1.42857143;
color: #2c3e50;
background-color: #ffffff;
Expand Down

0 comments on commit 7a33cd3

Please sign in to comment.