conflict

miguelramos · Mar 8, 2017 · 43d7b6e · 43d7b6e
2 parents 9744e47 + 76dd07b
commit 43d7b6e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/filebrowser/static/filebrowser/css/filebrowser.css b/filebrowser/static/filebrowser/css/filebrowser.css
@@ -33,7 +33,10 @@
     padding-bottom: 0 !important;
 }
 
-
+.filename_dimensions {
+    max-width: 100px;
+    word-break: break-all;
+}
 
 /*  Filebrowser Buttons & Links
 ------------------------------------------------------------------------------------------------------ */
@@ -233,3 +236,4 @@ ul.pulldown-actions a {
     font-weight: 100;
     text-transform: uppercase;
 }
+
diff --git a/filebrowser/static/filebrowser/css/suit-filebrowser.css b/filebrowser/static/filebrowser/css/suit-filebrowser.css
@@ -16,6 +16,11 @@ body .redactor_toolbar li a.redactor_btn_browser {
     background: url("../img/explorer.png") no-repeat;
 }
 
+.filename_dimensions {
+    max-width: 100px;
+    word-break: break-all;
+}
+
 .dropzone{
     border: 2px dashed #79aec8;
     font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
@@ -38,7 +43,7 @@ body .redactor_toolbar li a.redactor_btn_browser {
     margin-top: 0;
 }
 
-.dropzone .dz-preview .dz-remove{
+.dropzone .dz-preview .dz-remove {
     color: #ba2121;
     font-size: 12px;
     font-weight: 100;

diff --git a/filebrowser/templates/filebrowser/include/filelisting.html b/filebrowser/templates/filebrowser/include/filelisting.html
@@ -53,9 +53,9 @@
 
         <!-- FILENAME/DIMENSIONS -->
         {% if file.filetype == "Folder" %}
-            <td><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
+            <td class="filename_dimensions"><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
         {% else %}
-            <td>
+            <td class="filename_dimensions">
                 <b><a href="{{ file.url_full }}">{{ file.filename }}</a></b>
                 {% if file.dimensions %}
                     <br /><span class="tiny">{{ file.dimensions.0 }} x {{ file.dimensions.1 }} px</span><br clear="all" />

diff --git a/filebrowser/templates/suit/include/filelisting.html b/filebrowser/templates/suit/include/filelisting.html
@@ -79,9 +79,9 @@
 
         <!-- FILENAME/DIMENSIONS -->
         {% if file.filetype == "Folder" %}
-            <td><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
+            <td class="filename_dimensions"><a href="{% url "fb_browse" %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
         {% else %}
-            <td>
+            <td class="filename_dimensions">
                 <b><a href="{{ file.url_full }}">{{ file.filename }}</a></b>
                 {% if file.dimensions %}
                     <br /><span class="tiny">{{ file.dimensions.0 }} x {{ file.dimensions.1 }} px</span><br clear="all" />

diff --git a/filebrowser/templates/suit/index.html b/filebrowser/templates/suit/index.html
@@ -5,20 +5,11 @@
 {% block extrastyle %}
     {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/suit-filebrowser.css" />
-    {#  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />#}
-    {% if cl.formset %}
-        {#    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />#}
-    {% endif %}
     {% if cl.formset or action_form %}
         {% url 'admin:jsi18n' as jsi18nurl %}
         <script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>
     {% endif %}
     {{ media.css }}
-    {% if not actions_on_top and not actions_on_bottom %}
-        <style>
-            {#      #changelist table thead th:first-child {width: inherit}#}
-        </style>
-    {% endif %}
 {% endblock %}
 
 {% block extrahead %}