update css
authorcavaliet
Thu, 27 Jun 2013 12:56:41 +0200
changeset 170 ed256af483f4
parent 169 a548017794a1
child 171 1a1f3958c551
update css
integration/v2/css/style.css
src/egonomy/static/egonomy/css/style.css
src/egonomy/static/egonomy/img/tools-sprite.png
src/egonomy/templates/egonomy_view_collection.html
--- a/integration/v2/css/style.css	Thu Jun 27 12:53:03 2013 +0200
+++ b/integration/v2/css/style.css	Thu Jun 27 12:56:41 2013 +0200
@@ -122,7 +122,7 @@
 .list-projets-3 li img{max-width: 465px; display: block; margin: 0 auto;}
 .list-projets-3 li.horizontal .col-left{ width: 225px;}
 .list-projets-3 li.horizontal .col-right{height:100%; width: 240px; }
-.list-projets-3 .project-title{position:relative; padding-left: 14px; font-size: 18px;height: 60px; border-bottom: 1px solid #CCC;}
+.list-projets-3 .project-title{position:relative; padding-left: 14px; font-size: 18px;min-height: 60px; border-bottom: 1px solid #CCC;}
 .project-title h3{ font-family: 'Lato'; font-weight : bold; padding-top: 12px; margin-bottom: 4px; }
 .project-title h4{ font-family: 'Lato';  font-weight: 300; font-style: italic;}
 .project-title a.edit{ position: absolute; top: 10px; right: 10px; opacity: 0.7;}
--- a/src/egonomy/static/egonomy/css/style.css	Thu Jun 27 12:53:03 2013 +0200
+++ b/src/egonomy/static/egonomy/css/style.css	Thu Jun 27 12:56:41 2013 +0200
@@ -153,7 +153,7 @@
 .tool.cut{background-position: -86px 0;}
 .tool.save{background-position: -144px 0;}
 .tool.trash{background-position: -117px 0;}
-
+.tool.edit{background-position:-174px 0;}
 
 .box-shadow{ -webkit-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);}
 .box-shadow-2{ -webkit-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);}
Binary file src/egonomy/static/egonomy/img/tools-sprite.png has changed
--- a/src/egonomy/templates/egonomy_view_collection.html	Thu Jun 27 12:53:03 2013 +0200
+++ b/src/egonomy/templates/egonomy_view_collection.html	Thu Jun 27 12:56:41 2013 +0200
@@ -132,7 +132,8 @@
                     </div>
                     <div class="col-right">
                         <div class="project-title">
-                            {% if col.author == user %}<a class="edit toggle" href="#"><img alt="" src="{% static 'egonomy/img/icon-pencil-15.png' %}"></a>{% endif %}
+                            {# if col.author == user %}<a class="edit toggle" href="#"><img alt="" src="{% static 'egonomy/img/icon-pencil-15.png' %}"></a>{% endif #}
+                            {% if col.author == user %}<a class="tool edit toggle" href="#"></a>{% endif %}
                             <h3>{{ fragment.title }}</h3>
                             <h4>{{ fragment.author }}</h4>
                         </div>
@@ -181,7 +182,8 @@
                     </div>
                     <div class="col-right">
                         <div class="project-title">
-                            {% if col.author == user %}<a class="edit toggle" href="#"><img alt="" src="{% static 'egonomy/img/icon-pencil-15.png' %}"></a>{% endif %}
+                            {# if col.author == user %}<a class="edit toggle" href="#"><img alt="" src="{% static 'egonomy/img/icon-pencil-15.png' %}"></a>{% endif #}
+                            {% if col.author == user %}<a class="tool edit toggle" href="#"></a>{% endif %}
                             <h3>{{ img.metadata.titre }}</h3>
                             <h4>{{ img.metadata.auteur }}</h4>
                         </div>