Download as
Browse Code »

Commit 4dd3d1cdb22492fb68ff36d6efb00751c806ffaf

Authored by Sergio Oliveira
1 parent 95684c95
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Making message list responsive

Showing 3 changed files with 29 additions and 11 deletions   Show diff stats
src/colab/deprecated/templates/base.html
  Diff comments   View file @4dd3d1c
... ... @@ -2,6 +2,7 @@
2 2 {% load i18n browserid conversejs %}
3 3 <html>
4 4 <head>
  5 + <meta name="viewport" content="width=device-width, initial-scale=1.0">
5 6  
6 7 <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.css" type="text/css" media="screen, projection" />
7 8  
... ...
src/colab/static/css/screen.css
  Diff comments   View file @4dd3d1c
  1 +
  2 +
  3 +body {
  4 + font-size: 15px;
  5 +}
  6 +
1 7 /* Header */
2 8 #header-searchbox {
3 9 width: 280px;
... ... @@ -39,9 +45,10 @@
39 45 background-color: #2183b3;
40 46 padding: 2px 4px;
41 47 border-radius: 5px;
42   - font-size: 90%;
  48 + font-size: 85%;
43 49 color: #fff;
44   - margin-right: 5px;
  50 + margin-right: 4px;
  51 + margin-left: 4px;
45 52 line-height: 2;
46 53 white-space: nowrap;
47 54 }
... ... @@ -120,12 +127,24 @@ form.signup div.submit {
120 127 vertical-align: middle;
121 128 }
122 129  
123   -.unstyled-list ul, ul.none {
  130 +#filters h4 {
  131 + margin-top: 25px;
  132 +}
  133 +
  134 +ul.unstyled-list {
124 135 list-style-type: none;
125 136 padding: 3px 0;
126 137 margin: 10px 0;
127 138 }
128 139  
  140 +ul.unstyled-list li {
  141 + min-height: 30px;
  142 +}
  143 +
  144 +ul.unstyled-list .glyphicon-chevron-right {
  145 + font-size: 85%;
  146 +}
  147 +
129 148 ul.indent {
130 149 padding-left: 1.5em;
131 150 }
... ...
src/super_archives/templates/message-list.html
  Diff comments   View file @4dd3d1c
... ... @@ -7,11 +7,11 @@
7 7 <hr/>
8 8  
9 9 <div class="row">
10   - <div class="col-lg-2">
  10 + <div id="filters" class="hidden-xs hidden-sm col-md-2 col-lg-2">
11 11 <h3>{% trans "Filters" %}</h3>
12 12  
13 13 <h4>{% trans "Sort by" %}</h4>
14   - <ul class="none">
  14 + <ul class="unstyled-list">
15 15 <li {% ifequal order_by "hottest" %} title="{% trans "Remove filter" %}" {% endifequal %}>
16 16 <span class="glyphicon glyphicon-chevron-right"></span> <a href="{% ifequal order_by "hottest" %} {% append_to_get order="",p=1 %} {% else %} {% append_to_get order='hottest',p=1 %} {% endifequal %}">{% trans "Relevance" %}</a></li>
17 17 <li {% ifequal order_by "latest" %} title="{% trans "Remove filter" %}" {% endifequal %}>
... ... @@ -19,10 +19,8 @@
19 19 {% trans "Recent activity" %}</a></li>
20 20 </ul>
21 21  
22   - <div class="row">&nbsp;</div>
23   -
24 22 <h4>{% trans "Lists" %}</h4>
25   - <ul class="none">
  23 + <ul class="unstyled-list">
26 24 {% for list in lists %}
27 25 <li {% if list.name == selected_list %} title="{% trans "Remove filter" %}" class="selected" {% endif %}>
28 26 <span class="glyphicon {% if list.name == selected_list %}glyphicon-remove{% else %}glyphicon-chevron-right{% endif %}"></span> <a href="{% ifnotequal list.name selected_list %} {% append_to_get list=list.name,p=1 %} {% else %} {% append_to_get list="",p=1 %}
... ... @@ -31,8 +29,8 @@
31 29 </ul>
32 30 </div>
33 31  
34   - <div class="col-lg-10 last">
35   - <ul>
  32 + <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10">
  33 + <ul class="unstyled-list">
36 34 {% for thread in threads.object_list %}
37 35 {% include "message-preview.html" with doc=thread.latest_message %}
38 36 {% empty %}
... ... @@ -48,7 +46,7 @@
48 46  
49 47 <div class="row">
50 48 {% if n_results %}
51   - <div class="col-lg-10 col-lg-offset-2 text-center">
  49 + <div class="col-xm-12 col-sm-12 col-md-10 col-lg-10 col-lg-offset-2 text-center">
52 50 {% if threads.has_previous %}
53 51 <a href="{% append_to_get p=threads.previous_page_number %}">{% trans "Previous" %}</a>
54 52 {% endif %}
... ...