Download as
Browse Code »

Commit 591b98f326957d7e95f9be7ea8d1ac12bb8c289f

Authored by Zambom
1 parent 57d99810
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Updating layout

Showing 2 changed files with 32 additions and 12 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @591b98f
... ... @@ -2,7 +2,7 @@
2 2 /* sidebar menu */
3 3  
4 4 #sidebar-menu{
5   - margin-left: 30%;
  5 + -webkit-padding-start: 0px;
6 6 }
7 7 #sidebar-menu .item{
8 8 font-size: 45px;
... ... @@ -154,6 +154,20 @@
154 154 height: 32px;
155 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 172 .navbar-nav li > a {
159 173 font-size: 28px;
... ... @@ -563,6 +577,11 @@ a.alert_message:hover{color : grey}
563 577 background: #F5F5F5;
564 578 }
565 579  
  580 +.container-fluid {
  581 + padding-left: 40px;
  582 + padding-right: 40px;
  583 +}
  584 +
566 585 body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse {
567 586 background-color: white;
568 587 }
... ...
amadeus/templates/base.html
  Diff comments   View file @591b98f
... ... @@ -70,7 +70,10 @@
70 70 <span class="icon-bar"></span>
71 71 <span class="icon-bar"></span>
72 72 </button>
73   - <a class="navbar-brand" href="{% url 'categories:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo" /></a>
  73 + <a class="navbar-brand" href="{% url 'categories:index' %}">
  74 + <img class="logo pull-left" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo" />
  75 + <span class="pull-right project_name">Projeto Amadeus</span>
  76 + </a>
74 77 </div>
75 78 <div class="navbar-collapse collapse navbar-responsive-collapse">
76 79 <div class="col-md-5 cards-content" id= 'NavBarSearch'>
... ... @@ -81,7 +84,7 @@
81 84 </div>
82 85 <span class="input-group-btn input-group-sm">
83 86 <button type="submit" class="btn btn-primary" id="btn-search">
84   - <i class="fa fa-search fa-2x" aria-hidden="true" style="color:white"></i>
  87 + <i class="fa fa-search" aria-hidden="true" style="color:white; font-size:20px"></i>
85 88 </button>
86 89 </span>
87 90 </div>
... ... @@ -119,27 +122,25 @@
119 122 </li>
120 123 {% endif %}
121 124  
122   - <li title data-original-title="{% trans 'account' %}">
123   - <a href="" data-toggle="dropdown" style="padding-top: 15px;padding-bottom:15px;">
124   - <img src="{{ user.image_url }}" style="width:30px;height:30px" />
  125 + <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
  126 + <a href="" data-toggle="dropdown" class="profile">
  127 + <img src="{{ user.image_url }}" style="width:50px;height:50px" />
125 128 </a>
126 129 <ul class="dropdown-menu pull-right">
127 130 <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
128 131 <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
129 132 <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
130 133 <li><a href="{% url 'users:remove_acc' %}">{% trans 'Delete Account' %}</a></li>
  134 + <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
131 135 </ul>
132 136 </li>
133   - <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out">
134   - <a href="{% url 'users:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a>
135   - </li>
136 137 </ul>
137 138 </div>
138 139 </div>
139 140 {% endblock %}
140 141 <div class="container-fluid">
141 142 <div class="row">
142   - <div id="sidebar-menu-div" class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
  143 + <div id="sidebar-menu-div" class="col-xs-1 col-sm-1 col-md-1 col-lg-1 col-xl-1">
143 144 {% block sidebar %}
144 145 <ul id="sidebar-menu">
145 146 <a href="{% url 'subjects:index' %}"><li class="item" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
... ... @@ -162,7 +163,7 @@
162 163 </ul>
163 164 {% endblock %}
164 165 </div>
165   - <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
  166 + <div class="col-xs-11 col-sm-11 col-md-11 col-lg-11 col-xl-11">
166 167 {% block breadcrumbs %}
167 168 {% breadcrumb 'Home' 'home' %}
168 169 {% endblock %}
... ... @@ -170,7 +171,7 @@
170 171 {% render_breadcrumbs %}
171 172 {% endblock %}
172 173 </div>
173   - <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
  174 + <div class="col-xs-11 col-sm-11 col-md-11 col-lg-11 col-xl-11">
174 175 {% block content %}
175 176 {% endblock %}
176 177 </div>
... ...