Download as
Browse Code »

Commit cec323eef7e909f0416e7b9230597fb924570355

Authored by Braulio Bhavamitra
2 parents f09b8e4e 47aff270
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

Merge branch 'master' of https://gitlab.com/noosfero/noosfero into rails4

Showing 2 changed files with 56 additions and 55 deletions   Show diff stats
public/stylesheets/tasks.css
View file @f09b8e4
... ... @@ -1,55 +0,0 @@
1   -.task_box {
2   - position: relative;
3   - border: 1px solid #888;
4   - -moz-border-radius: 10px;
5   - -webkit-border-radius: 10px;
6   - -khtml-border-radius: 10px;
7   - border-radius: 10px;
8   - padding: 6px 4px 9px 4px;
9   - margin-top: 5px;
10   - background: #EEE;
11   -}
12   -
13   -.task_title {
14   - margin: 0px;
15   - display: block;
16   - line-height: 28px;
17   - font-size: 120%;
18   -}
19   -
20   -.task_date {
21   - color: gray;
22   - font-size: 12px;
23   -}
24   -
25   -.task_icon {
26   - float: left;
27   - margin-right: 10px;
28   - width: 50px;
29   - height: 50px;
30   - text-align: center;
31   -}
32   -
33   -.task_decisions {
34   - float: right;
35   - padding-right: 5px;
36   -}
37   -
38   -.task_information {
39   - line-height: 18px;
40   - padding: 2px 0px;
41   - clear: right;
42   -}
43   -
44   -.task_information p {
45   - margin: 0px;
46   -}
47   -
48   -.task_target {
49   - text-decoration: underline;
50   - font-weight: bold;
51   -}
52   -
53   -.task_responsible {
54   - text-align: right;
55   -}
public/stylesheets/tasks.scss
  Diff comments   View file @cec323e
... ... @@ -25,3 +25,59 @@ div.pending-tasks {
25 25 padding-left: 0px;
26 26 list-style-type: none;
27 27 }
  28 +
  29 +.task_box {
  30 + position: relative;
  31 + border: 1px solid #888;
  32 + -moz-border-radius: 10px;
  33 + -webkit-border-radius: 10px;
  34 + -khtml-border-radius: 10px;
  35 + border-radius: 10px;
  36 + padding: 6px 4px 9px 4px;
  37 + margin-top: 5px;
  38 + background: #EEE;
  39 +}
  40 +
  41 +.task_title {
  42 + margin: 0px;
  43 + display: block;
  44 + line-height: 28px;
  45 + font-size: 120%;
  46 +}
  47 +
  48 +.task_date {
  49 + color: gray;
  50 + font-size: 12px;
  51 +}
  52 +
  53 +.task_icon {
  54 + float: left;
  55 + margin-right: 10px;
  56 + width: 50px;
  57 + height: 50px;
  58 + text-align: center;
  59 +}
  60 +
  61 +.task_decisions {
  62 + float: right;
  63 + padding-right: 5px;
  64 +}
  65 +
  66 +.task_information {
  67 + line-height: 18px;
  68 + padding: 2px 0px;
  69 + clear: right;
  70 +}
  71 +
  72 +.task_information p {
  73 + margin: 0px;
  74 +}
  75 +
  76 +.task_target {
  77 + text-decoration: underline;
  78 + font-weight: bold;
  79 +}
  80 +
  81 +.task_responsible {
  82 + text-align: right;
  83 +}
... ...