Download as
Browse Code »

Commit a28689f26836e1c68506528802597a4b7545241c

Authored by Matheus Figueiredo
1 parent bf2e7910
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

Finishin CSS on discution

Showing 2 changed files with 37 additions and 31 deletions   Show diff stats
src/colab/static/css/screen.css
  Diff comments   View file @a28689f
... ... @@ -7,7 +7,7 @@
7 7 line-height: 33px;
8 8 }
9 9  
10   -#header-hr{
  10 +#header-hr {
11 11 margin-top: 0;
12 12 }
13 13 /* End of Header */
... ... @@ -81,21 +81,7 @@
81 81 }
82 82 /* End of message-preview.html */
83 83  
84   -.rss-icon{
85   - background-image: url(../img/rss.png);
86   - width: 16px;
87   - height: 16px;
88   -}
89   -
90   -.column-align{
91   - display: inline-block;
92   - margin-left: 20px;
93   - margin-top: 0;
94   - margin-bottom: 10px;
95   - vertical-align: middle;
96   -}
97   -
98   -.container{
  84 +.container {
99 85 /* Overwritting max-width for better web responsive */
100 86 max-width: 95% !important;
101 87 }
... ... @@ -127,11 +113,31 @@ fieldset>legend {
127 113 background:#e5eCf9 !important;
128 114 }
129 115  
130   -.col-lg-6 .well{
  116 +.col-lg-6 .well{
131 117 max-width:570px;
132 118 }
133 119  
134   -.col-lg-3 .well{
  120 +.col-lg-3 .well {
135 121 max-width:285px;
136 122 }
137 123 /* End changes */
  124 +
  125 +.rss-icon {
  126 + background-image: url(../img/rss.png);
  127 + width: 16px;
  128 + height: 16px;
  129 +}
  130 +
  131 +.column-align {
  132 + display: inline-block;
  133 + margin-left: 20px;
  134 + margin-top: 0;
  135 + margin-bottom: 10px;
  136 + vertical-align: middle;
  137 +}
  138 +
  139 +ul.none {
  140 + list-style-type:none;
  141 + padding:3px 0;
  142 + margin:10px 0;
  143 +}
... ...
src/super_archives/templates/message-list.html
  Diff comments   View file @a28689f
... ... @@ -11,23 +11,23 @@
11 11 <h3>{% trans "Filters" %}</h3>
12 12  
13 13 <h4>{% trans "Sort by" %}</h4>
14   - <ul>
  14 + <ul class="none">
15 15 <li {% ifequal order_by "hottest" %} title="{% trans "Remove filter" %}" {% endifequal %}>
16   - <a href="{% ifequal order_by "hottest" %} {% append_to_get order="",p=1 %} {% else %} {% append_to_get order='hottest',p=1 %} {% endifequal %}">
17   - {% trans "Relevance" %}</a></li>
  16 + <span class="glyphicon glyphicon-chevron-right"><a href="{% ifequal order_by "hottest" %} {% append_to_get order="",p=1 %} {% else %} {% append_to_get order='hottest',p=1 %} {% endifequal %}">
  17 + {% trans "Relevance" %}</a></span></li>
18 18 <li {% ifequal order_by "latest" %} title="{% trans "Remove filter" %}" {% endifequal %}>
19   - <a href="{% ifequal order_by "latest" %} {% append_to_get order="",p=1 %} {% else %} {% append_to_get order='latest',p=1 %} {% endifequal %}">
20   - {% trans "Recent activity" %}</a></li>
  19 + <span class="glyphicon glyphicon-chevron-right"><a href="{% ifequal order_by "latest" %} {% append_to_get order="",p=1 %} {% else %} {% append_to_get order='latest',p=1 %} {% endifequal %}">
  20 + {% trans "Recent activity" %}</a></span></li>
21 21 </ul>
22 22  
23 23 <div class="row">&nbsp;</div>
24 24  
25 25 <h4>{% trans "Lists" %}</h4>
26   - <ul>
  26 + <ul class="none">
27 27 {% for list in lists %}
28 28 <li {% ifequal list.name selected_list %} title="{% trans "Remove filter" %}" {% endifequal %}>
29   - <a href="{% ifnotequal list.name selected_list %} {% append_to_get list=list.name,p=1 %} {% else %} {% append_to_get list="",p=1 %}
30   - {% endifnotequal %}">{{ list.name }}</a></li>
  29 + <span class="glyphicon glyphicon-chevron-right"><a href="{% ifnotequal list.name selected_list %} {% append_to_get list=list.name,p=1 %} {% else %} {% append_to_get list="",p=1 %}
  30 + {% endifnotequal %}">{{ list.name }}</a></span></li>
31 31 {% endfor %}
32 32 </ul>
33 33 </div>
... ... @@ -45,9 +45,11 @@
45 45 </ul>
46 46 <div class="row">&nbsp;</div>
47 47  
  48 + </div>
  49 +
  50 + <div class="row">
48 51 {% if n_results %}
49   - <div>
50   - <span>
  52 + <div class="col-lg-10 col-lg-offset-2 text-center">
51 53 {% if threads.has_previous %}
52 54 <a href="{% append_to_get p=threads.previous_page_number %}">{% trans "Previous" %}</a>
53 55 {% endif %}
... ... @@ -59,11 +61,9 @@
59 61 {% if threads.has_next %}
60 62 <a href="{% append_to_get p=threads.next_page_number %}">{% trans "Next" %}</a>
61 63 {% endif %}
62   - </span>
63   - </div>
64 64 {% endif %}
65   -
66 65 </div>
  66 +
67 67 </div>
68 68 </div>
69 69  
... ...