Updating layout

Zambom
1 parent 57d99810
Showing 2 changed files with 32 additions and 12 deletions Show diff stats
amadeus/static/css/base/amadeus.css
amadeus/templates/base.html
@@ -2,7 +2,7 @@
 /* sidebar menu */
 #sidebar-menu{
-  margin-left: 30%;
+    -webkit-padding-start: 0px;
 }
 #sidebar-menu .item{
     font-size: 45px;
@@ -154,6 +154,20 @@
     height: 32px; 
     width: 32px;
 }
+.navbar .project_name {
+    margin-top: -5px;
+    font-weight: normal;
+    padding-left: 10px;
+    font-size: 20px;
+    color: white;
+}
+
+.navbar-nav li > a.profile {
+    padding-top: 0px !important;
+    padding-bottom:15px;
+    padding-right:0px;
+    padding-left: 0px;
+}
 .navbar-nav li > a {
     font-size: 28px;
@@ -563,6 +577,11 @@ a.alert_message:hover{color : grey}
     background: #F5F5F5;
 }
+.container-fluid {
+    padding-left: 40px;
+    padding-right: 40px;
+}
+
 body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse {
     background-color: white;
 }
@@ -70,7 +70,10 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="{% url 'categories:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo" /></a>
+                <a class="navbar-brand" href="{% url 'categories:index' %}">
+                    <img class="logo pull-left" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo" />
+                    <span class="pull-right project_name">Projeto Amadeus</span>
+                </a>
             </div>
             <div class="navbar-collapse collapse navbar-responsive-collapse">
                 <div class="col-md-5 cards-content" id= 'NavBarSearch'>
@@ -81,7 +84,7 @@
                             </div>
                             <span class="input-group-btn input-group-sm">
                                 <button type="submit" class="btn btn-primary" id="btn-search">
-                                    <i class="fa fa-search fa-2x" aria-hidden="true" style="color:white"></i>
+                                    <i class="fa fa-search" aria-hidden="true" style="color:white; font-size:20px"></i>
                                 </button>
                             </span>
                         </div>
@@ -119,27 +122,25 @@
                         </li>
                     {% endif %}
-                    <li title data-original-title="{% trans 'account' %}">
-                        <a href="" data-toggle="dropdown" style="padding-top: 15px;padding-bottom:15px;">
-                            <img src="{{ user.image_url }}" style="width:30px;height:30px" />
+                    <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
+                        <a href="" data-toggle="dropdown" class="profile">
+                            <img src="{{ user.image_url }}" style="width:50px;height:50px" />
                         </a>
                         <ul class="dropdown-menu pull-right">
                             <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
                             <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
                             <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
                             <li><a href="{% url 'users:remove_acc' %}">{% trans 'Delete Account' %}</a></li>
+                            <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
                         </ul>
                     </li>
-                    <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out">
-                        <a href="{% url 'users:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a>
-                    </li>
                 </ul>
             </div>
         </div>
     {% endblock %}
     <div class="container-fluid">
         <div class="row">
-            <div id="sidebar-menu-div" class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
+            <div id="sidebar-menu-div" class="col-xs-1 col-sm-1 col-md-1 col-lg-1 col-xl-1">
                 {% block sidebar %}
                    <ul id="sidebar-menu">
                         <a href="{% url 'subjects:index' %}"><li class="item" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
@@ -162,7 +163,7 @@
                    </ul>
                 {% endblock %}
             </div>
-            <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
+            <div class="col-xs-11 col-sm-11 col-md-11 col-lg-11 col-xl-11">
                 {% block breadcrumbs %}
                     {% breadcrumb 'Home' 'home' %}
                 {% endblock %}
@@ -170,7 +171,7 @@
                     {% render_breadcrumbs %}
                 {% endblock %}
             </div>
-            <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
+            <div class="col-xs-11 col-sm-11 col-md-11 col-lg-11 col-xl-11">
                 {% block content %}
                 {% endblock %}
             </div>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	/* sidebar menu */	2	/* sidebar menu */
3		3
4	#sidebar-menu{	4	#sidebar-menu{
5	- margin-left: 30%;	5	+ -webkit-padding-start: 0px;
6	}	6	}
7	#sidebar-menu .item{	7	#sidebar-menu .item{
8	font-size: 45px;	8	font-size: 45px;
	@@ -154,6 +154,20 @@		@@ -154,6 +154,20 @@
154	height: 32px;	154	height: 32px;
155	width: 32px;	155	width: 32px;
156	}	156	}
		157	+.navbar .project_name {
		158	+ margin-top: -5px;
		159	+ font-weight: normal;
		160	+ padding-left: 10px;
		161	+ font-size: 20px;
		162	+ color: white;
		163	+}
		164	+
		165	+.navbar-nav li > a.profile {
		166	+ padding-top: 0px !important;
		167	+ padding-bottom:15px;
		168	+ padding-right:0px;
		169	+ padding-left: 0px;
		170	+}
157		171
158	.navbar-nav li > a {	172	.navbar-nav li > a {
159	font-size: 28px;	173	font-size: 28px;
	@@ -563,6 +577,11 @@ a.alert_message:hover{color : grey}		@@ -563,6 +577,11 @@ a.alert_message:hover{color : grey}
563	background: #F5F5F5;	577	background: #F5F5F5;
564	}	578	}
565		579
		580	+.container-fluid {
		581	+ padding-left: 40px;
		582	+ padding-right: 40px;
		583	+}
		584	+
566	body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse {	585	body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse {
567	background-color: white;	586	background-color: white;
568	}	587	}